ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix settings other accounts avatar font

Browse Source
This commit is contained in:
Ilya Laktyushin 2022-03-11 18:42:09 +04:00
parent b01d67574c
commit 8ce13713b9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/AvatarNode/Sources/AvatarNode.swift
View File

@ -184,7 +184,7 @@ public final class AvatarNode: ASDisplayNode {
public var font: UIFont {
didSet {
if oldValue !== font {
if oldValue.pointSize != font.pointSize {
if let parameters = self.parameters {
self.parameters = AvatarNodeParameters(theme: parameters.theme, accountPeerId: parameters.accountPeerId, peerId: parameters.peerId, letters: parameters.letters, font: self.font, icon: parameters.icon, explicitColorIndex: parameters.explicitColorIndex, hasImage: parameters.hasImage, clipStyle: parameters.clipStyle)
}

8
submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift
View File

@ -439,7 +439,6 @@ public final class ItemListPeerItem: ListViewItem, ItemListItem {
}
}
private let avatarFont = avatarPlaceholderFont(size: floor(40.0 * 16.0 / 37.0))
private let badgeFont = Font.regular(15.0)
public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNode {
@ -503,7 +502,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
self.containerNode = ContextControllerSourceNode()
self.avatarNode = AvatarNode(font: avatarFont)
self.avatarNode = AvatarNode(font: avatarPlaceholderFont(size: floor(40.0 * 16.0 / 37.0)))
//self.avatarNode.isLayerBacked = !smartInvertColorsEnabled()
self.titleNode = TextNode()
@ -763,6 +762,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
let verticalInset: CGFloat
let verticalOffset: CGFloat
let avatarSize: CGFloat
let avatarFontSize: CGFloat
switch item.height {
case .generic:
if case .none = item.text {
@ -773,6 +773,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
verticalOffset = 0.0
avatarSize = 31.0
leftInset = 59.0 + params.leftInset
avatarFontSize = floor(31.0 * 16.0 / 37.0)
case .peerList:
if case .none = item.text {
verticalInset = 14.0
@ -782,6 +783,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
verticalOffset = 0.0
avatarSize = 40.0
leftInset = 65.0 + params.leftInset
avatarFontSize = floor(40.0 * 16.0 / 37.0)
}
var editableControlSizeAndApply: (CGFloat, (CGFloat) -> ItemListEditableControlNode)?
@ -887,6 +889,8 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
strongSelf.containerNode.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
strongSelf.containerNode.isGestureEnabled = item.contextAction != nil
strongSelf.avatarNode.font = avatarPlaceholderFont(size: avatarFontSize)
strongSelf.accessibilityLabel = titleAttributedString?.string
var combinedValueString = ""
if let statusString = statusAttributedString?.string, !statusString.isEmpty {