Refactor string generation

This commit is contained in:
Ali
2021-07-20 11:57:50 +02:00
parent bbd096d88b
commit 7bed1728bb
205 changed files with 15848 additions and 33988 deletions

View File

@@ -25,7 +25,7 @@ private enum ChatReportPeerTitleButton: Equatable {
return strings.Conversation_BlockUser
case let .addContact(name):
if let name = name {
return strings.Conversation_AddNameToContacts(name).0
return strings.Conversation_AddNameToContacts(name).string
} else {
return strings.Conversation_AddToContacts
}
@@ -151,18 +151,18 @@ private final class ChatInfoTitlePanelInviteInfoNode: ASDisplayNode {
let bottomInset: CGFloat = 6.0
let sideInset: CGFloat = 16.0
let stringAndRanges: (String, [(Int, NSRange)])
let stringAndRanges: PresentationStrings.FormattedString
if let channel = chatPeer as? TelegramChannel, case .broadcast = channel.info {
stringAndRanges = strings.Conversation_NoticeInvitedByInChannel(invitedBy.compactDisplayTitle)
} else {
stringAndRanges = strings.Conversation_NoticeInvitedByInGroup(invitedBy.compactDisplayTitle)
}
let attributedString = NSMutableAttributedString(string: stringAndRanges.0, font: Font.regular(13.0), textColor: primaryTextColor)
let attributedString = NSMutableAttributedString(string: stringAndRanges.string, font: Font.regular(13.0), textColor: primaryTextColor)
let boldAttributes = [NSAttributedString.Key.font: Font.semibold(13.0), NSAttributedString.Key(rawValue: "_Link"): true as NSNumber]
for (_, range) in stringAndRanges.1 {
attributedString.addAttributes(boldAttributes, range: range)
for range in stringAndRanges.ranges {
attributedString.addAttributes(boldAttributes, range: range.range)
}
self.labelNode.attributedText = attributedString
@@ -252,11 +252,11 @@ private final class ChatInfoTitlePanelPeerNearbyInfoNode: ASDisplayNode {
let stringAndRanges = strings.Conversation_PeerNearbyDistance(chatPeer.compactDisplayTitle, shortStringForDistance(strings: strings, distance: distance))
let attributedString = NSMutableAttributedString(string: stringAndRanges.0, font: Font.regular(13.0), textColor: primaryTextColor)
let attributedString = NSMutableAttributedString(string: stringAndRanges.string, font: Font.regular(13.0), textColor: primaryTextColor)
let boldAttributes = [NSAttributedString.Key.font: Font.semibold(13.0), NSAttributedString.Key(rawValue: "_Link"): true as NSNumber]
for (_, range) in stringAndRanges.1.prefix(1) {
attributedString.addAttributes(boldAttributes, range: range)
for range in stringAndRanges.ranges.prefix(1) {
attributedString.addAttributes(boldAttributes, range: range.range)
}
self.labelNode.attributedText = attributedString