diff --git a/SiriIntents/IntentMessages.swift b/SiriIntents/IntentMessages.swift index d8a8831fd6..f8add17d11 100644 --- a/SiriIntents/IntentMessages.swift +++ b/SiriIntents/IntentMessages.swift @@ -37,7 +37,7 @@ func unreadMessages(account: Account) -> Signal<[INMessage], NoError> { |> mapToSignal { view -> Signal<[INMessage], NoError> in var signals: [Signal<[INMessage], NoError>] = [] for entry in view.0.entries { - if case let .MessageEntry(index, _, readState, notificationSettings, _, _, _, _) = entry { + if case let .MessageEntry(index, _, readState, notificationSettings, _, _, _, _, _) = entry { if index.messageIndex.id.peerId.namespace != Namespaces.Peer.CloudUser { continue } diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 88601572d0..6c0b192097 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -5185,3 +5185,5 @@ Any member of this group will be able to see messages in the channel."; "Theme.Colors.Proceed" = "Proceed"; "AuthSessions.AddDevice.UrlLoginHint" = "This code can be used to allow someone to log in to your Telegram account.\n\nTo confirm Telegram login, please go to Settings > Devices > Scan QR and scan the code."; + +"ChatContextMenu.TextSelectionTip" = "Hold a word, then move cursor to select more| text to copy."; diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift index 882937f766..d11fe58613 100644 --- a/submodules/ChatListUI/Sources/ChatListController.swift +++ b/submodules/ChatListUI/Sources/ChatListController.swift @@ -1053,7 +1053,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, var sourceRect = selectedNode.view.superview!.convert(selectedNode.frame, to: sourceView) sourceRect.size.height -= UIScreenPixel switch item.content { - case let .peer(_, peer, _, _, _, _, _, _, _, _, _): + case let .peer(_, peer, _, _, _, _, _, _, _, _, _, _): if peer.peerId.namespace != Namespaces.Peer.SecretChat { let chatController = self.context.sharedContext.makeChatController(context: self.context, chatLocation: .peer(peer.peerId), subject: nil, botStart: nil, mode: .standard(previewing: true)) chatController.canReadHistory.set(false) diff --git a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift index 82dc7fbeb2..0446ff6722 100644 --- a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift +++ b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift @@ -472,7 +472,7 @@ public enum ChatListSearchEntry: Comparable, Identifiable { } }) case let .message(message, peer, readState, presentationData): - return ChatListItem(presentationData: presentationData, context: context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: message.index), content: .peer(message: message, peer: peer, combinedReadState: readState, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: true, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: enableHeaders ? ChatListSearchItemHeader(type: .messages, theme: presentationData.theme, strings: presentationData.strings, actionTitle: nil, action: nil) : nil, enableContextActions: false, hiddenOffset: false, interaction: interaction) + return ChatListItem(presentationData: presentationData, context: context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: message.index), content: .peer(message: message, peer: peer, combinedReadState: readState, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: true, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: enableHeaders ? ChatListSearchItemHeader(type: .messages, theme: presentationData.theme, strings: presentationData.strings, actionTitle: nil, action: nil) : nil, enableContextActions: false, hiddenOffset: false, interaction: interaction) case let .addContact(phoneNumber, theme, strings): return ContactsAddItem(theme: theme, strings: strings, phoneNumber: phoneNumber, header: ChatListSearchItemHeader(type: .phoneNumber, theme: theme, strings: strings, actionTitle: nil, action: nil), action: { interaction.addContact(phoneNumber) @@ -1332,7 +1332,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo bounds = selectedItemNode.bounds } switch item.content { - case let .peer(message, peer, _, _, _, _, _, _, _, _, _): + case let .peer(message, peer, _, _, _, _, _, _, _, _, _, _): return (selectedItemNode.view, bounds, message?.id ?? peer.peerId) case let .groupReference(groupId, _, _, _, _): return (selectedItemNode.view, bounds, groupId) diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift index 2b033d64a4..38226faa3b 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift @@ -20,12 +20,12 @@ import ChatListSearchItemNode import ContextUI public enum ChatListItemContent { - case peer(message: Message?, peer: RenderedPeer, combinedReadState: CombinedPeerReadState?, notificationSettings: PeerNotificationSettings?, presence: PeerPresence?, summaryInfo: ChatListMessageTagSummaryInfo, embeddedState: PeerChatListEmbeddedInterfaceState?, inputActivities: [(Peer, PeerInputActivity)]?, isAd: Bool, ignoreUnreadBadge: Bool, displayAsMessage: Bool) + case peer(message: Message?, peer: RenderedPeer, combinedReadState: CombinedPeerReadState?, notificationSettings: PeerNotificationSettings?, presence: PeerPresence?, summaryInfo: ChatListMessageTagSummaryInfo, embeddedState: PeerChatListEmbeddedInterfaceState?, inputActivities: [(Peer, PeerInputActivity)]?, isAd: Bool, ignoreUnreadBadge: Bool, displayAsMessage: Bool, hasFailedMessages: Bool) case groupReference(groupId: PeerGroupId, peers: [ChatListGroupReferencePeer], message: Message?, unreadState: PeerGroupUnreadCountersCombinedSummary, hiddenByDefault: Bool) public var chatLocation: ChatLocation? { switch self { - case let .peer(_, peer, _, _, _, _, _, _, _, _, _): + case let .peer(_, peer, _, _, _, _, _, _, _, _, _, _): return .peer(peer.peerId) case .groupReference: return nil @@ -38,7 +38,7 @@ public class ChatListItem: ListViewItem, ChatListSearchItemNeighbour { let context: AccountContext let peerGroupId: PeerGroupId let index: ChatListIndex - let content: ChatListItemContent + public let content: ChatListItemContent let editing: Bool let hasActiveRevealControls: Bool let selected: Bool @@ -122,7 +122,7 @@ public class ChatListItem: ListViewItem, ChatListSearchItemNeighbour { public func selected(listView: ListView) { switch self.content { - case let .peer(message, peer, _, _, _, _, _, _, isAd, _, _): + case let .peer(message, peer, _, _, _, _, _, _, isAd, _, _, _): if let message = message, let peer = peer.peer { self.interaction.messageSelected(peer, message, isAd) } else if let peer = peer.peer { @@ -522,7 +522,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { var displayAsMessage = false var enablePreview = true switch item.content { - case let .peer(message, peerValue, _, _, _, _, _, _, _, _, displayAsMessageValue): + case let .peer(message, peerValue, _, _, _, _, _, _, _, _, displayAsMessageValue, _): displayAsMessage = displayAsMessageValue if displayAsMessage, let author = message?.author as? TelegramUser { peer = author @@ -673,11 +673,12 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { let isPeerGroup: Bool let isAd: Bool let displayAsMessage: Bool + let hasFailedMessages: Bool var groupHiddenByDefault = false switch item.content { - case let .peer(messageValue, peerValue, combinedReadStateValue, notificationSettingsValue, peerPresenceValue, summaryInfoValue, embeddedStateValue, inputActivitiesValue, isAdValue, ignoreUnreadBadge, displayAsMessageValue): + case let .peer(messageValue, peerValue, combinedReadStateValue, notificationSettingsValue, peerPresenceValue, summaryInfoValue, embeddedStateValue, inputActivitiesValue, isAdValue, ignoreUnreadBadge, displayAsMessageValue, hasFailedMessagesValue): message = messageValue contentPeer = .chat(peerValue) combinedReadState = combinedReadStateValue @@ -698,6 +699,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { isPeerGroup = false isAd = isAdValue displayAsMessage = displayAsMessageValue + hasFailedMessages = hasFailedMessagesValue case let .groupReference(_, peers, messageValue, unreadState, hiddenByDefault): if let _ = messageValue, !peers.isEmpty { contentPeer = .chat(peers[0].peer) @@ -717,6 +719,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { peerPresence = nil isAd = false displayAsMessage = false + hasFailedMessages = false } if let messageValue = message { @@ -975,7 +978,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { if message.flags.isSending && !message.isSentOrAcknowledged { statusState = .clock(PresentationResourcesChatList.clockFrameImage(item.presentationData.theme), PresentationResourcesChatList.clockMinImage(item.presentationData.theme)) } else if message.id.peerId != account.peerId { - if message.flags.contains(.Failed) { + if hasFailedMessages { statusState = .failed(item.presentationData.theme.chatList.failedFillColor, item.presentationData.theme.chatList.failedForegroundColor) } else { if let combinedReadState = combinedReadState, combinedReadState.isOutgoingMessageIndexRead(message.index) { @@ -1061,7 +1064,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { var credibilityIconOffset: CGFloat = 0.0 if displayAsMessage { switch item.content { - case let .peer(message, _, _, _, _, _, _, _, _, _, _): + case let .peer(message, _, _, _, _, _, _, _, _, _, _, _): if let peer = message?.author { if peer.isScam { currentCredibilityIconImage = PresentationResourcesChatList.scamIcon(item.presentationData.theme, type: .regular) @@ -1153,7 +1156,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { let peerRevealOptions: [ItemListRevealOption] let peerLeftRevealOptions: [ItemListRevealOption] switch item.content { - case let .peer(_, renderedPeer, _, _, presence, _ ,_ ,_, _, _, displayAsMessage): + case let .peer(_, renderedPeer, _, _, presence, _ ,_ ,_, _, _, displayAsMessage, _): if !displayAsMessage, let peer = renderedPeer.peer as? TelegramUser, let presence = presence as? TelegramUserPresence, !isServicePeer(peer) && !peer.flags.contains(.isSupport) && peer.id != item.context.account.peerId { let relativeStatus = relativeUserPresenceStatus(presence, relativeTo: timestamp) if case .online = relativeStatus { diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift index 425ea4b2b2..ad2e877601 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListNode.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListNode.swift @@ -141,10 +141,10 @@ public struct ChatListNodeState: Equatable { private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatListNodeInteraction, peerGroupId: PeerGroupId, mode: ChatListNodeMode, entries: [ChatListNodeViewTransitionInsertEntry]) -> [ListViewInsertItem] { return entries.map { entry -> ListViewInsertItem in switch entry.entry { - case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, presence, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd): + case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, presence, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd, hasFailedMessages): switch mode { case .chatList: - return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListItem(presentationData: presentationData, context: context, peerGroupId: peerGroupId, index: index, content: .peer(message: message, peer: peer, combinedReadState: combinedReadState, notificationSettings: notificationSettings, presence: presence, summaryInfo: summaryInfo, embeddedState: embeddedState, inputActivities: inputActivities, isAd: isAd, ignoreUnreadBadge: false, displayAsMessage: false), editing: editing, hasActiveRevealControls: hasActiveRevealControls, selected: selected, header: nil, enableContextActions: true, hiddenOffset: false, interaction: nodeInteraction), directionHint: entry.directionHint) + return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListItem(presentationData: presentationData, context: context, peerGroupId: peerGroupId, index: index, content: .peer(message: message, peer: peer, combinedReadState: combinedReadState, notificationSettings: notificationSettings, presence: presence, summaryInfo: summaryInfo, embeddedState: embeddedState, inputActivities: inputActivities, isAd: isAd, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: hasFailedMessages), editing: editing, hasActiveRevealControls: hasActiveRevealControls, selected: selected, header: nil, enableContextActions: true, hiddenOffset: false, interaction: nodeInteraction), directionHint: entry.directionHint) case let .peers(filter): let itemPeer = peer.chatMainPeer var chatPeer: Peer? @@ -222,10 +222,10 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL private func mappedUpdateEntries(context: AccountContext, nodeInteraction: ChatListNodeInteraction, peerGroupId: PeerGroupId, mode: ChatListNodeMode, entries: [ChatListNodeViewTransitionUpdateEntry]) -> [ListViewUpdateItem] { return entries.map { entry -> ListViewUpdateItem in switch entry.entry { - case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, presence, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd): + case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, presence, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd, hasFailedMessages): switch mode { case .chatList: - return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListItem(presentationData: presentationData, context: context, peerGroupId: peerGroupId, index: index, content: .peer(message: message, peer: peer, combinedReadState: combinedReadState, notificationSettings: notificationSettings, presence: presence, summaryInfo: summaryInfo, embeddedState: embeddedState, inputActivities: inputActivities, isAd: isAd, ignoreUnreadBadge: false, displayAsMessage: false), editing: editing, hasActiveRevealControls: hasActiveRevealControls, selected: selected, header: nil, enableContextActions: true, hiddenOffset: false, interaction: nodeInteraction), directionHint: entry.directionHint) + return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListItem(presentationData: presentationData, context: context, peerGroupId: peerGroupId, index: index, content: .peer(message: message, peer: peer, combinedReadState: combinedReadState, notificationSettings: notificationSettings, presence: presence, summaryInfo: summaryInfo, embeddedState: embeddedState, inputActivities: inputActivities, isAd: isAd, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: hasFailedMessages), editing: editing, hasActiveRevealControls: hasActiveRevealControls, selected: selected, header: nil, enableContextActions: true, hiddenOffset: false, interaction: nodeInteraction), directionHint: entry.directionHint) case let .peers(filter): let itemPeer = peer.chatMainPeer var chatPeer: Peer? @@ -549,7 +549,7 @@ public final class ChatListNode: ListView { let (rawEntries, isLoading) = chatListNodeEntriesForView(update.view, state: state, savedMessagesPeer: savedMessagesPeer, hideArchivedFolderByDefault: hideArchivedFolderByDefault, displayArchiveIntro: displayArchiveIntro, mode: mode) let entries = rawEntries.filter { entry in switch entry { - case let .PeerEntry(_, _, _, _, _, _, peer, _, _, _, _, _, _, _): + case let .PeerEntry(_, _, _, _, _, _, peer, _, _, _, _, _, _, _, _): switch mode { case .chatList: return true @@ -654,7 +654,7 @@ public final class ChatListNode: ListView { var didIncludeHiddenByDefaultArchive = false if let previous = previousView { for entry in previous.filteredEntries { - if case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _) = entry { + if case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _) = entry { if index.pinningIndex != nil { previousPinnedChats.append(index.messageIndex.id.peerId) } @@ -670,11 +670,11 @@ public final class ChatListNode: ListView { var doesIncludeArchive = false var doesIncludeHiddenByDefaultArchive = false for entry in processedView.filteredEntries { - if case let .PeerEntry(index, _, _, _, _, _, _, _, _ , _, _, _, _, _) = entry { - if index.pinningIndex != nil { - updatedPinnedChats.append(index.messageIndex.id.peerId) + if case let .PeerEntry(peerEntry) = entry { + if peerEntry.index.pinningIndex != nil { + updatedPinnedChats.append(peerEntry.index.messageIndex.id.peerId) } - if index.messageIndex.id.peerId == removingPeerId { + if peerEntry.index.messageIndex.id.peerId == removingPeerId { doesIncludeRemovingPeerId = true } } else if case let .GroupReferenceEntry(entry) = entry { @@ -749,7 +749,7 @@ public final class ChatListNode: ListView { continue } switch chatListView.filteredEntries[entryCount - i - 1] { - case let .PeerEntry(_, _, _, readState, notificationSettings, _, _, _, _, _, _, _, _, _): + case let .PeerEntry(_, _, _, readState, notificationSettings, _, _, _, _, _, _, _, _, _, _): if let readState = readState { let count = readState.count rawUnreadCount += count @@ -895,7 +895,7 @@ public final class ChatListNode: ListView { var referenceId: PinnedItemId? var beforeAll = false switch toEntry { - case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, isAd): + case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, isAd, _): if isAd { beforeAll = true } else { @@ -913,7 +913,7 @@ public final class ChatListNode: ListView { var itemId: PinnedItemId? switch fromEntry { - case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _): + case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _): itemId = .peer(index.messageIndex.id.peerId) /*case let .GroupReferenceEntry(_, _, groupId, _, _, _, _): itemId = .group(groupId)*/ @@ -1338,7 +1338,7 @@ public final class ChatListNode: ListView { continue } switch chatListView.filteredEntries[entryCount - i - 1] { - case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _): + case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _): if interaction.highlightedChatLocation?.location == ChatLocation.peer(peer.peerId) { current = (index, peer.peerId, entryCount - i - 1) break outer @@ -1371,10 +1371,10 @@ public final class ChatListNode: ListView { case .previous(unread: false), .next(unread: false): var target: (ChatListIndex, PeerId)? = nil if let current = current, entryCount > 1 { - if current.2 > 0, case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _) = chatListView.filteredEntries[current.2 - 1] { + if current.2 > 0, case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[current.2 - 1] { next = (index, peer.peerId) } - if current.2 <= entryCount - 2, case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _) = chatListView.filteredEntries[current.2 + 1] { + if current.2 <= entryCount - 2, case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[current.2 + 1] { previous = (index, peer.peerId) } if case .previous = option { @@ -1383,7 +1383,7 @@ public final class ChatListNode: ListView { target = next } } else if entryCount > 0 { - if case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _) = chatListView.filteredEntries[entryCount - 1] { + if case let .PeerEntry(index, _, _, _, _, _, peer, _, _, _, _, _, _, _, _) = chatListView.filteredEntries[entryCount - 1] { target = (index, peer.peerId) } } @@ -1402,7 +1402,7 @@ public final class ChatListNode: ListView { |> take(1) |> deliverOnMainQueue).start(next: { update in let entries = update.view.entries - if entries.count > index, case let .MessageEntry(index, _, _, _, _, renderedPeer, _, _) = entries[10 - index - 1] { + if entries.count > index, case let .MessageEntry(index, _, _, _, _, renderedPeer, _, _, _) = entries[10 - index - 1] { let location: ChatListNodeLocation = .scroll(index: index, sourceIndex: .absoluteLowerBound, scrollPosition: .center(.top), animated: true) self.setChatListLocation(location) self.peerSelected?(renderedPeer.peerId, false, false) @@ -1445,7 +1445,7 @@ public final class ChatListNode: ListView { continue } switch chatListView.filteredEntries[entryCount - i - 1] { - case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _): + case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _): return index default: break diff --git a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift index b0da7f230d..1548b5a67f 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift @@ -13,14 +13,14 @@ enum ChatListNodeEntryId: Hashable { } enum ChatListNodeEntry: Comparable, Identifiable { - case PeerEntry(index: ChatListIndex, presentationData: ChatListPresentationData, message: Message?, readState: CombinedPeerReadState?, notificationSettings: PeerNotificationSettings?, embeddedInterfaceState: PeerChatListEmbeddedInterfaceState?, peer: RenderedPeer, presence: PeerPresence?, summaryInfo: ChatListMessageTagSummaryInfo, editing: Bool, hasActiveRevealControls: Bool, selected: Bool, inputActivities: [(Peer, PeerInputActivity)]?, isAd: Bool) + case PeerEntry(index: ChatListIndex, presentationData: ChatListPresentationData, message: Message?, readState: CombinedPeerReadState?, notificationSettings: PeerNotificationSettings?, embeddedInterfaceState: PeerChatListEmbeddedInterfaceState?, peer: RenderedPeer, presence: PeerPresence?, summaryInfo: ChatListMessageTagSummaryInfo, editing: Bool, hasActiveRevealControls: Bool, selected: Bool, inputActivities: [(Peer, PeerInputActivity)]?, isAd: Bool, hasFailedMessages: Bool) case HoleEntry(ChatListHole, theme: PresentationTheme) case GroupReferenceEntry(index: ChatListIndex, presentationData: ChatListPresentationData, groupId: PeerGroupId, peers: [ChatListGroupReferencePeer], message: Message?, editing: Bool, unreadState: PeerGroupUnreadCountersCombinedSummary, revealed: Bool, hiddenByDefault: Bool) case ArchiveIntro(presentationData: ChatListPresentationData) var sortIndex: ChatListIndex { switch self { - case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _): + case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _): return index case let .HoleEntry(hole, _): return ChatListIndex(pinningIndex: nil, messageIndex: hole.index) @@ -33,7 +33,7 @@ enum ChatListNodeEntry: Comparable, Identifiable { var stableId: ChatListNodeEntryId { switch self { - case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _): + case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _): return .PeerId(index.messageIndex.id.peerId.toInt64()) case let .HoleEntry(hole, _): return .Hole(Int64(hole.index.id.id)) @@ -50,9 +50,9 @@ enum ChatListNodeEntry: Comparable, Identifiable { static func ==(lhs: ChatListNodeEntry, rhs: ChatListNodeEntry) -> Bool { switch lhs { - case let .PeerEntry(lhsIndex, lhsPresentationData, lhsMessage, lhsUnreadCount, lhsNotificationSettings, lhsEmbeddedState, lhsPeer, lhsPresence, lhsSummaryInfo, lhsEditing, lhsHasRevealControls, lhsSelected, lhsInputActivities, lhsAd): + case let .PeerEntry(lhsIndex, lhsPresentationData, lhsMessage, lhsUnreadCount, lhsNotificationSettings, lhsEmbeddedState, lhsPeer, lhsPresence, lhsSummaryInfo, lhsEditing, lhsHasRevealControls, lhsSelected, lhsInputActivities, lhsAd, lhsHasFailedMessages): switch rhs { - case let .PeerEntry(rhsIndex, rhsPresentationData, rhsMessage, rhsUnreadCount, rhsNotificationSettings, rhsEmbeddedState, rhsPeer, rhsPresence, rhsSummaryInfo, rhsEditing, rhsHasRevealControls, rhsSelected, rhsInputActivities, rhsAd): + case let .PeerEntry(rhsIndex, rhsPresentationData, rhsMessage, rhsUnreadCount, rhsNotificationSettings, rhsEmbeddedState, rhsPeer, rhsPresence, rhsSummaryInfo, rhsEditing, rhsHasRevealControls, rhsSelected, rhsInputActivities, rhsAd, rhsHasFailedMessages): if lhsIndex != rhsIndex { return false } @@ -119,7 +119,9 @@ enum ChatListNodeEntry: Comparable, Identifiable { if lhsAd != rhsAd { return false } - + if lhsHasFailedMessages != rhsHasFailedMessages { + return false + } return true default: return false @@ -203,7 +205,7 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState, } loop: for entry in view.entries { switch entry { - case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo): + case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed): if let savedMessagesPeer = savedMessagesPeer, savedMessagesPeer.id == index.messageIndex.id.peerId { continue loop } @@ -216,7 +218,7 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState, updatedMessage = nil updatedCombinedReadState = nil } - result.append(.PeerEntry(index: offsetPinnedIndex(index, offset: pinnedIndexOffset), presentationData: state.presentationData, message: updatedMessage, readState: updatedCombinedReadState, notificationSettings: notificationSettings, embeddedInterfaceState: embeddedState, peer: peer, presence: peerPresence, summaryInfo: summaryInfo, editing: state.editing, hasActiveRevealControls: index.messageIndex.id.peerId == state.peerIdWithRevealedOptions, selected: state.selectedPeerIds.contains(index.messageIndex.id.peerId), inputActivities: state.peerInputActivities?.activities[index.messageIndex.id.peerId], isAd: false)) + result.append(.PeerEntry(index: offsetPinnedIndex(index, offset: pinnedIndexOffset), presentationData: state.presentationData, message: updatedMessage, readState: updatedCombinedReadState, notificationSettings: notificationSettings, embeddedInterfaceState: embeddedState, peer: peer, presence: peerPresence, summaryInfo: summaryInfo, editing: state.editing, hasActiveRevealControls: index.messageIndex.id.peerId == state.peerIdWithRevealedOptions, selected: state.selectedPeerIds.contains(index.messageIndex.id.peerId), inputActivities: state.peerInputActivities?.activities[index.messageIndex.id.peerId], isAd: false, hasFailedMessages: hasFailed)) case let .HoleEntry(hole): if hole.index.timestamp == Int32.max - 1 { return ([], true) @@ -228,13 +230,13 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState, var pinningIndex: UInt16 = UInt16(pinnedIndexOffset == 0 ? 0 : (pinnedIndexOffset - 1)) if let savedMessagesPeer = savedMessagesPeer { - result.append(.PeerEntry(index: ChatListIndex.absoluteUpperBound.predecessor, presentationData: state.presentationData, message: nil, readState: nil, notificationSettings: nil, embeddedInterfaceState: nil, peer: RenderedPeer(peerId: savedMessagesPeer.id, peers: SimpleDictionary([savedMessagesPeer.id: savedMessagesPeer])), presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), editing: state.editing, hasActiveRevealControls: false, selected: false, inputActivities: nil, isAd: false)) + result.append(.PeerEntry(index: ChatListIndex.absoluteUpperBound.predecessor, presentationData: state.presentationData, message: nil, readState: nil, notificationSettings: nil, embeddedInterfaceState: nil, peer: RenderedPeer(peerId: savedMessagesPeer.id, peers: SimpleDictionary([savedMessagesPeer.id: savedMessagesPeer])), presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), editing: state.editing, hasActiveRevealControls: false, selected: false, inputActivities: nil, isAd: false, hasFailedMessages: false)) } else { if !view.additionalItemEntries.isEmpty { for entry in view.additionalItemEntries.reversed() { switch entry { - case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo): - result.append(.PeerEntry(index: ChatListIndex(pinningIndex: pinningIndex, messageIndex: index.messageIndex), presentationData: state.presentationData, message: message, readState: combinedReadState, notificationSettings: notificationSettings, embeddedInterfaceState: embeddedState, peer: peer, presence: peerPresence, summaryInfo: summaryInfo, editing: state.editing, hasActiveRevealControls: index.messageIndex.id.peerId == state.peerIdWithRevealedOptions, selected: state.selectedPeerIds.contains(index.messageIndex.id.peerId), inputActivities: state.peerInputActivities?.activities[index.messageIndex.id.peerId], isAd: true)) + case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed): + result.append(.PeerEntry(index: ChatListIndex(pinningIndex: pinningIndex, messageIndex: index.messageIndex), presentationData: state.presentationData, message: message, readState: combinedReadState, notificationSettings: notificationSettings, embeddedInterfaceState: embeddedState, peer: peer, presence: peerPresence, summaryInfo: summaryInfo, editing: state.editing, hasActiveRevealControls: index.messageIndex.id.peerId == state.peerIdWithRevealedOptions, selected: state.selectedPeerIds.contains(index.messageIndex.id.peerId), inputActivities: state.peerInputActivities?.activities[index.messageIndex.id.peerId], isAd: true, hasFailedMessages: hasFailed)) if pinningIndex != 0 { pinningIndex -= 1 } diff --git a/submodules/ContextUI/BUCK b/submodules/ContextUI/BUCK index dd389963ff..9249d703dd 100644 --- a/submodules/ContextUI/BUCK +++ b/submodules/ContextUI/BUCK @@ -12,6 +12,7 @@ static_library( "//submodules/TelegramPresentationData:TelegramPresentationData", "//submodules/TextSelectionNode:TextSelectionNode", "//submodules/ReactionSelectionNode:ReactionSelectionNode", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift index ebc6bf1d49..5da7473809 100644 --- a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift +++ b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift @@ -2,6 +2,8 @@ import Foundation import AsyncDisplayKit import Display import TelegramPresentationData +import TextSelectionNode +import AppBundle private final class ContextActionsSelectionGestureRecognizer: UIPanGestureRecognizer { var updateLocation: ((CGPoint, Bool) -> Void)? @@ -38,7 +40,7 @@ private enum ContextItemNode { case separator(ASDisplayNode) } -final class ContextActionsContainerNode: ASDisplayNode { +private final class InnerActionsContainerNode: ASDisplayNode { private let presentationData: PresentationData private var effectView: UIVisualEffectView? private var itemNodes: [ContextItemNode] @@ -242,3 +244,179 @@ final class ContextActionsContainerNode: ASDisplayNode { return nil } } + +private final class InnerTextSelectionTipContainerNode: ASDisplayNode { + private let presentationData: PresentationData + private var effectView: UIVisualEffectView? + private let textNode: TextNode + private var textSelectionNode: TextSelectionNode? + private let iconNode: ASImageNode + + private let text: String + private let targetSelectionIndex: Int + + init(presentationData: PresentationData) { + self.presentationData = presentationData + self.textNode = TextNode() + + var rawText = self.presentationData.strings.ChatContextMenu_TextSelectionTip + if let range = rawText.range(of: "|") { + rawText.removeSubrange(range) + self.text = rawText + self.targetSelectionIndex = NSRange(range, in: rawText).lowerBound + } else { + self.text = rawText + self.targetSelectionIndex = 1 + } + + self.iconNode = ASImageNode() + self.iconNode.displaysAsynchronously = false + self.iconNode.displayWithoutProcessing = true + self.iconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Tip"), color: presentationData.theme.contextMenu.primaryColor) + + super.init() + + self.clipsToBounds = true + self.cornerRadius = 14.0 + + self.backgroundColor = presentationData.theme.contextMenu.backgroundColor + + let textSelectionNode = TextSelectionNode(theme: TextSelectionTheme(selection: presentationData.theme.contextMenu.primaryColor.withAlphaComponent(0.15), knob: presentationData.theme.contextMenu.primaryColor, knobDiameter: 8.0), strings: presentationData.strings, textNode: self.textNode, updateIsActive: { _ in + }, present: { _, _ in + }, rootNode: self, performAction: { _, _ in + }) + self.textSelectionNode = textSelectionNode + + self.addSubnode(self.textNode) + self.addSubnode(self.iconNode) + + self.textSelectionNode.flatMap(self.addSubnode) + + self.addSubnode(textSelectionNode.highlightAreaNode) + } + + func updateLayout(widthClass: ContainerViewLayoutSizeClass, width: CGFloat, transition: ContainedViewLayoutTransition) -> CGSize { + switch widthClass { + case .compact: + if let effectView = self.effectView { + self.effectView = nil + effectView.removeFromSuperview() + } + case .regular: + if self.effectView == nil { + let effectView: UIVisualEffectView + if #available(iOS 13.0, *) { + if self.presentationData.theme.overallDarkAppearance { + effectView = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterialDark)) + } else { + effectView = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterialLight)) + } + } else if #available(iOS 10.0, *) { + effectView = UIVisualEffectView(effect: UIBlurEffect(style: .regular)) + } else { + effectView = UIVisualEffectView(effect: UIBlurEffect(style: .light)) + } + self.effectView = effectView + self.view.insertSubview(effectView, at: 0) + } + } + + let verticalInset: CGFloat = 10.0 + let horizontalInset: CGFloat = 16.0 + let standardIconWidth: CGFloat = 32.0 + let iconSideInset: CGFloat = 12.0 + + let textFont = Font.regular(floor(presentationData.fontSize.baseDisplaySize * 14.0 / 17.0)) + + let iconSize = self.iconNode.image?.size ?? CGSize(width: 16.0, height: 16.0) + + let makeTextLayout = TextNode.asyncLayout(self.textNode) + let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: self.text, font: textFont, textColor: self.presentationData.theme.contextMenu.primaryColor), backgroundColor: nil, minimumNumberOfLines: 0, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: width - horizontalInset * 2.0 - iconSize.width - 8.0, height: .greatestFiniteMagnitude), alignment: .left, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets(), lineColor: nil, textShadowColor: nil, textStroke: nil)) + let _ = textApply() + + let textFrame = CGRect(origin: CGPoint(x: horizontalInset, y: verticalInset), size: textLayout.size) + transition.updateFrame(node: self.textNode, frame: textFrame) + + let size = CGSize(width: width, height: textLayout.size.height + verticalInset * 2.0) + + let iconFrame = CGRect(origin: CGPoint(x: size.width - standardIconWidth - iconSideInset + floor((standardIconWidth - iconSize.width) / 2.0), y: floor((size.height - iconSize.height) / 2.0)), size: iconSize) + transition.updateFrame(node: self.iconNode, frame: iconFrame) + + if let textSelectionNode = self.textSelectionNode { + transition.updateFrame(node: textSelectionNode, frame: textFrame) + textSelectionNode.highlightAreaNode.frame = textFrame + } + + if let effectView = self.effectView { + transition.updateFrame(view: effectView, frame: CGRect(origin: CGPoint(), size: size)) + } + + return size + } + + func updateTheme(presentationData: PresentationData) { + self.backgroundColor = presentationData.theme.contextMenu.backgroundColor + } + + func animateIn() { + if let textSelectionNode = self.textSelectionNode { + textSelectionNode.pretendInitiateSelection() + DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.5, execute: { [weak self] in + guard let strongSelf = self else { + return + } + strongSelf.textSelectionNode?.pretendExtendSelection(to: strongSelf.targetSelectionIndex) + }) + } + } +} + +final class ContextActionsContainerNode: ASDisplayNode { + private let actionsNode: InnerActionsContainerNode + private let textSelectionTipNode: InnerTextSelectionTipContainerNode? + + init(presentationData: PresentationData, items: [ContextMenuItem], getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void, feedbackTap: @escaping () -> Void, displayTextSelectionTip: Bool) { + self.actionsNode = InnerActionsContainerNode(presentationData: presentationData, items: items, getController: getController, actionSelected: actionSelected, feedbackTap: feedbackTap) + if displayTextSelectionTip { + let textSelectionTipNode = InnerTextSelectionTipContainerNode(presentationData: presentationData) + textSelectionTipNode.isUserInteractionEnabled = false + self.textSelectionTipNode = textSelectionTipNode + } else { + self.textSelectionTipNode = nil + } + + super.init() + + self.addSubnode(self.actionsNode) + self.textSelectionTipNode.flatMap(self.addSubnode) + } + + func updateLayout(widthClass: ContainerViewLayoutSizeClass, constrainedWidth: CGFloat, transition: ContainedViewLayoutTransition) -> CGSize { + let actionsSize = self.actionsNode.updateLayout(widthClass: widthClass, constrainedWidth: constrainedWidth, transition: transition) + + var contentSize = actionsSize + transition.updateFrame(node: self.actionsNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: actionsSize)) + + if let textSelectionTipNode = self.textSelectionTipNode { + contentSize.height += 8.0 + let textSelectionTipSize = textSelectionTipNode.updateLayout(widthClass: widthClass, width: actionsSize.width, transition: transition) + transition.updateFrame(node: textSelectionTipNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentSize.height), size: textSelectionTipSize)) + contentSize.height += textSelectionTipSize.height + } + + return contentSize + } + + func actionNode(at point: CGPoint) -> ContextActionNode? { + return self.actionsNode.actionNode(at: self.view.convert(point, to: self.actionsNode.view)) + } + + func updateTheme(presentationData: PresentationData) { + self.actionsNode.updateTheme(presentationData: presentationData) + self.textSelectionTipNode?.updateTheme(presentationData: presentationData) + } + + func animateIn() { + self.textSelectionTipNode?.animateIn() + } +} diff --git a/submodules/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift index af0637b866..ef9600e46c 100644 --- a/submodules/ContextUI/Sources/ContextController.swift +++ b/submodules/ContextUI/Sources/ContextController.swift @@ -69,6 +69,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi private let attemptTransitionControllerIntoNavigation: () -> Void private let getController: () -> ContextController? private weak var gesture: ContextGesture? + private var displayTextSelectionTip: Bool private var didSetItemsReady = false let itemsReady = Promise() @@ -107,7 +108,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi private let itemsDisposable = MetaDisposable() - init(account: Account, controller: ContextController, presentationData: PresentationData, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], beginDismiss: @escaping (ContextMenuActionResult) -> Void, recognizer: TapLongTapOrDoubleTapGestureRecognizer?, gesture: ContextGesture?, reactionSelected: @escaping (String) -> Void, beganAnimatingOut: @escaping () -> Void, attemptTransitionControllerIntoNavigation: @escaping () -> Void) { + init(account: Account, controller: ContextController, presentationData: PresentationData, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], beginDismiss: @escaping (ContextMenuActionResult) -> Void, recognizer: TapLongTapOrDoubleTapGestureRecognizer?, gesture: ContextGesture?, reactionSelected: @escaping (String) -> Void, beganAnimatingOut: @escaping () -> Void, attemptTransitionControllerIntoNavigation: @escaping () -> Void, displayTextSelectionTip: Bool) { self.presentationData = presentationData self.source = source self.items = items @@ -116,6 +117,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi self.beganAnimatingOut = beganAnimatingOut self.attemptTransitionControllerIntoNavigation = attemptTransitionControllerIntoNavigation self.gesture = gesture + self.displayTextSelectionTip = displayTextSelectionTip self.getController = { [weak controller] in return controller @@ -163,7 +165,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi beginDismiss(result) }, feedbackTap: { feedbackTap?() - }) + }, displayTextSelectionTip: self.displayTextSelectionTip) if !reactionItems.isEmpty { let reactionContextNode = ReactionContextNode(account: account, theme: presentationData.theme, items: reactionItems) @@ -528,6 +530,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi }, completion: { [weak self] in self?.didCompleteAnimationIn = true self?.hapticFeedback.prepareTap() + self?.actionsContainerNode.animateIn() }) } } else { @@ -535,6 +538,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi self.effectView.effect = makeCustomZoomBlurEffect() }, completion: { [weak self] _ in self?.didCompleteAnimationIn = true + self?.actionsContainerNode.animateIn() }) } @@ -970,7 +974,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi self?.beginDismiss(result) }, feedbackTap: { [weak self] in self?.hapticFeedback.tap() - }) + }, displayTextSelectionTip: self.displayTextSelectionTip) self.scrollNode.insertSubnode(self.actionsContainerNode, aboveSubnode: previousActionsContainerNode) if let layout = self.validLayout { @@ -982,6 +986,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi if !self.didSetItemsReady { self.didSetItemsReady = true + self.displayTextSelectionTip = false self.itemsReady.set(.single(true)) } } @@ -1374,6 +1379,7 @@ public final class ContextController: ViewController, StandalonePresentableContr private weak var recognizer: TapLongTapOrDoubleTapGestureRecognizer? private weak var gesture: ContextGesture? + private let displayTextSelectionTip: Bool private var animatedDidAppear = false private var wasDismissed = false @@ -1384,7 +1390,7 @@ public final class ContextController: ViewController, StandalonePresentableContr public var reactionSelected: ((String) -> Void)? - public init(account: Account, presentationData: PresentationData, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], recognizer: TapLongTapOrDoubleTapGestureRecognizer? = nil, gesture: ContextGesture? = nil) { + public init(account: Account, presentationData: PresentationData, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], recognizer: TapLongTapOrDoubleTapGestureRecognizer? = nil, gesture: ContextGesture? = nil, displayTextSelectionTip: Bool = false) { self.account = account self.presentationData = presentationData self.source = source @@ -1392,6 +1398,7 @@ public final class ContextController: ViewController, StandalonePresentableContr self.reactionItems = reactionItems self.recognizer = recognizer self.gesture = gesture + self.displayTextSelectionTip = displayTextSelectionTip super.init(navigationBarPresentationData: nil) @@ -1425,7 +1432,7 @@ public final class ContextController: ViewController, StandalonePresentableContr default: break } - }) + }, displayTextSelectionTip: self.displayTextSelectionTip) self.displayNodeDidLoad() diff --git a/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift b/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift index e502c3f1d8..4e2d78a55b 100644 --- a/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift +++ b/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift @@ -440,7 +440,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { case let .phoneNumberShareViaExceptionInfo(_, theme, text): return ItemListTextItem(presentationData: presentationData, text: .markdown(text), sectionId: self.section) case let .editingPhoneNumber(_, theme, strings, id, title, label, value, hasActiveRevealControls): - return UserInfoEditingPhoneItem(theme: theme, strings: strings, id: id, label: title, value: value, editing: UserInfoEditingPhoneItemEditing(editable: true, hasActiveRevealControls: hasActiveRevealControls), sectionId: self.section, setPhoneIdWithRevealedOptions: { lhs, rhs in + return UserInfoEditingPhoneItem(presentationData: presentationData, id: id, label: title, value: value, editing: UserInfoEditingPhoneItemEditing(editable: true, hasActiveRevealControls: hasActiveRevealControls), sectionId: self.section, setPhoneIdWithRevealedOptions: { lhs, rhs in arguments.setPhoneIdWithRevealedOptions(lhs, rhs) }, updated: { value in arguments.updatePhone(id, value) @@ -450,7 +450,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry { arguments.deletePhone(id) }, tag: DeviceContactInfoEntryTag.editingPhone(id)) case let .addPhoneNumber(_, theme, title): - return UserInfoEditingPhoneActionItem(theme: theme, title: title, sectionId: self.section, action: { + return UserInfoEditingPhoneActionItem(presentationData: presentationData, title: title, sectionId: self.section, action: { arguments.addPhoneNumber() }) case let .email(_, index, theme, title, label, value, selected): diff --git a/submodules/PeerInfoUI/Sources/UserInfoController.swift b/submodules/PeerInfoUI/Sources/UserInfoController.swift index 4016dc044e..2648941642 100644 --- a/submodules/PeerInfoUI/Sources/UserInfoController.swift +++ b/submodules/PeerInfoUI/Sources/UserInfoController.swift @@ -634,7 +634,7 @@ private func userInfoEntries(account: Account, presentationData: PresentationDat } } if !found { - entries.append(UserInfoEntry.phoneNumber(presentationData.theme, index, "home", formattedNumber, false)) + entries.append(UserInfoEntry.phoneNumber(presentationData.theme, index, presentationData.strings.ContactInfo_PhoneLabelMobile, formattedNumber, false)) index += 1 } else { for (label, number, isMain) in phoneNumbers { diff --git a/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneActionItem.swift b/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneActionItem.swift index 1901973af6..2a81752ebf 100644 --- a/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneActionItem.swift +++ b/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneActionItem.swift @@ -8,13 +8,13 @@ import ItemListUI import PresentationDataUtils class UserInfoEditingPhoneActionItem: ListViewItem, ItemListItem { - let theme: PresentationTheme + let presentationData: ItemListPresentationData let title: String let sectionId: ItemListSectionId let action: () -> Void - init(theme: PresentationTheme, title: String, sectionId: ItemListSectionId, action: @escaping () -> Void, tag: Any? = nil) { - self.theme = theme + init(presentationData: ItemListPresentationData, title: String, sectionId: ItemListSectionId, action: @escaping () -> Void, tag: Any? = nil) { + self.presentationData = presentationData self.title = title self.sectionId = sectionId self.action = action @@ -61,8 +61,6 @@ class UserInfoEditingPhoneActionItem: ListViewItem, ItemListItem { } } -private let titleFont = Font.regular(15.0) - class UserInfoEditingPhoneActionItemNode: ListViewItemNode { private let backgroundNode: ASDisplayNode private let topStripeNode: ASDisplayNode @@ -114,15 +112,17 @@ class UserInfoEditingPhoneActionItemNode: ListViewItemNode { let currentItem = self.item return { item, params, neighbors in + let titleFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 15.0 / 17.0)) + var updatedTheme: PresentationTheme? - if currentItem?.theme !== item.theme { - updatedTheme = item.theme + if currentItem?.presentationData.theme !== item.presentationData.theme { + updatedTheme = item.presentationData.theme } - let textColor = item.theme.list.itemAccentColor + let textColor = item.presentationData.theme.list.itemAccentColor - let iconImage = PresentationResourcesItemList.addPhoneIcon(item.theme) + let iconImage = PresentationResourcesItemList.addPhoneIcon(item.presentationData.theme) let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: textColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 20.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) @@ -133,9 +133,9 @@ class UserInfoEditingPhoneActionItemNode: ListViewItemNode { let itemBackgroundColor: UIColor let itemSeparatorColor: UIColor - itemBackgroundColor = item.theme.list.plainBackgroundColor - itemSeparatorColor = item.theme.list.itemPlainSeparatorColor - contentSize = CGSize(width: params.width, height: 44.0) + itemBackgroundColor = item.presentationData.theme.list.plainBackgroundColor + itemSeparatorColor = item.presentationData.theme.list.itemPlainSeparatorColor + contentSize = CGSize(width: params.width, height: 22.0 + titleLayout.size.height) insets = itemListNeighborsPlainInsets(neighbors) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) @@ -148,7 +148,7 @@ class UserInfoEditingPhoneActionItemNode: ListViewItemNode { strongSelf.topStripeNode.backgroundColor = itemSeparatorColor strongSelf.bottomStripeNode.backgroundColor = itemSeparatorColor strongSelf.backgroundNode.backgroundColor = itemBackgroundColor - strongSelf.highlightedBackgroundNode.backgroundColor = item.theme.list.itemHighlightedBackgroundColor + strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor } strongSelf.iconNode.image = iconImage diff --git a/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift b/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift index 14553478ad..0c27148ed1 100644 --- a/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift +++ b/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift @@ -19,8 +19,7 @@ struct UserInfoEditingPhoneItemEditing { } class UserInfoEditingPhoneItem: ListViewItem, ItemListItem { - let theme: PresentationTheme - let strings: PresentationStrings + let presentationData: ItemListPresentationData let id: Int64 let label: String let value: String @@ -32,9 +31,8 @@ class UserInfoEditingPhoneItem: ListViewItem, ItemListItem { let delete: () -> Void let tag: ItemListItemTag? - init(theme: PresentationTheme, strings: PresentationStrings, id: Int64, label: String, value: String, editing: UserInfoEditingPhoneItemEditing, sectionId: ItemListSectionId, setPhoneIdWithRevealedOptions: @escaping (Int64?, Int64?) -> Void, updated: @escaping (String) -> Void, selectLabel: (() -> Void)?, delete: @escaping () -> Void, tag: ItemListItemTag?) { - self.theme = theme - self.strings = strings + init(presentationData: ItemListPresentationData, id: Int64, label: String, value: String, editing: UserInfoEditingPhoneItemEditing, sectionId: ItemListSectionId, setPhoneIdWithRevealedOptions: @escaping (Int64?, Int64?) -> Void, updated: @escaping (String) -> Void, selectLabel: (() -> Void)?, delete: @escaping () -> Void, tag: ItemListItemTag?) { + self.presentationData = presentationData self.id = id self.label = label self.value = value @@ -83,8 +81,6 @@ class UserInfoEditingPhoneItem: ListViewItem, ItemListItem { var selectable: Bool = false } -private let titleFont = Font.regular(15.0) - class UserInfoEditingPhoneItemNode: ItemListRevealOptionsItemNode, ItemListItemNode, ItemListItemFocusableNode { private let backgroundNode: ASDisplayNode private let topStripeNode: ASDisplayNode @@ -184,9 +180,11 @@ class UserInfoEditingPhoneItemNode: ItemListRevealOptionsItemNode, ItemListItemN super.didLoad() if let item = self.item { - self.phoneNode.numberField?.textField.textColor = item.theme.list.itemPrimaryTextColor - self.phoneNode.numberField?.textField.keyboardAppearance = item.theme.rootController.keyboardColor.keyboardAppearance - self.phoneNode.numberField?.textField.tintColor = item.theme.list.itemAccentColor + self.phoneNode.numberField?.textField.textColor = item.presentationData.theme.list.itemPrimaryTextColor + self.phoneNode.numberField?.textField.keyboardAppearance = item.presentationData.theme.rootController.keyboardColor.keyboardAppearance + self.phoneNode.numberField?.textField.tintColor = item.presentationData.theme.list.itemAccentColor + let titleFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 15.0 / 17.0)) + self.phoneNode.numberField?.textField.font = titleFont } } @@ -197,15 +195,17 @@ class UserInfoEditingPhoneItemNode: ItemListRevealOptionsItemNode, ItemListItemN let currentItem = self.item return { item, params, neighbors in + let titleFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 15.0 / 17.0)) + var updatedTheme: PresentationTheme? - if currentItem?.theme !== item.theme { - updatedTheme = item.theme + if currentItem?.presentationData.theme !== item.presentationData.theme { + updatedTheme = item.presentationData.theme } - let controlSizeAndApply = editableControlLayout(item.theme, false) + let controlSizeAndApply = editableControlLayout(item.presentationData.theme, false) - let textColor = item.theme.list.itemAccentColor + let textColor = item.presentationData.theme.list.itemAccentColor let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.label, font: titleFont, textColor: textColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 20.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) @@ -216,9 +216,9 @@ class UserInfoEditingPhoneItemNode: ItemListRevealOptionsItemNode, ItemListItemN let itemBackgroundColor: UIColor let itemSeparatorColor: UIColor - itemBackgroundColor = item.theme.list.plainBackgroundColor - itemSeparatorColor = item.theme.list.itemPlainSeparatorColor - contentSize = CGSize(width: params.width, height: 44.0) + itemBackgroundColor = item.presentationData.theme.list.plainBackgroundColor + itemSeparatorColor = item.presentationData.theme.list.itemPlainSeparatorColor + contentSize = CGSize(width: params.width, height: 22.0 + labelLayout.size.height) insets = itemListNeighborsPlainInsets(neighbors) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) @@ -236,7 +236,8 @@ class UserInfoEditingPhoneItemNode: ItemListRevealOptionsItemNode, ItemListItemN strongSelf.phoneNode.numberField?.textField.textColor = updatedTheme.list.itemPrimaryTextColor strongSelf.phoneNode.numberField?.textField.keyboardAppearance = updatedTheme.rootController.keyboardColor.keyboardAppearance - strongSelf.phoneNode.numberField?.textField.tintColor = item.theme.list.itemAccentColor + strongSelf.phoneNode.numberField?.textField.tintColor = item.presentationData.theme.list.itemAccentColor + strongSelf.phoneNode.numberField?.textField.font = titleFont strongSelf.clearButton.setImage(generateClearIcon(color: updatedTheme.list.inputClearButtonColor), for: []) } @@ -283,7 +284,7 @@ class UserInfoEditingPhoneItemNode: ItemListRevealOptionsItemNode, ItemListItemN strongSelf.updateLayout(size: layout.contentSize, leftInset: params.leftInset, rightInset: params.rightInset) - strongSelf.setRevealOptions((left: [], right: [ItemListRevealOption(key: 0, title: item.strings.Common_Delete, icon: .none, color: item.theme.list.itemDisclosureActions.destructive.fillColor, textColor: item.theme.list.itemDisclosureActions.destructive.foregroundColor)])) + strongSelf.setRevealOptions((left: [], right: [ItemListRevealOption(key: 0, title: item.presentationData.strings.Common_Delete, icon: .none, color: item.presentationData.theme.list.itemDisclosureActions.destructive.fillColor, textColor: item.presentationData.theme.list.itemDisclosureActions.destructive.foregroundColor)])) } }) } diff --git a/submodules/Postbox/Sources/ChatListView.swift b/submodules/Postbox/Sources/ChatListView.swift index 0d9ff1487f..e8b09b758e 100644 --- a/submodules/Postbox/Sources/ChatListView.swift +++ b/submodules/Postbox/Sources/ChatListView.swift @@ -88,12 +88,12 @@ public struct ChatListGroupReferenceEntry: Equatable { } public enum ChatListEntry: Comparable { - case MessageEntry(ChatListIndex, Message?, CombinedPeerReadState?, PeerNotificationSettings?, PeerChatListEmbeddedInterfaceState?, RenderedPeer, PeerPresence?, ChatListMessageTagSummaryInfo) + case MessageEntry(ChatListIndex, Message?, CombinedPeerReadState?, PeerNotificationSettings?, PeerChatListEmbeddedInterfaceState?, RenderedPeer, PeerPresence?, ChatListMessageTagSummaryInfo, Bool) case HoleEntry(ChatListHole) public var index: ChatListIndex { switch self { - case let .MessageEntry(index, _, _, _, _, _, _, _): + case let .MessageEntry(index, _, _, _, _, _, _, _, _): return index case let .HoleEntry(hole): return ChatListIndex(pinningIndex: nil, messageIndex: hole.index) @@ -102,9 +102,9 @@ public enum ChatListEntry: Comparable { public static func ==(lhs: ChatListEntry, rhs: ChatListEntry) -> Bool { switch lhs { - case let .MessageEntry(lhsIndex, lhsMessage, lhsReadState, lhsSettings, lhsEmbeddedState, lhsPeer, lhsPresence, lhsInfo): + case let .MessageEntry(lhsIndex, lhsMessage, lhsReadState, lhsSettings, lhsEmbeddedState, lhsPeer, lhsPresence, lhsInfo, lhsHasFailed): switch rhs { - case let .MessageEntry(rhsIndex, rhsMessage, rhsReadState, rhsSettings, rhsEmbeddedState, rhsPeer, rhsPresence, rhsInfo): + case let .MessageEntry(rhsIndex, rhsMessage, rhsReadState, rhsSettings, rhsEmbeddedState, rhsPeer, rhsPresence, rhsInfo, rhsHasFailed): if lhsIndex != rhsIndex { return false } @@ -141,6 +141,9 @@ public enum ChatListEntry: Comparable { if lhsInfo != rhsInfo { return false } + if lhsHasFailed != rhsHasFailed { + return false + } return true default: return false @@ -178,7 +181,7 @@ private func processedChatListEntry(_ entry: MutableChatListEntry, cachedDataTab enum MutableChatListEntry: Equatable { case IntermediateMessageEntry(ChatListIndex, IntermediateMessage?, CombinedPeerReadState?, PeerChatListEmbeddedInterfaceState?) - case MessageEntry(ChatListIndex, Message?, CombinedPeerReadState?, PeerNotificationSettings?, PeerChatListEmbeddedInterfaceState?, RenderedPeer, PeerPresence?, ChatListMessageTagSummaryInfo) + case MessageEntry(ChatListIndex, Message?, CombinedPeerReadState?, PeerNotificationSettings?, PeerChatListEmbeddedInterfaceState?, RenderedPeer, PeerPresence?, ChatListMessageTagSummaryInfo, Bool) case HoleEntry(ChatListHole) init(_ intermediateEntry: ChatListIntermediateEntry, cachedDataTable: CachedPeerDataTable, readStateTable: MessageHistoryReadStateTable, messageHistoryTable: MessageHistoryTable) { @@ -194,7 +197,7 @@ enum MutableChatListEntry: Equatable { switch self { case let .IntermediateMessageEntry(index, _, _, _): return index - case let .MessageEntry(index, _, _, _, _, _, _, _): + case let .MessageEntry(index, _, _, _, _, _, _, _, _): return index case let .HoleEntry(hole): return ChatListIndex(pinningIndex: nil, messageIndex: hole.index) @@ -488,13 +491,13 @@ final class MutableChatListView { if !updatedPeerNotificationSettings.isEmpty { for i in 0 ..< self.entries.count { switch self.entries[i] { - case let .MessageEntry(index, message, readState, _, embeddedState, peer, peerPresence, summaryInfo): + case let .MessageEntry(index, message, readState, _, embeddedState, peer, peerPresence, summaryInfo, hasFailed): var notificationSettingsPeerId = peer.peerId if let peer = peer.peers[peer.peerId], let associatedPeerId = peer.associatedPeerId { notificationSettingsPeerId = associatedPeerId } if let settings = updatedPeerNotificationSettings[notificationSettingsPeerId] { - self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo) + self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed) hasChanges = true } default: @@ -502,17 +505,35 @@ final class MutableChatListView { } } } + + if !transaction.updatedFailedMessagePeerIds.isEmpty { + for i in 0 ..< self.entries.count { + switch self.entries[i] { + case let .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, previousHasFailed): + if transaction.updatedFailedMessagePeerIds.contains(index.messageIndex.id.peerId) { + let hasFailed = postbox.messageHistoryFailedTable.contains(peerId: index.messageIndex.id.peerId) + if previousHasFailed != hasFailed { + self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed) + hasChanges = true + } + } + default: + continue + } + } + } + if !updatedPeers.isEmpty { for i in 0 ..< self.entries.count { switch self.entries[i] { - case let .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo): + case let .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed): var updatedMessage: Message? if let message = message { updatedMessage = updateMessagePeers(message, updatedPeers: updatedPeers) } let updatedPeer = updatedRenderedPeer(peer, updatedPeers: updatedPeers) if updatedMessage != nil || updatedPeer != nil { - self.entries[i] = .MessageEntry(index, updatedMessage ?? message, readState, settings, embeddedState, updatedPeer ?? peer, peerPresence, summaryInfo) + self.entries[i] = .MessageEntry(index, updatedMessage ?? message, readState, settings, embeddedState, updatedPeer ?? peer, peerPresence, summaryInfo, hasFailed) hasChanges = true } default: @@ -523,13 +544,13 @@ final class MutableChatListView { if !updatedPeerPresences.isEmpty { for i in 0 ..< self.entries.count { switch self.entries[i] { - case let .MessageEntry(index, message, readState, settings, embeddedState, peer, _, summaryInfo): + case let .MessageEntry(index, message, readState, settings, embeddedState, peer, _, summaryInfo, hasFailed): var presencePeerId = peer.peerId if let peer = peer.peers[peer.peerId], let associatedPeerId = peer.associatedPeerId { presencePeerId = associatedPeerId } if let presence = updatedPeerPresences[presencePeerId] { - self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, presence, summaryInfo) + self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, presence, summaryInfo, hasFailed) hasChanges = true } default: @@ -540,7 +561,7 @@ final class MutableChatListView { if !transaction.currentUpdatedMessageTagSummaries.isEmpty || !transaction.currentUpdatedMessageActionsSummaries.isEmpty { for i in 0 ..< self.entries.count { switch self.entries[i] { - case let .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, currentSummary): + case let .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, currentSummary, hasFailed): var updatedTagSummaryCount: Int32? var updatedActionsSummaryCount: Int32? @@ -561,7 +582,7 @@ final class MutableChatListView { if updatedTagSummaryCount != nil || updatedActionsSummaryCount != nil { let summaryInfo = ChatListMessageTagSummaryInfo(tagSummaryCount: updatedTagSummaryCount ?? currentSummary.tagSummaryCount, actionsSummaryCount: updatedActionsSummaryCount ?? currentSummary.actionsSummaryCount) - self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo) + self.entries[i] = .MessageEntry(index, message, readState, settings, embeddedState, peer, peerPresence, summaryInfo, hasFailed) hasChanges = true } default: @@ -816,51 +837,48 @@ final class MutableChatListView { private func renderEntry(_ entry: MutableChatListEntry, postbox: Postbox, renderMessage: (IntermediateMessage) -> Message, getPeer: (PeerId) -> Peer?, getPeerNotificationSettings: (PeerId) -> PeerNotificationSettings?, getPeerPresence: (PeerId) -> PeerPresence?) -> MutableChatListEntry? { switch entry { - case let .IntermediateMessageEntry(index, message, combinedReadState, embeddedState): - let renderedMessage: Message? - if let message = message { - renderedMessage = renderMessage(message) + case let .IntermediateMessageEntry(index, message, combinedReadState, embeddedState): + let renderedMessage: Message? + if let message = message { + renderedMessage = renderMessage(message) + } else { + renderedMessage = nil + } + var peers = SimpleDictionary() + var notificationSettings: PeerNotificationSettings? + var presence: PeerPresence? + if let peer = getPeer(index.messageIndex.id.peerId) { + peers[peer.id] = peer + if let associatedPeerId = peer.associatedPeerId { + if let associatedPeer = getPeer(associatedPeerId) { + peers[associatedPeer.id] = associatedPeer + } + notificationSettings = getPeerNotificationSettings(associatedPeerId) + presence = getPeerPresence(associatedPeerId) } else { - renderedMessage = nil + notificationSettings = getPeerNotificationSettings(index.messageIndex.id.peerId) + presence = getPeerPresence(index.messageIndex.id.peerId) } - var peers = SimpleDictionary() - var notificationSettings: PeerNotificationSettings? - var presence: PeerPresence? - if let peer = getPeer(index.messageIndex.id.peerId) { - peers[peer.id] = peer - if let associatedPeerId = peer.associatedPeerId { - if let associatedPeer = getPeer(associatedPeerId) { - peers[associatedPeer.id] = associatedPeer - } - notificationSettings = getPeerNotificationSettings(associatedPeerId) - presence = getPeerPresence(associatedPeerId) - } else { - notificationSettings = getPeerNotificationSettings(index.messageIndex.id.peerId) - presence = getPeerPresence(index.messageIndex.id.peerId) - } + } + + var tagSummaryCount: Int32? + var actionsSummaryCount: Int32? + + if let tagSummary = self.summaryComponents.tagSummary { + let key = MessageHistoryTagsSummaryKey(tag: tagSummary.tag, peerId: index.messageIndex.id.peerId, namespace: tagSummary.namespace) + if let summary = postbox.messageHistoryTagsSummaryTable.get(key) { + tagSummaryCount = summary.count } - - var tagSummaryCount: Int32? - var actionsSummaryCount: Int32? - - if let tagSummary = self.summaryComponents.tagSummary { - let key = MessageHistoryTagsSummaryKey(tag: tagSummary.tag, peerId: index.messageIndex.id.peerId, namespace: tagSummary.namespace) - if let summary = postbox.messageHistoryTagsSummaryTable.get(key) { - tagSummaryCount = summary.count - } - } - - if let actionsSummary = self.summaryComponents.actionsSummary { - let key = PendingMessageActionsSummaryKey(type: actionsSummary.type, peerId: index.messageIndex.id.peerId, namespace: actionsSummary.namespace) - actionsSummaryCount = postbox.pendingMessageActionsMetadataTable.getCount(.peerNamespaceAction(key.peerId, key.namespace, key.type)) - } - - return .MessageEntry(index, renderedMessage, combinedReadState, notificationSettings, embeddedState, RenderedPeer(peerId: index.messageIndex.id.peerId, peers: peers), presence, ChatListMessageTagSummaryInfo(tagSummaryCount: tagSummaryCount, actionsSummaryCount: actionsSummaryCount)) - /*case let .IntermediateGroupReferenceEntry(groupId, index, counters): - let message = postbox.messageHistoryTable.getMessage(index.messageIndex).flatMap(postbox.renderIntermediateMessage) - return .GroupReferenceEntry(groupId, index, message, ChatListGroupReferenceTopPeers(postbox: postbox, groupId: groupId), counters ?? ChatListGroupReferenceUnreadCounters(postbox: postbox, groupId: groupId))*/ - default: - return nil + } + + if let actionsSummary = self.summaryComponents.actionsSummary { + let key = PendingMessageActionsSummaryKey(type: actionsSummary.type, peerId: index.messageIndex.id.peerId, namespace: actionsSummary.namespace) + actionsSummaryCount = postbox.pendingMessageActionsMetadataTable.getCount(.peerNamespaceAction(key.peerId, key.namespace, key.type)) + } + + return .MessageEntry(index, renderedMessage, combinedReadState, notificationSettings, embeddedState, RenderedPeer(peerId: index.messageIndex.id.peerId, peers: peers), presence, ChatListMessageTagSummaryInfo(tagSummaryCount: tagSummaryCount, actionsSummaryCount: actionsSummaryCount), postbox.messageHistoryFailedTable.contains(peerId: index.messageIndex.id.peerId)) + default: + return nil } } @@ -892,8 +910,8 @@ public final class ChatListView { var entries: [ChatListEntry] = [] for entry in mutableView.entries { switch entry { - case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo): - entries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo)) + case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed): + entries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed)) case let .HoleEntry(hole): entries.append(.HoleEntry(hole)) /*case let .GroupReferenceEntry(groupId, index, message, topPeers, counters): @@ -912,8 +930,8 @@ public final class ChatListView { var additionalItemEntries: [ChatListEntry] = [] for entry in mutableView.additionalItemEntries { switch entry { - case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo): - additionalItemEntries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo)) + case let .MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed): + additionalItemEntries.append(.MessageEntry(index, message, combinedReadState, notificationSettings, embeddedState, peer, peerPresence, summaryInfo, hasFailed)) case .HoleEntry: assertionFailure() /*case .GroupReferenceEntry: diff --git a/submodules/Postbox/Sources/MessageHistoryFailedTable.swift b/submodules/Postbox/Sources/MessageHistoryFailedTable.swift new file mode 100644 index 0000000000..c1cc3cb8f2 --- /dev/null +++ b/submodules/Postbox/Sources/MessageHistoryFailedTable.swift @@ -0,0 +1,55 @@ +import Foundation + +final class MessageHistoryFailedTable: Table { + static func tableSpec(_ id: Int32) -> ValueBoxTable { + return ValueBoxTable(id: id, keyType: .binary, compactValuesOnCreation: true) + } + + private let sharedKey = ValueBoxKey(length: 8 + 4 + 4) + + private(set) var updatedPeerIds = Set() + + private func key(_ id: MessageId) -> ValueBoxKey { + self.sharedKey.setInt64(0, value: id.peerId.toInt64()) + self.sharedKey.setInt32(8, value: id.namespace) + self.sharedKey.setInt32(8 + 4, value: id.id) + + return self.sharedKey + } + + private func lowerBound(peerId: PeerId) -> ValueBoxKey { + let key = ValueBoxKey(length: 8) + key.setInt64(0, value: peerId.toInt64()) + return key + } + + private func upperBound(peerId: PeerId) -> ValueBoxKey { + let key = ValueBoxKey(length: 8) + key.setInt64(0, value: peerId.toInt64()) + return key.successor + } + + func add(_ id: MessageId) { + self.valueBox.set(self.table, key: self.key(id), value: MemoryBuffer()) + self.updatedPeerIds.insert(id.peerId) + } + + func remove(_ id: MessageId) { + self.valueBox.remove(self.table, key: self.key(id), secure: false) + self.updatedPeerIds.insert(id.peerId) + } + + func contains(peerId: PeerId) -> Bool { + var result = false + self.valueBox.range(self.table, start: self.lowerBound(peerId: peerId), end: self.upperBound(peerId: peerId), keys: { _ in + result = true + return false + }, limit: 1) + return result + } + + override func beforeCommit() { + self.updatedPeerIds.removeAll() + } +} + diff --git a/submodules/Postbox/Sources/MessageHistoryTable.swift b/submodules/Postbox/Sources/MessageHistoryTable.swift index ae3c09848b..5dc3bea560 100644 --- a/submodules/Postbox/Sources/MessageHistoryTable.swift +++ b/submodules/Postbox/Sources/MessageHistoryTable.swift @@ -69,6 +69,7 @@ final class MessageHistoryTable: Table { let historyMetadataTable: MessageHistoryMetadataTable let globallyUniqueMessageIdsTable: MessageGloballyUniqueIdTable let unsentTable: MessageHistoryUnsentTable + let failedTable: MessageHistoryFailedTable let tagsTable: MessageHistoryTagsTable let globalTagsTable: GlobalMessageHistoryTagsTable let localTagsTable: LocalMessageHistoryTagsTable @@ -78,7 +79,7 @@ final class MessageHistoryTable: Table { let summaryTable: MessageHistoryTagsSummaryTable let pendingActionsTable: PendingMessageActionsTable - init(valueBox: ValueBox, table: ValueBoxTable, seedConfiguration: SeedConfiguration, messageHistoryIndexTable: MessageHistoryIndexTable, messageHistoryHoleIndexTable: MessageHistoryHoleIndexTable, messageMediaTable: MessageMediaTable, historyMetadataTable: MessageHistoryMetadataTable, globallyUniqueMessageIdsTable: MessageGloballyUniqueIdTable, unsentTable: MessageHistoryUnsentTable, tagsTable: MessageHistoryTagsTable, globalTagsTable: GlobalMessageHistoryTagsTable, localTagsTable: LocalMessageHistoryTagsTable, readStateTable: MessageHistoryReadStateTable, synchronizeReadStateTable: MessageHistorySynchronizeReadStateTable, textIndexTable: MessageHistoryTextIndexTable, summaryTable: MessageHistoryTagsSummaryTable, pendingActionsTable: PendingMessageActionsTable) { + init(valueBox: ValueBox, table: ValueBoxTable, seedConfiguration: SeedConfiguration, messageHistoryIndexTable: MessageHistoryIndexTable, messageHistoryHoleIndexTable: MessageHistoryHoleIndexTable, messageMediaTable: MessageMediaTable, historyMetadataTable: MessageHistoryMetadataTable, globallyUniqueMessageIdsTable: MessageGloballyUniqueIdTable, unsentTable: MessageHistoryUnsentTable, failedTable: MessageHistoryFailedTable, tagsTable: MessageHistoryTagsTable, globalTagsTable: GlobalMessageHistoryTagsTable, localTagsTable: LocalMessageHistoryTagsTable, readStateTable: MessageHistoryReadStateTable, synchronizeReadStateTable: MessageHistorySynchronizeReadStateTable, textIndexTable: MessageHistoryTextIndexTable, summaryTable: MessageHistoryTagsSummaryTable, pendingActionsTable: PendingMessageActionsTable) { self.seedConfiguration = seedConfiguration self.messageHistoryIndexTable = messageHistoryIndexTable self.messageHistoryHoleIndexTable = messageHistoryHoleIndexTable @@ -86,6 +87,7 @@ final class MessageHistoryTable: Table { self.historyMetadataTable = historyMetadataTable self.globallyUniqueMessageIdsTable = globallyUniqueMessageIdsTable self.unsentTable = unsentTable + self.failedTable = failedTable self.tagsTable = tagsTable self.globalTagsTable = globalTagsTable self.localTagsTable = localTagsTable @@ -249,6 +251,9 @@ final class MessageHistoryTable: Table { if message.flags.contains(.Unsent) && !message.flags.contains(.Failed) { self.unsentTable.add(message.id, operations: &unsentMessageOperations) } + if message.flags.contains(.Failed) { + self.failedTable.add(message.id) + } let tags = message.tags.rawValue if tags != 0 { for i in 0 ..< 32 { @@ -1194,6 +1199,9 @@ final class MessageHistoryTable: Table { if message.flags.contains(.Unsent) && !message.flags.contains(.Failed) { self.unsentTable.remove(index.id, operations: &unsentMessageOperations) } + if message.flags.contains(.Failed) { + self.failedTable.remove(message.id) + } if let globallyUniqueId = message.globallyUniqueId { self.globallyUniqueMessageIdsTable.remove(peerId: message.id.peerId, globallyUniqueId: globallyUniqueId) @@ -1447,6 +1455,23 @@ final class MessageHistoryTable: Table { break } + if previousMessage.id != message.id { + if previousMessage.flags.contains(.Failed) { + self.failedTable.remove(previousMessage.id) + } + if message.flags.contains(.Failed) { + self.failedTable.add(message.id) + } + } else { + if previousMessage.flags.contains(.Failed) != message.flags.contains(.Failed) { + if previousMessage.flags.contains(.Failed) { + self.failedTable.remove(previousMessage.id) + } else { + self.failedTable.add(message.id) + } + } + } + if self.seedConfiguration.peerNamespacesRequiringMessageTextIndex.contains(message.id.peerId.namespace) { if previousMessage.id != message.id || previousMessage.text != message.text || previousMessage.tags != message.tags { self.textIndexTable.remove(messageId: previousMessage.id) diff --git a/submodules/Postbox/Sources/Postbox.swift b/submodules/Postbox/Sources/Postbox.swift index 957668a110..55db3c8a29 100644 --- a/submodules/Postbox/Sources/Postbox.swift +++ b/submodules/Postbox/Sources/Postbox.swift @@ -1134,6 +1134,7 @@ public final class Postbox { let additionalChatListItemsTable: AdditionalChatListItemsTable let messageHistoryMetadataTable: MessageHistoryMetadataTable let messageHistoryUnsentTable: MessageHistoryUnsentTable + let messageHistoryFailedTable: MessageHistoryFailedTable let messageHistoryTagsTable: MessageHistoryTagsTable let globalMessageHistoryTagsTable: GlobalMessageHistoryTagsTable let localMessageHistoryTagsTable: LocalMessageHistoryTagsTable @@ -1211,6 +1212,7 @@ public final class Postbox { self.messageHistoryMetadataTable = MessageHistoryMetadataTable(valueBox: self.valueBox, table: MessageHistoryMetadataTable.tableSpec(10)) self.messageHistoryHoleIndexTable = MessageHistoryHoleIndexTable(valueBox: self.valueBox, table: MessageHistoryHoleIndexTable.tableSpec(56), metadataTable: self.messageHistoryMetadataTable, seedConfiguration: self.seedConfiguration) self.messageHistoryUnsentTable = MessageHistoryUnsentTable(valueBox: self.valueBox, table: MessageHistoryUnsentTable.tableSpec(11)) + self.messageHistoryFailedTable = MessageHistoryFailedTable(valueBox: self.valueBox, table: MessageHistoryFailedTable.tableSpec(49)) self.invalidatedMessageHistoryTagsSummaryTable = InvalidatedMessageHistoryTagsSummaryTable(valueBox: self.valueBox, table: InvalidatedMessageHistoryTagsSummaryTable.tableSpec(47)) self.messageHistoryTagsSummaryTable = MessageHistoryTagsSummaryTable(valueBox: self.valueBox, table: MessageHistoryTagsSummaryTable.tableSpec(44), invalidateTable: self.invalidatedMessageHistoryTagsSummaryTable) self.pendingMessageActionsMetadataTable = PendingMessageActionsMetadataTable(valueBox: self.valueBox, table: PendingMessageActionsMetadataTable.tableSpec(45)) @@ -1227,7 +1229,7 @@ public final class Postbox { self.timestampBasedMessageAttributesTable = TimestampBasedMessageAttributesTable(valueBox: self.valueBox, table: TimestampBasedMessageAttributesTable.tableSpec(34), indexTable: self.timestampBasedMessageAttributesIndexTable) self.textIndexTable = MessageHistoryTextIndexTable(valueBox: self.valueBox, table: MessageHistoryTextIndexTable.tableSpec(41)) self.additionalChatListItemsTable = AdditionalChatListItemsTable(valueBox: self.valueBox, table: AdditionalChatListItemsTable.tableSpec(55)) - self.messageHistoryTable = MessageHistoryTable(valueBox: self.valueBox, table: MessageHistoryTable.tableSpec(7), seedConfiguration: seedConfiguration, messageHistoryIndexTable: self.messageHistoryIndexTable, messageHistoryHoleIndexTable: self.messageHistoryHoleIndexTable, messageMediaTable: self.mediaTable, historyMetadataTable: self.messageHistoryMetadataTable, globallyUniqueMessageIdsTable: self.globallyUniqueMessageIdsTable, unsentTable: self.messageHistoryUnsentTable, tagsTable: self.messageHistoryTagsTable, globalTagsTable: self.globalMessageHistoryTagsTable, localTagsTable: self.localMessageHistoryTagsTable, readStateTable: self.readStateTable, synchronizeReadStateTable: self.synchronizeReadStateTable, textIndexTable: self.textIndexTable, summaryTable: self.messageHistoryTagsSummaryTable, pendingActionsTable: self.pendingMessageActionsTable) + self.messageHistoryTable = MessageHistoryTable(valueBox: self.valueBox, table: MessageHistoryTable.tableSpec(7), seedConfiguration: seedConfiguration, messageHistoryIndexTable: self.messageHistoryIndexTable, messageHistoryHoleIndexTable: self.messageHistoryHoleIndexTable, messageMediaTable: self.mediaTable, historyMetadataTable: self.messageHistoryMetadataTable, globallyUniqueMessageIdsTable: self.globallyUniqueMessageIdsTable, unsentTable: self.messageHistoryUnsentTable, failedTable: self.messageHistoryFailedTable, tagsTable: self.messageHistoryTagsTable, globalTagsTable: self.globalMessageHistoryTagsTable, localTagsTable: self.localMessageHistoryTagsTable, readStateTable: self.readStateTable, synchronizeReadStateTable: self.synchronizeReadStateTable, textIndexTable: self.textIndexTable, summaryTable: self.messageHistoryTagsSummaryTable, pendingActionsTable: self.pendingMessageActionsTable) self.peerChatStateTable = PeerChatStateTable(valueBox: self.valueBox, table: PeerChatStateTable.tableSpec(13)) self.peerNameTokenIndexTable = ReverseIndexReferenceTable(valueBox: self.valueBox, table: ReverseIndexReferenceTable.tableSpec(26)) self.peerNameIndexTable = PeerNameIndexTable(valueBox: self.valueBox, table: PeerNameIndexTable.tableSpec(27), peerTable: self.peerTable, peerNameTokenIndexTable: self.peerNameTokenIndexTable) @@ -1267,6 +1269,7 @@ public final class Postbox { tables.append(self.globallyUniqueMessageIdsTable) tables.append(self.messageHistoryMetadataTable) tables.append(self.messageHistoryUnsentTable) + tables.append(self.messageHistoryFailedTable) tables.append(self.messageHistoryTagsTable) tables.append(self.globalMessageHistoryTagsTable) tables.append(self.localMessageHistoryTagsTable) @@ -1700,7 +1703,7 @@ public final class Postbox { let transactionParticipationInTotalUnreadCountUpdates = self.peerNotificationSettingsTable.transactionParticipationInTotalUnreadCountUpdates(postbox: self) self.chatListIndexTable.commitWithTransaction(postbox: self, alteredInitialPeerCombinedReadStates: alteredInitialPeerCombinedReadStates, updatedPeers: updatedPeers, transactionParticipationInTotalUnreadCountUpdates: transactionParticipationInTotalUnreadCountUpdates, updatedRootUnreadState: &self.currentUpdatedTotalUnreadState, updatedGroupTotalUnreadSummaries: &self.currentUpdatedGroupTotalUnreadSummaries, currentUpdatedGroupSummarySynchronizeOperations: &self.currentUpdatedGroupSummarySynchronizeOperations) - let transaction = PostboxTransaction(currentUpdatedState: self.currentUpdatedState, currentPeerHoleOperations: self.currentPeerHoleOperations, currentOperationsByPeerId: self.currentOperationsByPeerId, chatListOperations: self.currentChatListOperations, currentUpdatedChatListInclusions: self.currentUpdatedChatListInclusions, currentUpdatedPeers: self.currentUpdatedPeers, currentUpdatedPeerNotificationSettings: self.currentUpdatedPeerNotificationSettings, currentUpdatedPeerNotificationBehaviorTimestamps: self.currentUpdatedPeerNotificationBehaviorTimestamps, currentUpdatedCachedPeerData: self.currentUpdatedCachedPeerData, currentUpdatedPeerPresences: currentUpdatedPeerPresences, currentUpdatedPeerChatListEmbeddedStates: self.currentUpdatedPeerChatListEmbeddedStates, currentUpdatedTotalUnreadState: self.currentUpdatedTotalUnreadState, currentUpdatedTotalUnreadSummaries: self.currentUpdatedGroupTotalUnreadSummaries, alteredInitialPeerCombinedReadStates: alteredInitialPeerCombinedReadStates, currentPeerMergedOperationLogOperations: self.currentPeerMergedOperationLogOperations, currentTimestampBasedMessageAttributesOperations: self.currentTimestampBasedMessageAttributesOperations, unsentMessageOperations: self.currentUnsentOperations, updatedSynchronizePeerReadStateOperations: self.currentUpdatedSynchronizeReadStateOperations, currentUpdatedGroupSummarySynchronizeOperations: self.currentUpdatedGroupSummarySynchronizeOperations, currentPreferencesOperations: self.currentPreferencesOperations, currentOrderedItemListOperations: self.currentOrderedItemListOperations, currentItemCollectionItemsOperations: self.currentItemCollectionItemsOperations, currentItemCollectionInfosOperations: self.currentItemCollectionInfosOperations, currentUpdatedPeerChatStates: self.currentUpdatedPeerChatStates, currentGlobalTagsOperations: self.currentGlobalTagsOperations, currentLocalTagsOperations: self.currentLocalTagsOperations, updatedMedia: self.currentUpdatedMedia, replaceRemoteContactCount: self.currentReplaceRemoteContactCount, replaceContactPeerIds: self.currentReplacedContactPeerIds, currentPendingMessageActionsOperations: self.currentPendingMessageActionsOperations, currentUpdatedMessageActionsSummaries: self.currentUpdatedMessageActionsSummaries, currentUpdatedMessageTagSummaries: self.currentUpdatedMessageTagSummaries, currentInvalidateMessageTagSummaries: self.currentInvalidateMessageTagSummaries, currentUpdatedPendingPeerNotificationSettings: self.currentUpdatedPendingPeerNotificationSettings, replacedAdditionalChatListItems: self.currentReplacedAdditionalChatListItems, updatedNoticeEntryKeys: self.currentUpdatedNoticeEntryKeys, updatedCacheEntryKeys: self.currentUpdatedCacheEntryKeys, currentUpdatedMasterClientId: currentUpdatedMasterClientId) + let transaction = PostboxTransaction(currentUpdatedState: self.currentUpdatedState, currentPeerHoleOperations: self.currentPeerHoleOperations, currentOperationsByPeerId: self.currentOperationsByPeerId, chatListOperations: self.currentChatListOperations, currentUpdatedChatListInclusions: self.currentUpdatedChatListInclusions, currentUpdatedPeers: self.currentUpdatedPeers, currentUpdatedPeerNotificationSettings: self.currentUpdatedPeerNotificationSettings, currentUpdatedPeerNotificationBehaviorTimestamps: self.currentUpdatedPeerNotificationBehaviorTimestamps, currentUpdatedCachedPeerData: self.currentUpdatedCachedPeerData, currentUpdatedPeerPresences: currentUpdatedPeerPresences, currentUpdatedPeerChatListEmbeddedStates: self.currentUpdatedPeerChatListEmbeddedStates, currentUpdatedTotalUnreadState: self.currentUpdatedTotalUnreadState, currentUpdatedTotalUnreadSummaries: self.currentUpdatedGroupTotalUnreadSummaries, alteredInitialPeerCombinedReadStates: alteredInitialPeerCombinedReadStates, currentPeerMergedOperationLogOperations: self.currentPeerMergedOperationLogOperations, currentTimestampBasedMessageAttributesOperations: self.currentTimestampBasedMessageAttributesOperations, unsentMessageOperations: self.currentUnsentOperations, updatedSynchronizePeerReadStateOperations: self.currentUpdatedSynchronizeReadStateOperations, currentUpdatedGroupSummarySynchronizeOperations: self.currentUpdatedGroupSummarySynchronizeOperations, currentPreferencesOperations: self.currentPreferencesOperations, currentOrderedItemListOperations: self.currentOrderedItemListOperations, currentItemCollectionItemsOperations: self.currentItemCollectionItemsOperations, currentItemCollectionInfosOperations: self.currentItemCollectionInfosOperations, currentUpdatedPeerChatStates: self.currentUpdatedPeerChatStates, currentGlobalTagsOperations: self.currentGlobalTagsOperations, currentLocalTagsOperations: self.currentLocalTagsOperations, updatedMedia: self.currentUpdatedMedia, replaceRemoteContactCount: self.currentReplaceRemoteContactCount, replaceContactPeerIds: self.currentReplacedContactPeerIds, currentPendingMessageActionsOperations: self.currentPendingMessageActionsOperations, currentUpdatedMessageActionsSummaries: self.currentUpdatedMessageActionsSummaries, currentUpdatedMessageTagSummaries: self.currentUpdatedMessageTagSummaries, currentInvalidateMessageTagSummaries: self.currentInvalidateMessageTagSummaries, currentUpdatedPendingPeerNotificationSettings: self.currentUpdatedPendingPeerNotificationSettings, replacedAdditionalChatListItems: self.currentReplacedAdditionalChatListItems, updatedNoticeEntryKeys: self.currentUpdatedNoticeEntryKeys, updatedCacheEntryKeys: self.currentUpdatedCacheEntryKeys, currentUpdatedMasterClientId: currentUpdatedMasterClientId, updatedFailedMessagePeerIds: self.messageHistoryFailedTable.updatedPeerIds) var updatedTransactionState: Int64? var updatedMasterClientId: Int64? if !transaction.isEmpty { diff --git a/submodules/Postbox/Sources/PostboxTransaction.swift b/submodules/Postbox/Sources/PostboxTransaction.swift index 52401de1aa..056d9523ad 100644 --- a/submodules/Postbox/Sources/PostboxTransaction.swift +++ b/submodules/Postbox/Sources/PostboxTransaction.swift @@ -40,6 +40,7 @@ final class PostboxTransaction { let replacedAdditionalChatListItems: [PeerId]? let updatedNoticeEntryKeys: Set let updatedCacheEntryKeys: Set + let updatedFailedMessagePeerIds: Set var isEmpty: Bool { if currentUpdatedState != nil { @@ -159,10 +160,13 @@ final class PostboxTransaction { if !updatedCacheEntryKeys.isEmpty { return false } + if !updatedFailedMessagePeerIds.isEmpty { + return false + } return true } - init(currentUpdatedState: PostboxCoding?, currentPeerHoleOperations: [MessageHistoryIndexHoleOperationKey: [MessageHistoryIndexHoleOperation]] = [:], currentOperationsByPeerId: [PeerId: [MessageHistoryOperation]], chatListOperations: [PeerGroupId: [ChatListOperation]], currentUpdatedChatListInclusions: [PeerId: PeerChatListInclusion], currentUpdatedPeers: [PeerId: Peer], currentUpdatedPeerNotificationSettings: [PeerId: PeerNotificationSettings], currentUpdatedPeerNotificationBehaviorTimestamps: [PeerId: PeerNotificationSettingsBehaviorTimestamp], currentUpdatedCachedPeerData: [PeerId: CachedPeerData], currentUpdatedPeerPresences: [PeerId: PeerPresence], currentUpdatedPeerChatListEmbeddedStates: [PeerId: PeerChatListEmbeddedInterfaceState?], currentUpdatedTotalUnreadState: ChatListTotalUnreadState?, currentUpdatedTotalUnreadSummaries: [PeerGroupId: PeerGroupUnreadCountersCombinedSummary], alteredInitialPeerCombinedReadStates: [PeerId: CombinedPeerReadState], currentPeerMergedOperationLogOperations: [PeerMergedOperationLogOperation], currentTimestampBasedMessageAttributesOperations: [TimestampBasedMessageAttributesOperation], unsentMessageOperations: [IntermediateMessageHistoryUnsentOperation], updatedSynchronizePeerReadStateOperations: [PeerId: PeerReadStateSynchronizationOperation?], currentUpdatedGroupSummarySynchronizeOperations: [PeerGroupAndNamespace: Bool], currentPreferencesOperations: [PreferencesOperation], currentOrderedItemListOperations: [Int32: [OrderedItemListOperation]], currentItemCollectionItemsOperations: [ItemCollectionId: [ItemCollectionItemsOperation]], currentItemCollectionInfosOperations: [ItemCollectionInfosOperation], currentUpdatedPeerChatStates: Set, currentGlobalTagsOperations: [GlobalMessageHistoryTagsOperation], currentLocalTagsOperations: [IntermediateMessageHistoryLocalTagsOperation], updatedMedia: [MediaId: Media?], replaceRemoteContactCount: Int32?, replaceContactPeerIds: Set?, currentPendingMessageActionsOperations: [PendingMessageActionsOperation], currentUpdatedMessageActionsSummaries: [PendingMessageActionsSummaryKey: Int32], currentUpdatedMessageTagSummaries: [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], currentInvalidateMessageTagSummaries: [InvalidatedMessageHistoryTagsSummaryEntryOperation], currentUpdatedPendingPeerNotificationSettings: Set, replacedAdditionalChatListItems: [PeerId]?, updatedNoticeEntryKeys: Set, updatedCacheEntryKeys: Set, currentUpdatedMasterClientId: Int64?) { + init(currentUpdatedState: PostboxCoding?, currentPeerHoleOperations: [MessageHistoryIndexHoleOperationKey: [MessageHistoryIndexHoleOperation]] = [:], currentOperationsByPeerId: [PeerId: [MessageHistoryOperation]], chatListOperations: [PeerGroupId: [ChatListOperation]], currentUpdatedChatListInclusions: [PeerId: PeerChatListInclusion], currentUpdatedPeers: [PeerId: Peer], currentUpdatedPeerNotificationSettings: [PeerId: PeerNotificationSettings], currentUpdatedPeerNotificationBehaviorTimestamps: [PeerId: PeerNotificationSettingsBehaviorTimestamp], currentUpdatedCachedPeerData: [PeerId: CachedPeerData], currentUpdatedPeerPresences: [PeerId: PeerPresence], currentUpdatedPeerChatListEmbeddedStates: [PeerId: PeerChatListEmbeddedInterfaceState?], currentUpdatedTotalUnreadState: ChatListTotalUnreadState?, currentUpdatedTotalUnreadSummaries: [PeerGroupId: PeerGroupUnreadCountersCombinedSummary], alteredInitialPeerCombinedReadStates: [PeerId: CombinedPeerReadState], currentPeerMergedOperationLogOperations: [PeerMergedOperationLogOperation], currentTimestampBasedMessageAttributesOperations: [TimestampBasedMessageAttributesOperation], unsentMessageOperations: [IntermediateMessageHistoryUnsentOperation], updatedSynchronizePeerReadStateOperations: [PeerId: PeerReadStateSynchronizationOperation?], currentUpdatedGroupSummarySynchronizeOperations: [PeerGroupAndNamespace: Bool], currentPreferencesOperations: [PreferencesOperation], currentOrderedItemListOperations: [Int32: [OrderedItemListOperation]], currentItemCollectionItemsOperations: [ItemCollectionId: [ItemCollectionItemsOperation]], currentItemCollectionInfosOperations: [ItemCollectionInfosOperation], currentUpdatedPeerChatStates: Set, currentGlobalTagsOperations: [GlobalMessageHistoryTagsOperation], currentLocalTagsOperations: [IntermediateMessageHistoryLocalTagsOperation], updatedMedia: [MediaId: Media?], replaceRemoteContactCount: Int32?, replaceContactPeerIds: Set?, currentPendingMessageActionsOperations: [PendingMessageActionsOperation], currentUpdatedMessageActionsSummaries: [PendingMessageActionsSummaryKey: Int32], currentUpdatedMessageTagSummaries: [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], currentInvalidateMessageTagSummaries: [InvalidatedMessageHistoryTagsSummaryEntryOperation], currentUpdatedPendingPeerNotificationSettings: Set, replacedAdditionalChatListItems: [PeerId]?, updatedNoticeEntryKeys: Set, updatedCacheEntryKeys: Set, currentUpdatedMasterClientId: Int64?, updatedFailedMessagePeerIds: Set) { self.currentUpdatedState = currentUpdatedState self.currentPeerHoleOperations = currentPeerHoleOperations self.currentOperationsByPeerId = currentOperationsByPeerId @@ -201,5 +205,6 @@ final class PostboxTransaction { self.replacedAdditionalChatListItems = replacedAdditionalChatListItems self.updatedNoticeEntryKeys = updatedNoticeEntryKeys self.updatedCacheEntryKeys = updatedCacheEntryKeys + self.updatedFailedMessagePeerIds = updatedFailedMessagePeerIds } } diff --git a/submodules/Postbox/Sources/ViewTracker.swift b/submodules/Postbox/Sources/ViewTracker.swift index aa85e15d62..65b058a806 100644 --- a/submodules/Postbox/Sources/ViewTracker.swift +++ b/submodules/Postbox/Sources/ViewTracker.swift @@ -349,7 +349,8 @@ final class ViewTracker { } } - if !transaction.chatListOperations.isEmpty || !transaction.currentUpdatedPeerNotificationSettings.isEmpty || !transaction.currentUpdatedPeers.isEmpty || !transaction.currentInvalidateMessageTagSummaries.isEmpty || !transaction.currentUpdatedMessageTagSummaries.isEmpty || !transaction.currentOperationsByPeerId.isEmpty || transaction.replacedAdditionalChatListItems != nil || !transaction.currentUpdatedPeerPresences.isEmpty { + if !transaction.chatListOperations.isEmpty || !transaction.currentUpdatedPeerNotificationSettings.isEmpty || !transaction.currentUpdatedPeers.isEmpty || !transaction.currentInvalidateMessageTagSummaries.isEmpty || !transaction.currentUpdatedMessageTagSummaries.isEmpty || !transaction.currentOperationsByPeerId.isEmpty || transaction.replacedAdditionalChatListItems != nil || !transaction.currentUpdatedPeerPresences.isEmpty || + !transaction.updatedFailedMessagePeerIds.isEmpty { for (mutableView, pipe) in self.chatListViews.copyItems() { let context = MutableChatListViewReplayContext() if mutableView.replay(postbox: postbox, operations: transaction.chatListOperations, updatedPeerNotificationSettings: transaction.currentUpdatedPeerNotificationSettings, updatedPeers: transaction.currentUpdatedPeers, updatedPeerPresences: transaction.currentUpdatedPeerPresences, transaction: transaction, context: context) { diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift index 8b5de5ea31..791832af8b 100644 --- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift +++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift @@ -215,22 +215,22 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView let timestamp = self.referenceTimestamp let timestamp1 = timestamp + 120 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: 0, messageIndex: MessageIndex(id: MessageId(peerId: peer1.id, namespace: 0, id: 0), timestamp: timestamp1)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer1.id, namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp1, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: selfPeer, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer1), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: 0, messageIndex: MessageIndex(id: MessageId(peerId: peer1.id, namespace: 0, id: 0), timestamp: timestamp1)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer1.id, namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp1, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: selfPeer, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer1), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let presenceTimestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + 60 * 60) let timestamp2 = timestamp + 3660 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer2.id, namespace: 0, id: 0), timestamp: timestamp2)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer2.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp2, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer2, text: "", attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer2), combinedReadState: nil, notificationSettings: nil, presence: TelegramUserPresence(status: .present(until: presenceTimestamp), lastActivity: presenceTimestamp), summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: [(peer2, .typingText)], isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer2.id, namespace: 0, id: 0), timestamp: timestamp2)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer2.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp2, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer2, text: "", attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer2), combinedReadState: nil, notificationSettings: nil, presence: TelegramUserPresence(status: .present(until: presenceTimestamp), lastActivity: presenceTimestamp), summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: [(peer2, .typingText)], isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let timestamp3 = timestamp + 3200 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer3.id, namespace: 0, id: 0), timestamp: timestamp3)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer3.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp3, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer3Author, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer3), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer3.id, namespace: 0, id: 0), timestamp: timestamp3)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer3.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp3, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer3Author, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer3), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let timestamp4 = timestamp + 3000 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer4.id, namespace: 0, id: 0), timestamp: timestamp4)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp4, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer4, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer4), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer4.id, namespace: 0, id: 0), timestamp: timestamp4)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp4, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer4, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer4), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let timestamp5 = timestamp + 1000 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer5.id, namespace: 0, id: 0), timestamp: timestamp5)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp5, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer5, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_5_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer5), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer5.id, namespace: 0, id: 0), timestamp: timestamp5)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp5, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer5, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_5_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer5), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer6.id, namespace: 0, id: 0), timestamp: timestamp - 360)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer6.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp - 360, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer6, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_6_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer6), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 1, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer6.id, namespace: 0, id: 0), timestamp: timestamp - 360)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer6.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp - 360, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer6, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_6_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer6), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 1, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let width: CGFloat if case .regular = layout.metrics.widthClass { diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift index 444799f6b0..1d92b92145 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift @@ -526,17 +526,17 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate let timestamp = self.referenceTimestamp let timestamp1 = timestamp + 120 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: 0, messageIndex: MessageIndex(id: MessageId(peerId: peer1.id, namespace: 0, id: 0), timestamp: timestamp1)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer1.id, namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp1, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: selfPeer, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer1), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: 0, messageIndex: MessageIndex(id: MessageId(peerId: peer1.id, namespace: 0, id: 0), timestamp: timestamp1)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer1.id, namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp1, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: selfPeer, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer1), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let presenceTimestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + 60 * 60) let timestamp2 = timestamp + 3660 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer2.id, namespace: 0, id: 0), timestamp: timestamp2)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer2.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp2, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer2, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_2_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer2), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 1, markedUnread: false))]), notificationSettings: nil, presence: TelegramUserPresence(status: .present(until: presenceTimestamp), lastActivity: presenceTimestamp), summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer2.id, namespace: 0, id: 0), timestamp: timestamp2)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer2.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp2, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer2, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_2_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer2), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 1, markedUnread: false))]), notificationSettings: nil, presence: TelegramUserPresence(status: .present(until: presenceTimestamp), lastActivity: presenceTimestamp), summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let timestamp3 = timestamp + 3200 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer3.id, namespace: 0, id: 0), timestamp: timestamp3)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer3.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp3, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer3Author, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer3), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer3.id, namespace: 0, id: 0), timestamp: timestamp3)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer3.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp3, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer3Author, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer3), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let timestamp4 = timestamp + 3000 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer4.id, namespace: 0, id: 0), timestamp: timestamp4)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp4, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer4, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer4), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer4.id, namespace: 0, id: 0), timestamp: timestamp4)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp4, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer4, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer4), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height) if let chatNodes = self.chatNodes { diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift index df6a0b5590..abaff9d68b 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift @@ -351,24 +351,24 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { let timestamp = self.referenceTimestamp let timestamp1 = timestamp + 120 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: 0, messageIndex: MessageIndex(id: MessageId(peerId: peer1.id, namespace: 0, id: 0), timestamp: timestamp1)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer1.id, namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp1, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: selfPeer, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer1), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: 0, messageIndex: MessageIndex(id: MessageId(peerId: peer1.id, namespace: 0, id: 0), timestamp: timestamp1)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer1.id, namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp1, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: selfPeer, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer1), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 0, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let presenceTimestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970 + 60 * 60) let timestamp2 = timestamp + 3660 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer2.id, namespace: 0, id: 0), timestamp: timestamp2)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer2.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp2, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer2, text: "", attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer2), combinedReadState: nil, notificationSettings: nil, presence: TelegramUserPresence(status: .present(until: presenceTimestamp), lastActivity: presenceTimestamp), summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: [(peer2, .typingText)], isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer2.id, namespace: 0, id: 0), timestamp: timestamp2)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer2.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp2, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer2, text: "", attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer2), combinedReadState: nil, notificationSettings: nil, presence: TelegramUserPresence(status: .present(until: presenceTimestamp), lastActivity: presenceTimestamp), summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: [(peer2, .typingText)], isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let timestamp3 = timestamp + 3200 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer3.id, namespace: 0, id: 0), timestamp: timestamp3)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer3.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp3, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer3Author, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer3), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer3.id, namespace: 0, id: 0), timestamp: timestamp3)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer3.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp3, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer3Author, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer3), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let timestamp4 = timestamp + 3000 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer4.id, namespace: 0, id: 0), timestamp: timestamp4)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp4, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer4, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer4), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer4.id, namespace: 0, id: 0), timestamp: timestamp4)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp4, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer4, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer4), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let timestamp5 = timestamp + 1000 - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer5.id, namespace: 0, id: 0), timestamp: timestamp5)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp5, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer5, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_5_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer5), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer5.id, namespace: 0, id: 0), timestamp: timestamp5)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer4.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp5, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer5, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_5_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer5), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer6.id, namespace: 0, id: 0), timestamp: timestamp - 360)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer6.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp - 360, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer6, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_6_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer6), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 1, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer6.id, namespace: 0, id: 0), timestamp: timestamp - 360)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer6.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp - 360, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer6, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_6_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer6), combinedReadState: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, PeerReadState.idBased(maxIncomingReadId: 0, maxOutgoingReadId: 0, maxKnownId: 0, count: 1, markedUnread: false))]), notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) - items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer7.id, namespace: 0, id: 0), timestamp: timestamp - 420)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer7.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp - 420, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer6, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_7_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer7), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) + items.append(ChatListItem(presentationData: chatListPresentationData, context: self.context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: MessageIndex(id: MessageId(peerId: peer7.id, namespace: 0, id: 0), timestamp: timestamp - 420)), content: .peer(message: Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer7.id, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: timestamp - 420, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer6, text: self.presentationData.strings.Appearance_ThemePreview_ChatList_7_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), peer: RenderedPeer(peer: peer7), combinedReadState: nil, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(tagSummaryCount: nil, actionsSummaryCount: nil), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: false, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)) let width: CGFloat if case .regular = layout.metrics.widthClass { diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift index 31a04f5488..14d508bfa7 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift @@ -83,6 +83,7 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { private var sliderView: TGPhotoEditorSliderView? private let leftIconNode: ASImageNode private let rightIconNode: ASImageNode + private let disabledOverlayNode: ASDisplayNode private var item: ThemeSettingsFontSizeItem? private var layoutParams: ListViewItemLayoutParams? @@ -111,10 +112,14 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { self.rightIconNode.displaysAsynchronously = false self.rightIconNode.displayWithoutProcessing = true + self.disabledOverlayNode = ASDisplayNode() + super.init(layerBacked: false, dynamicBounce: false) self.addSubnode(self.leftIconNode) self.addSubnode(self.rightIconNode) + + self.addSubnode(self.disabledOverlayNode) } override func didLoad() { @@ -159,7 +164,7 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + 38.0, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - 38.0 * 2.0, height: 44.0)) } - self.view.addSubview(sliderView) + self.view.insertSubview(sliderView, belowSubview: self.disabledOverlayNode.view) sliderView.addTarget(self, action: #selector(self.sliderValueChanged), for: .valueChanged) self.sliderView = sliderView } @@ -204,6 +209,10 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor + strongSelf.disabledOverlayNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4) + strongSelf.disabledOverlayNode.isHidden = item.enabled + strongSelf.disabledOverlayNode.frame = CGRect(origin: CGPoint(x: params.leftInset, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset, height: 44.0)) + if strongSelf.backgroundNode.supernode == nil { strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0) } diff --git a/submodules/ShareController/Sources/ShareController.swift b/submodules/ShareController/Sources/ShareController.swift index 18e901844f..2c93585f78 100644 --- a/submodules/ShareController/Sources/ShareController.swift +++ b/submodules/ShareController/Sources/ShareController.swift @@ -804,7 +804,7 @@ public final class ShareController: ViewController { var peers: [RenderedPeer] = [] for entry in view.0.entries.reversed() { switch entry { - case let .MessageEntry(_, _, _, _, _, renderedPeer, _, _): + case let .MessageEntry(_, _, _, _, _, renderedPeer, _, _, _): if let peer = renderedPeer.peers[renderedPeer.peerId], peer.id != accountPeer.id, canSendMessagesToPeer(peer) { peers.append(renderedPeer) } diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift index 6a9f598ea4..d316fd251e 100644 --- a/submodules/TelegramApi/Sources/Api0.swift +++ b/submodules/TelegramApi/Sources/Api0.swift @@ -128,6 +128,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[1690108678] = { return Api.InputEncryptedFile.parse_inputEncryptedFileUploaded($0) } dict[1511503333] = { return Api.InputEncryptedFile.parse_inputEncryptedFile($0) } dict[767652808] = { return Api.InputEncryptedFile.parse_inputEncryptedFileBigUploaded($0) } + dict[-1456996667] = { return Api.messages.InactiveChats.parse_inactiveChats($0) } dict[1443858741] = { return Api.messages.SentEncryptedMessage.parse_sentEncryptedMessage($0) } dict[-1802240206] = { return Api.messages.SentEncryptedMessage.parse_sentEncryptedFile($0) } dict[1571494644] = { return Api.ExportedMessageLink.parse_exportedMessageLink($0) } @@ -922,6 +923,8 @@ public struct Api { _1.serialize(buffer, boxed) case let _1 as Api.InputEncryptedFile: _1.serialize(buffer, boxed) + case let _1 as Api.messages.InactiveChats: + _1.serialize(buffer, boxed) case let _1 as Api.messages.SentEncryptedMessage: _1.serialize(buffer, boxed) case let _1 as Api.ExportedMessageLink: @@ -1485,6 +1488,66 @@ public struct messages { } } + } + public enum InactiveChats: TypeConstructorDescription { + case inactiveChats(dates: [Int32], chats: [Api.Chat], users: [Api.User]) + + public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { + switch self { + case .inactiveChats(let dates, let chats, let users): + if boxed { + buffer.appendInt32(-1456996667) + } + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(dates.count)) + for item in dates { + serializeInt32(item, buffer: buffer, boxed: false) + } + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(chats.count)) + for item in chats { + item.serialize(buffer, true) + } + buffer.appendInt32(481674261) + buffer.appendInt32(Int32(users.count)) + for item in users { + item.serialize(buffer, true) + } + break + } + } + + public func descriptionFields() -> (String, [(String, Any)]) { + switch self { + case .inactiveChats(let dates, let chats, let users): + return ("inactiveChats", [("dates", dates), ("chats", chats), ("users", users)]) + } + } + + public static func parse_inactiveChats(_ reader: BufferReader) -> InactiveChats? { + var _1: [Int32]? + if let _ = reader.readInt32() { + _1 = Api.parseVector(reader, elementSignature: -1471112230, elementType: Int32.self) + } + var _2: [Api.Chat]? + if let _ = reader.readInt32() { + _2 = Api.parseVector(reader, elementSignature: 0, elementType: Api.Chat.self) + } + var _3: [Api.User]? + if let _ = reader.readInt32() { + _3 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self) + } + let _c1 = _1 != nil + let _c2 = _2 != nil + let _c3 = _3 != nil + if _c1 && _c2 && _c3 { + return Api.messages.InactiveChats.inactiveChats(dates: _1!, chats: _2!, users: _3!) + } + else { + return nil + } + } + } public enum SentEncryptedMessage: TypeConstructorDescription { case sentEncryptedMessage(date: Int32) diff --git a/submodules/TelegramApi/Sources/Api3.swift b/submodules/TelegramApi/Sources/Api3.swift index 35cef9c935..7ce2e5280f 100644 --- a/submodules/TelegramApi/Sources/Api3.swift +++ b/submodules/TelegramApi/Sources/Api3.swift @@ -3761,6 +3761,20 @@ public extension Api { return result }) } + + public static func getInactiveChannels() -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + let buffer = Buffer() + buffer.appendInt32(300429806) + + return (FunctionDescription(name: "channels.getInactiveChannels", parameters: []), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.messages.InactiveChats? in + let reader = BufferReader(buffer) + var result: Api.messages.InactiveChats? + if let signature = reader.readInt32() { + result = Api.parse(reader, signature: signature) as? Api.messages.InactiveChats + } + return result + }) + } } public struct payments { public static func getPaymentForm(msgId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { diff --git a/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift b/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift index fa191f7b8f..6d94467075 100644 --- a/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift +++ b/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift @@ -336,7 +336,7 @@ final class ChatHistoryPreloadManager { var indices: [(ChatHistoryPreloadIndex, Bool, Bool)] = [] for entry in view.0.entries { - if case let .MessageEntry(index, _, readState, notificationSettings, _, _, _, _) = entry { + if case let .MessageEntry(index, _, readState, notificationSettings, _, _, _, _, _) = entry { var hasUnread = false if let readState = readState { hasUnread = readState.count != 0 diff --git a/submodules/TelegramNotices/Sources/Notices.swift b/submodules/TelegramNotices/Sources/Notices.swift index 7f281eb5c5..4389e7edb2 100644 --- a/submodules/TelegramNotices/Sources/Notices.swift +++ b/submodules/TelegramNotices/Sources/Notices.swift @@ -133,6 +133,7 @@ private enum ApplicationSpecificGlobalNotice: Int32 { case cellularDataPermissionWarning = 13 case chatMessageSearchResultsTip = 14 case chatMessageOptionsTip = 15 + case chatTextSelectionTip = 16 var key: ValueBoxKey { let v = ValueBoxKey(length: 4) @@ -238,6 +239,10 @@ private struct ApplicationSpecificNoticeKeys { static func chatMessageOptionsTip() -> NoticeEntryKey { return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.chatMessageOptionsTip.key) } + + static func chatTextSelectionTip() -> NoticeEntryKey { + return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.chatTextSelectionTip.key) + } } public struct ApplicationSpecificNotice { @@ -573,6 +578,28 @@ public struct ApplicationSpecificNotice { } } + public static func getChatTextSelectionTips(accountManager: AccountManager) -> Signal { + return accountManager.transaction { transaction -> Int32 in + if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.chatTextSelectionTip()) as? ApplicationSpecificCounterNotice { + return value.value + } else { + return 0 + } + } + } + + public static func incrementChatTextSelectionTips(accountManager: AccountManager, count: Int32 = 1) -> Signal { + return accountManager.transaction { transaction -> Void in + var currentValue: Int32 = 0 + if let value = transaction.getNotice(ApplicationSpecificNoticeKeys.chatTextSelectionTip()) as? ApplicationSpecificCounterNotice { + currentValue = value.value + } + currentValue += count + + transaction.setNotice(ApplicationSpecificNoticeKeys.chatTextSelectionTip(), ApplicationSpecificCounterNotice(value: currentValue)) + } + } + public static func reset(accountManager: AccountManager) -> Signal { return accountManager.transaction { transaction -> Void in } diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index aa9a06fb69..7eca8ff272 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -2781,2105 +2781,2107 @@ public final class PresentationStrings: Equatable { public var LoginPassword_PasswordHelp: String { return self._s[2373]! } public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2374]! } public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2375]! } - public var Checkout_TotalPaidAmount: String { return self._s[2376]! } + public var ChatContextMenu_TextSelectionTip: String { return self._s[2376]! } + public var Checkout_TotalPaidAmount: String { return self._s[2377]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2377]!, self._r[2377]!, [_0]) + return formatWithArgumentRanges(self._s[2378]!, self._r[2378]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[2378]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2380]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2381]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2379]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2381]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2382]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2382]!, self._r[2382]!, [_1]) + return formatWithArgumentRanges(self._s[2383]!, self._r[2383]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2383]! } - public var Contacts_InviteFriends: String { return self._s[2385]! } - public var Map_ChooseLocationTitle: String { return self._s[2386]! } - public var Conversation_StopPoll: String { return self._s[2388]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2384]! } + public var Contacts_InviteFriends: String { return self._s[2386]! } + public var Map_ChooseLocationTitle: String { return self._s[2387]! } + public var Conversation_StopPoll: String { return self._s[2389]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2389]!, self._r[2389]!, [_0]) + return formatWithArgumentRanges(self._s[2390]!, self._r[2390]!, [_0]) } - public var Call_Camera: String { return self._s[2390]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2391]! } - public var AppWallet_Intro_Text: String { return self._s[2392]! } - public var Calls_RatingFeedback: String { return self._s[2393]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2394]! } - public var Wallet_Alert_OK: String { return self._s[2395]! } - public var NotificationsSound_Pulse: String { return self._s[2396]! } - public var Watch_LastSeen_Lately: String { return self._s[2397]! } - public var ReportGroupLocation_Report: String { return self._s[2400]! } - public var Widget_NoUsers: String { return self._s[2401]! } - public var Conversation_UnvotePoll: String { return self._s[2402]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2404]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2405]! } - public var NotificationsSound_Circles: String { return self._s[2406]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2409]! } - public var Wallet_Settings_DeleteWallet: String { return self._s[2410]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2411]! } - public var Proxy_TooltipUnavailable: String { return self._s[2412]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2414]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2416]! } - public var Conversation_FileDropbox: String { return self._s[2417]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2418]! } - public var Tour_Text3: String { return self._s[2420]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2422]! } - public var GroupPermission_NoSendMessages: String { return self._s[2423]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2424]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2425]! } + public var Call_Camera: String { return self._s[2391]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2392]! } + public var AppWallet_Intro_Text: String { return self._s[2393]! } + public var Calls_RatingFeedback: String { return self._s[2394]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2395]! } + public var Wallet_Alert_OK: String { return self._s[2396]! } + public var NotificationsSound_Pulse: String { return self._s[2397]! } + public var Watch_LastSeen_Lately: String { return self._s[2398]! } + public var ReportGroupLocation_Report: String { return self._s[2401]! } + public var Widget_NoUsers: String { return self._s[2402]! } + public var Conversation_UnvotePoll: String { return self._s[2403]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2405]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2406]! } + public var NotificationsSound_Circles: String { return self._s[2407]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2410]! } + public var Wallet_Settings_DeleteWallet: String { return self._s[2411]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2412]! } + public var Proxy_TooltipUnavailable: String { return self._s[2413]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2415]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2417]! } + public var Conversation_FileDropbox: String { return self._s[2418]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2419]! } + public var Tour_Text3: String { return self._s[2421]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2423]! } + public var GroupPermission_NoSendMessages: String { return self._s[2424]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2425]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2426]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2427]!, self._r[2427]!, [_0]) + return formatWithArgumentRanges(self._s[2428]!, self._r[2428]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2428]! } - public var Checkout_ShippingOption_Title: String { return self._s[2429]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2430]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2429]! } + public var Checkout_ShippingOption_Title: String { return self._s[2430]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2431]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2431]!, self._r[2431]!, [_0]) - } - public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2432]!, self._r[2432]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2433]! } - public var EditTheme_FileReadError: String { return self._s[2434]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2435]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2436]! } - public var AutoDownloadSettings_Photos: String { return self._s[2438]! } - public var Appearance_PreviewIncomingText: String { return self._s[2439]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[2440]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2441]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2442]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2443]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2444]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2445]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2446]! } - public var Notification_SecretChatScreenshot: String { return self._s[2447]! } - public var AccessDenied_Wallpapers: String { return self._s[2448]! } - public var ChatList_Context_Mute: String { return self._s[2450]! } - public var Passport_Address_City: String { return self._s[2451]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2452]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2453]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2454]! } - public var AccessDenied_LocationDisabled: String { return self._s[2455]! } - public var Group_Location_Title: String { return self._s[2456]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2458]! } - public var GroupInfo_Sound: String { return self._s[2459]! } - public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2460]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2461]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2462]! } - public var Contacts_Title: String { return self._s[2463]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[2464]! } - public var Passport_Language_fr: String { return self._s[2465]! } - public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2466]! } - public var Notifications_ResetAllNotifications: String { return self._s[2467]! } - public var IntentsSettings_SuggestedChats: String { return self._s[2469]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2471]! } - public var Checkout_NewCard_Title: String { return self._s[2472]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2473]! } - public var Conversation_ForwardChats: String { return self._s[2474]! } - public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2476]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2477]! } - public var Settings_FAQ: String { return self._s[2479]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2480]! } - public var Conversation_ContextMenuForward: String { return self._s[2481]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2484]! } - public var PrivacyPolicy_Title: String { return self._s[2487]! } - public var Notifications_TextTone: String { return self._s[2488]! } - public var Profile_CreateNewContact: String { return self._s[2489]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2490]! } - public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2492]! } - public var Call_Speaker: String { return self._s[2493]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2494]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2496]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2497]! } + public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2433]!, self._r[2433]!, [_0]) + } + public var Channel_Management_LabelAdministrator: String { return self._s[2434]! } + public var EditTheme_FileReadError: String { return self._s[2435]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2436]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2437]! } + public var AutoDownloadSettings_Photos: String { return self._s[2439]! } + public var Appearance_PreviewIncomingText: String { return self._s[2440]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[2441]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2442]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2443]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2444]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2445]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2446]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2447]! } + public var Notification_SecretChatScreenshot: String { return self._s[2448]! } + public var AccessDenied_Wallpapers: String { return self._s[2449]! } + public var ChatList_Context_Mute: String { return self._s[2451]! } + public var Passport_Address_City: String { return self._s[2452]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2453]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2454]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2455]! } + public var AccessDenied_LocationDisabled: String { return self._s[2456]! } + public var Group_Location_Title: String { return self._s[2457]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2459]! } + public var GroupInfo_Sound: String { return self._s[2460]! } + public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2461]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2462]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2463]! } + public var Contacts_Title: String { return self._s[2464]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2465]! } + public var Passport_Language_fr: String { return self._s[2466]! } + public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2467]! } + public var Notifications_ResetAllNotifications: String { return self._s[2468]! } + public var IntentsSettings_SuggestedChats: String { return self._s[2470]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2472]! } + public var Checkout_NewCard_Title: String { return self._s[2473]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2474]! } + public var Conversation_ForwardChats: String { return self._s[2475]! } + public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2477]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2478]! } + public var Settings_FAQ: String { return self._s[2480]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2481]! } + public var Conversation_ContextMenuForward: String { return self._s[2482]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2485]! } + public var PrivacyPolicy_Title: String { return self._s[2488]! } + public var Notifications_TextTone: String { return self._s[2489]! } + public var Profile_CreateNewContact: String { return self._s[2490]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2491]! } + public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2493]! } + public var Call_Speaker: String { return self._s[2494]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2495]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2497]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2498]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2498]!, self._r[2498]!, [_0]) + return formatWithArgumentRanges(self._s[2499]!, self._r[2499]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2499]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2500]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2501]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2502]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2503]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2504]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2505]! } - public var Bot_Unblock: String { return self._s[2506]! } - public var TextFormat_Italic: String { return self._s[2507]! } - public var WallpaperSearch_ColorPink: String { return self._s[2508]! } - public var Settings_About_Help: String { return self._s[2509]! } - public var SearchImages_Title: String { return self._s[2510]! } - public var Weekday_Wednesday: String { return self._s[2511]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2512]! } - public var ExplicitContent_AlertTitle: String { return self._s[2513]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2500]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2501]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2502]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2503]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2504]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2505]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2506]! } + public var Bot_Unblock: String { return self._s[2507]! } + public var TextFormat_Italic: String { return self._s[2508]! } + public var WallpaperSearch_ColorPink: String { return self._s[2509]! } + public var Settings_About_Help: String { return self._s[2510]! } + public var SearchImages_Title: String { return self._s[2511]! } + public var Weekday_Wednesday: String { return self._s[2512]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2513]! } + public var ExplicitContent_AlertTitle: String { return self._s[2514]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2514]!, self._r[2514]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2515]!, self._r[2515]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2515]! } - public var Weekday_Thursday: String { return self._s[2516]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2517]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2518]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2516]! } + public var Weekday_Thursday: String { return self._s[2517]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2518]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2519]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2519]!, self._r[2519]!, [_0]) + return formatWithArgumentRanges(self._s[2520]!, self._r[2520]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2520]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2521]! } - public var Passport_RequestedInformation: String { return self._s[2522]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2523]! } - public var Conversation_EncryptionProcessing: String { return self._s[2525]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2526]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2528]! } - public var Channel_Setup_Title: String { return self._s[2529]! } - public var Conversation_SearchPlaceholder: String { return self._s[2530]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2531]! } - public var Checkout_ErrorGeneric: String { return self._s[2532]! } - public var Passport_Language_hu: String { return self._s[2533]! } - public var GroupPermission_EditingDisabled: String { return self._s[2534]! } - public var Wallet_Month_ShortSeptember: String { return self._s[2536]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2521]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2522]! } + public var Passport_RequestedInformation: String { return self._s[2523]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2524]! } + public var Conversation_EncryptionProcessing: String { return self._s[2526]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2527]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2529]! } + public var Channel_Setup_Title: String { return self._s[2530]! } + public var Conversation_SearchPlaceholder: String { return self._s[2531]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2532]! } + public var Checkout_ErrorGeneric: String { return self._s[2533]! } + public var Passport_Language_hu: String { return self._s[2534]! } + public var GroupPermission_EditingDisabled: String { return self._s[2535]! } + public var Wallet_Month_ShortSeptember: String { return self._s[2537]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2537]!, self._r[2537]!, [_0]) + return formatWithArgumentRanges(self._s[2538]!, self._r[2538]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2540]!, self._r[2540]!, [_1]) + return formatWithArgumentRanges(self._s[2541]!, self._r[2541]!, [_1]) } - public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2541]! } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2542]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2542]!, self._r[2542]!, [_0]) + return formatWithArgumentRanges(self._s[2543]!, self._r[2543]!, [_0]) } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2543]! } - public var Group_Location_Info: String { return self._s[2544]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2545]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2546]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2544]! } + public var Group_Location_Info: String { return self._s[2545]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2546]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2547]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2547]!, self._r[2547]!, [_0]) + return formatWithArgumentRanges(self._s[2548]!, self._r[2548]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2548]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2549]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2550]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2551]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2549]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2550]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2551]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2552]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2552]!, self._r[2552]!, [_0]) + return formatWithArgumentRanges(self._s[2553]!, self._r[2553]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2553]! } - public var Message_PinnedAnimationMessage: String { return self._s[2555]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2557]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2558]! } - public var Wallet_Info_TransactionTo: String { return self._s[2560]! } - public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2561]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2562]! } - public var Embed_PlayingInPIP: String { return self._s[2563]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2564]! } + public var Passport_Language_cs: String { return self._s[2554]! } + public var Message_PinnedAnimationMessage: String { return self._s[2556]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2558]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2559]! } + public var Wallet_Info_TransactionTo: String { return self._s[2561]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2562]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2563]! } + public var Embed_PlayingInPIP: String { return self._s[2564]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2565]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2565]!, self._r[2565]!, [_0]) + return formatWithArgumentRanges(self._s[2566]!, self._r[2566]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2566]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2567]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2567]!, self._r[2567]!, [_1]) + return formatWithArgumentRanges(self._s[2568]!, self._r[2568]!, [_1]) } - public var Notification_PaymentSent: String { return self._s[2568]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2569]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2570]! } - public var AutoNightTheme_System: String { return self._s[2571]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2572]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2573]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2574]! } + public var Notification_PaymentSent: String { return self._s[2569]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2570]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2571]! } + public var AutoNightTheme_System: String { return self._s[2572]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2573]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2574]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2575]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2577]!, self._r[2577]!, [_1]) - } - public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2578]!, self._r[2578]!, [_1]) } - public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { + public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2579]!, self._r[2579]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2581]! } - public var PasscodeSettings_HelpTop: String { return self._s[2582]! } - public var Conversation_WalletRequiredTitle: String { return self._s[2583]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2584]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2585]! } - public var EditTheme_ShortLink: String { return self._s[2586]! } - public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2587]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2588]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2589]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2590]! } - public var Call_Accept: String { return self._s[2592]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2593]! } - public var Month_GenMarch: String { return self._s[2595]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2596]! } - public var LoginPassword_Title: String { return self._s[2597]! } - public var Call_End: String { return self._s[2598]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2599]! } - public var VoiceOver_Chat_Contact: String { return self._s[2600]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2601]! } - public var CallSettings_Always: String { return self._s[2602]! } - public var CallFeedback_Success: String { return self._s[2603]! } - public var TwoStepAuth_SetupHint: String { return self._s[2604]! } + public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2580]!, self._r[2580]!, [_1]) + } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2582]! } + public var PasscodeSettings_HelpTop: String { return self._s[2583]! } + public var Conversation_WalletRequiredTitle: String { return self._s[2584]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2585]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2586]! } + public var EditTheme_ShortLink: String { return self._s[2587]! } + public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2588]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2589]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2590]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2591]! } + public var Call_Accept: String { return self._s[2593]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2594]! } + public var Month_GenMarch: String { return self._s[2596]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2597]! } + public var LoginPassword_Title: String { return self._s[2598]! } + public var Call_End: String { return self._s[2599]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2600]! } + public var VoiceOver_Chat_Contact: String { return self._s[2601]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2602]! } + public var CallSettings_Always: String { return self._s[2603]! } + public var CallFeedback_Success: String { return self._s[2604]! } + public var TwoStepAuth_SetupHint: String { return self._s[2605]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_1]) + return formatWithArgumentRanges(self._s[2606]!, self._r[2606]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2606]! } - public var Login_PhoneTitle: String { return self._s[2607]! } - public var Passport_FieldPhoneHelp: String { return self._s[2608]! } - public var Weekday_ShortSunday: String { return self._s[2609]! } - public var Passport_InfoFAQ_URL: String { return self._s[2610]! } - public var ContactInfo_Job: String { return self._s[2612]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2613]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2614]! } - public var TwoFactorSetup_Email_Text: String { return self._s[2615]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2616]! } - public var Invite_ChannelsTooMuch: String { return self._s[2617]! } - public var Wallet_Send_ConfirmationConfirm: String { return self._s[2618]! } - public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2619]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2620]! } - public var Wallet_Receive_AmountText: String { return self._s[2621]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2622]! } - public var CallFeedback_ReasonNoise: String { return self._s[2623]! } - public var Appearance_AppIconDefault: String { return self._s[2625]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2626]! } - public var MediaPicker_AddCaption: String { return self._s[2627]! } - public var CallSettings_TabIconDescription: String { return self._s[2628]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2607]! } + public var Login_PhoneTitle: String { return self._s[2608]! } + public var Passport_FieldPhoneHelp: String { return self._s[2609]! } + public var Weekday_ShortSunday: String { return self._s[2610]! } + public var Passport_InfoFAQ_URL: String { return self._s[2611]! } + public var ContactInfo_Job: String { return self._s[2613]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2614]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2615]! } + public var TwoFactorSetup_Email_Text: String { return self._s[2616]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2617]! } + public var Invite_ChannelsTooMuch: String { return self._s[2618]! } + public var Wallet_Send_ConfirmationConfirm: String { return self._s[2619]! } + public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2620]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2621]! } + public var Wallet_Receive_AmountText: String { return self._s[2622]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2623]! } + public var CallFeedback_ReasonNoise: String { return self._s[2624]! } + public var Appearance_AppIconDefault: String { return self._s[2626]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2627]! } + public var MediaPicker_AddCaption: String { return self._s[2628]! } + public var CallSettings_TabIconDescription: String { return self._s[2629]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_0]) + return formatWithArgumentRanges(self._s[2630]!, self._r[2630]!, [_0]) } - public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2630]! } + public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2631]! } public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_0]) + return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_0]) } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2632]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2633]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2634]! } - public var DialogList_SearchSectionRecent: String { return self._s[2635]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2636]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2639]! } - public var LastSeen_WithinAWeek: String { return self._s[2640]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2641]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2643]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2644]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2633]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2634]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2635]! } + public var DialogList_SearchSectionRecent: String { return self._s[2636]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2637]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2640]! } + public var LastSeen_WithinAWeek: String { return self._s[2641]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2642]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2644]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2645]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2645]!, self._r[2645]!, [_0]) + return formatWithArgumentRanges(self._s[2646]!, self._r[2646]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2646]! } - public var Conversation_StatusLeftGroup: String { return self._s[2647]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2648]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2650]! } - public var GroupPermission_AddSuccess: String { return self._s[2651]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2653]! } - public var Conversation_ContextMenuCopy: String { return self._s[2654]! } - public var AccessDenied_CallMicrophone: String { return self._s[2655]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2647]! } + public var Conversation_StatusLeftGroup: String { return self._s[2648]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2649]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2651]! } + public var GroupPermission_AddSuccess: String { return self._s[2652]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2654]! } + public var Conversation_ContextMenuCopy: String { return self._s[2655]! } + public var AccessDenied_CallMicrophone: String { return self._s[2656]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2656]!, self._r[2656]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2657]!, self._r[2657]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2657]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2658]! } - public var Checkout_PaymentMethod_New: String { return self._s[2659]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2660]! } - public var PhotoEditor_QualityTool: String { return self._s[2661]! } - public var Login_SendCodeViaSms: String { return self._s[2662]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2663]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2664]! } - public var Wallet_Receive_CopyAddress: String { return self._s[2665]! } - public var Login_EmailNotConfiguredError: String { return self._s[2666]! } - public var SocksProxySetup_Status: String { return self._s[2667]! } - public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2668]! } - public var PrivacyPolicy_Accept: String { return self._s[2669]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2670]! } - public var Appearance_AppIconClassicX: String { return self._s[2671]! } + public var Login_InvalidFirstNameError: String { return self._s[2658]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2659]! } + public var Checkout_PaymentMethod_New: String { return self._s[2660]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2661]! } + public var PhotoEditor_QualityTool: String { return self._s[2662]! } + public var Login_SendCodeViaSms: String { return self._s[2663]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2664]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2665]! } + public var Wallet_Receive_CopyAddress: String { return self._s[2666]! } + public var Login_EmailNotConfiguredError: String { return self._s[2667]! } + public var SocksProxySetup_Status: String { return self._s[2668]! } + public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2669]! } + public var PrivacyPolicy_Accept: String { return self._s[2670]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2671]! } + public var Appearance_AppIconClassicX: String { return self._s[2672]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2672]!, self._r[2672]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2673]!, self._r[2673]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2673]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2675]! } - public var AutoNightTheme_Automatic: String { return self._s[2676]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2677]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2678]! } - public var Cache_Help: String { return self._s[2679]! } - public var Group_ErrorAccessDenied: String { return self._s[2680]! } - public var Passport_Language_fa: String { return self._s[2681]! } - public var Wallet_Intro_Text: String { return self._s[2682]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2683]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2684]! } - public var PrivacySettings_LastSeen: String { return self._s[2685]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2674]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2676]! } + public var AutoNightTheme_Automatic: String { return self._s[2677]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2678]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2679]! } + public var Cache_Help: String { return self._s[2680]! } + public var Group_ErrorAccessDenied: String { return self._s[2681]! } + public var Passport_Language_fa: String { return self._s[2682]! } + public var Wallet_Intro_Text: String { return self._s[2683]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2684]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2685]! } + public var PrivacySettings_LastSeen: String { return self._s[2686]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2686]!, self._r[2686]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2687]!, self._r[2687]!, [_0, _1]) } - public var Wallet_Configuration_Apply: String { return self._s[2690]! } - public var Preview_SaveGif: String { return self._s[2691]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2692]! } - public var Profile_About: String { return self._s[2693]! } - public var Channel_About_Placeholder: String { return self._s[2694]! } - public var Login_InfoTitle: String { return self._s[2695]! } + public var Wallet_Configuration_Apply: String { return self._s[2691]! } + public var Preview_SaveGif: String { return self._s[2692]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2693]! } + public var Profile_About: String { return self._s[2694]! } + public var Channel_About_Placeholder: String { return self._s[2695]! } + public var Login_InfoTitle: String { return self._s[2696]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2696]!, self._r[2696]!, [_0]) + return formatWithArgumentRanges(self._s[2697]!, self._r[2697]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2697]! } - public var Watch_Suggestion_CantTalk: String { return self._s[2699]! } - public var ContactInfo_Title: String { return self._s[2700]! } - public var Media_ShareThisVideo: String { return self._s[2701]! } - public var Weekday_ShortFriday: String { return self._s[2702]! } - public var AccessDenied_Contacts: String { return self._s[2704]! } - public var Notification_CallIncomingShort: String { return self._s[2705]! } - public var Group_Setup_TypePublic: String { return self._s[2706]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2707]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2708]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2711]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2712]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2713]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2714]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2715]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2698]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2700]! } + public var ContactInfo_Title: String { return self._s[2701]! } + public var Media_ShareThisVideo: String { return self._s[2702]! } + public var Weekday_ShortFriday: String { return self._s[2703]! } + public var AccessDenied_Contacts: String { return self._s[2705]! } + public var Notification_CallIncomingShort: String { return self._s[2706]! } + public var Group_Setup_TypePublic: String { return self._s[2707]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2708]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2709]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2712]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2713]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2714]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2715]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2716]! } public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2716]!, self._r[2716]!, [_0]) + return formatWithArgumentRanges(self._s[2717]!, self._r[2717]!, [_0]) } - public var DialogList_Typing: String { return self._s[2717]! } - public var CallFeedback_IncludeLogs: String { return self._s[2719]! } - public var Checkout_Phone: String { return self._s[2721]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2724]! } - public var Privacy_Calls_Integration: String { return self._s[2725]! } - public var Notifications_PermissionsAllow: String { return self._s[2726]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2730]! } - public var Settings_ChatSettings: String { return self._s[2731]! } - public var Conversation_SendingOptionsTooltip: String { return self._s[2732]! } + public var DialogList_Typing: String { return self._s[2718]! } + public var CallFeedback_IncludeLogs: String { return self._s[2720]! } + public var Checkout_Phone: String { return self._s[2722]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2725]! } + public var Privacy_Calls_Integration: String { return self._s[2726]! } + public var Notifications_PermissionsAllow: String { return self._s[2727]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2731]! } + public var Settings_ChatSettings: String { return self._s[2732]! } + public var Conversation_SendingOptionsTooltip: String { return self._s[2733]! } public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2734]!, self._r[2734]!, [_0]) + return formatWithArgumentRanges(self._s[2735]!, self._r[2735]!, [_0]) } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2735]!, self._r[2735]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2736]!, self._r[2736]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2737]! } + public var GroupRemoved_DeleteUser: String { return self._s[2738]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2738]!, self._r[2738]!, [_0]) + return formatWithArgumentRanges(self._s[2739]!, self._r[2739]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2739]!, self._r[2739]!, [_1]) + return formatWithArgumentRanges(self._s[2740]!, self._r[2740]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2740]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2741]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2743]! } - public var Conversation_Unblock: String { return self._s[2744]! } - public var PrivacySettings_DataSettings: String { return self._s[2745]! } - public var Group_PublicLink_Info: String { return self._s[2746]! } + public var Login_ContinueWithLocalization: String { return self._s[2741]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2742]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2744]! } + public var Conversation_Unblock: String { return self._s[2745]! } + public var PrivacySettings_DataSettings: String { return self._s[2746]! } + public var Group_PublicLink_Info: String { return self._s[2747]! } public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2747]!, self._r[2747]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2748]!, self._r[2748]!, [_1, _2, _3]) } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2748]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2749]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2749]!, self._r[2749]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2750]!, self._r[2750]!, [_0, _1]) } - public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2751]! } - public var PrivacySettings_Passcode: String { return self._s[2753]! } - public var Call_Mute: String { return self._s[2754]! } - public var Wallet_Weekday_Yesterday: String { return self._s[2755]! } - public var Passport_Language_dz: String { return self._s[2756]! } - public var Wallet_Receive_AmountHeader: String { return self._s[2757]! } - public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2758]! } - public var Passport_Language_tk: String { return self._s[2759]! } + public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2752]! } + public var PrivacySettings_Passcode: String { return self._s[2754]! } + public var Call_Mute: String { return self._s[2755]! } + public var Wallet_Weekday_Yesterday: String { return self._s[2756]! } + public var Passport_Language_dz: String { return self._s[2757]! } + public var Wallet_Receive_AmountHeader: String { return self._s[2758]! } + public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2759]! } + public var Passport_Language_tk: String { return self._s[2760]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2760]!, self._r[2760]!, [_0]) + return formatWithArgumentRanges(self._s[2761]!, self._r[2761]!, [_0]) } - public var Settings_Search: String { return self._s[2761]! } - public var Wallet_Month_ShortFebruary: String { return self._s[2762]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2763]! } - public var Wallet_Configuration_SourceJSON: String { return self._s[2764]! } - public var Conversation_ContextMenuReply: String { return self._s[2765]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2766]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2767]! } - public var Tour_Title1: String { return self._s[2768]! } - public var Wallet_Alert_Cancel: String { return self._s[2769]! } - public var Conversation_ClearGroupHistory: String { return self._s[2771]! } - public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2772]! } - public var WallpaperPreview_Motion: String { return self._s[2773]! } + public var Settings_Search: String { return self._s[2762]! } + public var Wallet_Month_ShortFebruary: String { return self._s[2763]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2764]! } + public var Wallet_Configuration_SourceJSON: String { return self._s[2765]! } + public var Conversation_ContextMenuReply: String { return self._s[2766]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2767]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2768]! } + public var Tour_Title1: String { return self._s[2769]! } + public var Wallet_Alert_Cancel: String { return self._s[2770]! } + public var Conversation_ClearGroupHistory: String { return self._s[2772]! } + public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2773]! } + public var WallpaperPreview_Motion: String { return self._s[2774]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2774]!, self._r[2774]!, [_0]) + return formatWithArgumentRanges(self._s[2775]!, self._r[2775]!, [_0]) } - public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2775]! } - public var Call_RateCall: String { return self._s[2776]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2777]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2778]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2779]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2781]! } + public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2776]! } + public var Call_RateCall: String { return self._s[2777]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2778]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2779]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2780]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2782]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2783]!, self._r[2783]!, [_0]) + return formatWithArgumentRanges(self._s[2784]!, self._r[2784]!, [_0]) } - public var Compose_Create: String { return self._s[2784]! } - public var Contacts_InviteToTelegram: String { return self._s[2785]! } - public var GroupInfo_Notifications: String { return self._s[2786]! } - public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2788]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2789]! } - public var Month_GenApril: String { return self._s[2790]! } - public var Appearance_AutoNightTheme: String { return self._s[2791]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2793]! } - public var Login_CodeSentSms: String { return self._s[2795]! } + public var Compose_Create: String { return self._s[2785]! } + public var Contacts_InviteToTelegram: String { return self._s[2786]! } + public var GroupInfo_Notifications: String { return self._s[2787]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2789]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2790]! } + public var Month_GenApril: String { return self._s[2791]! } + public var Appearance_AutoNightTheme: String { return self._s[2792]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2794]! } + public var Login_CodeSentSms: String { return self._s[2796]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2796]!, self._r[2796]!, [_0]) + return formatWithArgumentRanges(self._s[2797]!, self._r[2797]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2797]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2798]! } - public var Passport_Language_hr: String { return self._s[2799]! } - public var Common_ActionNotAllowedError: String { return self._s[2800]! } + public var EmptyGroupInfo_Line3: String { return self._s[2798]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2799]! } + public var Passport_Language_hr: String { return self._s[2800]! } + public var Common_ActionNotAllowedError: String { return self._s[2801]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2801]!, self._r[2801]!, [_0]) + return formatWithArgumentRanges(self._s[2802]!, self._r[2802]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2802]! } - public var Wallet_Info_TransactionFrom: String { return self._s[2803]! } - public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2804]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2805]! } - public var Privacy_SecretChatsTitle: String { return self._s[2806]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2808]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2809]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2810]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2811]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2812]! } - public var Preview_DeleteGif: String { return self._s[2813]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2814]! } - public var Group_ErrorNotMutualContact: String { return self._s[2815]! } - public var Notification_MessageLifetime5s: String { return self._s[2816]! } - public var Wallet_Send_OwnAddressAlertText: String { return self._s[2817]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2803]! } + public var Wallet_Info_TransactionFrom: String { return self._s[2804]! } + public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2805]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2806]! } + public var Privacy_SecretChatsTitle: String { return self._s[2807]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2809]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2810]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2811]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2812]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2813]! } + public var Preview_DeleteGif: String { return self._s[2814]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2815]! } + public var Group_ErrorNotMutualContact: String { return self._s[2816]! } + public var Notification_MessageLifetime5s: String { return self._s[2817]! } + public var Wallet_Send_OwnAddressAlertText: String { return self._s[2818]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2818]!, self._r[2818]!, [_0]) + return formatWithArgumentRanges(self._s[2819]!, self._r[2819]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2819]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2821]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2822]! } - public var Passport_Address_AddBankStatement: String { return self._s[2823]! } - public var Notification_CallIncoming: String { return self._s[2824]! } - public var Wallet_Words_NotDoneTitle: String { return self._s[2825]! } - public var Compose_NewGroupTitle: String { return self._s[2826]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2828]! } - public var Passport_Address_Postcode: String { return self._s[2830]! } + public var VoiceOver_Chat_Video: String { return self._s[2820]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2822]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2823]! } + public var Passport_Address_AddBankStatement: String { return self._s[2824]! } + public var Notification_CallIncoming: String { return self._s[2825]! } + public var Wallet_Words_NotDoneTitle: String { return self._s[2826]! } + public var Compose_NewGroupTitle: String { return self._s[2827]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2829]! } + public var Passport_Address_Postcode: String { return self._s[2831]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2831]!, self._r[2831]!, [_0]) + return formatWithArgumentRanges(self._s[2832]!, self._r[2832]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2832]! } - public var Wallet_Month_ShortOctober: String { return self._s[2833]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2834]! } - public var WallpaperColors_Title: String { return self._s[2835]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2836]! } - public var VoiceOver_MessageContextForward: String { return self._s[2837]! } - public var GroupPermission_Duration: String { return self._s[2838]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2833]! } + public var Wallet_Month_ShortOctober: String { return self._s[2834]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2835]! } + public var WallpaperColors_Title: String { return self._s[2836]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2837]! } + public var VoiceOver_MessageContextForward: String { return self._s[2838]! } + public var GroupPermission_Duration: String { return self._s[2839]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2839]!, self._r[2839]!, [_0]) + return formatWithArgumentRanges(self._s[2840]!, self._r[2840]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2840]! } - public var Username_Placeholder: String { return self._s[2841]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2842]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2843]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2844]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2841]! } + public var Username_Placeholder: String { return self._s[2842]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2843]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2844]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2845]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2846]!, self._r[2846]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2847]!, self._r[2847]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2847]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2848]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2849]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2850]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2851]! } - public var Conversation_ContextMenuMore: String { return self._s[2852]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2853]! } - public var CallSettings_TabIcon: String { return self._s[2854]! } - public var KeyCommand_Find: String { return self._s[2855]! } - public var ClearCache_FreeSpaceDescription: String { return self._s[2856]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2857]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2858]! } - public var Message_PinnedGame: String { return self._s[2859]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2860]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2862]! } - public var Login_CallRequestState2: String { return self._s[2864]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2866]! } + public var Passport_PasswordDescription: String { return self._s[2848]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2849]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2850]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2851]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2852]! } + public var Conversation_ContextMenuMore: String { return self._s[2853]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2854]! } + public var CallSettings_TabIcon: String { return self._s[2855]! } + public var KeyCommand_Find: String { return self._s[2856]! } + public var ClearCache_FreeSpaceDescription: String { return self._s[2857]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2858]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2859]! } + public var Message_PinnedGame: String { return self._s[2860]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2861]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2863]! } + public var Login_CallRequestState2: String { return self._s[2865]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2867]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2867]!, self._r[2867]!, [_0]) + return formatWithArgumentRanges(self._s[2868]!, self._r[2868]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2869]!, self._r[2869]!, [_0]) + return formatWithArgumentRanges(self._s[2870]!, self._r[2870]!, [_0]) } - public var AuthSessions_AddDevice: String { return self._s[2870]! } - public var WallpaperPreview_Blurred: String { return self._s[2871]! } - public var Conversation_InstantPagePreview: String { return self._s[2872]! } + public var AuthSessions_AddDevice: String { return self._s[2871]! } + public var WallpaperPreview_Blurred: String { return self._s[2872]! } + public var Conversation_InstantPagePreview: String { return self._s[2873]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2873]!, self._r[2873]!, [_0]) + return formatWithArgumentRanges(self._s[2874]!, self._r[2874]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2876]! } - public var WallpaperSearch_ColorRed: String { return self._s[2877]! } - public var GroupPermission_NoPinMessages: String { return self._s[2878]! } - public var Passport_Language_es: String { return self._s[2879]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2881]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2882]! } + public var SecretTimer_VideoDescription: String { return self._s[2877]! } + public var WallpaperSearch_ColorRed: String { return self._s[2878]! } + public var GroupPermission_NoPinMessages: String { return self._s[2879]! } + public var Passport_Language_es: String { return self._s[2880]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2882]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2883]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2883]!, self._r[2883]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2884]!, self._r[2884]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2884]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2885]! } - public var Watch_UserInfo_Unmute: String { return self._s[2886]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2887]! } - public var AccessDenied_CameraRestricted: String { return self._s[2889]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2885]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2886]! } + public var Watch_UserInfo_Unmute: String { return self._s[2887]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2888]! } + public var AccessDenied_CameraRestricted: String { return self._s[2890]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2890]!, self._r[2890]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2891]!, self._r[2891]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2892]! } - public var Settings_CopyUsername: String { return self._s[2893]! } - public var Contacts_SearchLabel: String { return self._s[2894]! } - public var Map_OpenInYandexNavigator: String { return self._s[2896]! } - public var PasscodeSettings_EncryptData: String { return self._s[2897]! } - public var Settings_Wallet: String { return self._s[2898]! } - public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2899]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2900]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2901]! } - public var DialogList_AdNoticeAlert: String { return self._s[2902]! } - public var Wallet_Month_GenMay: String { return self._s[2904]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2905]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2906]! } - public var Localization_LanguageCustom: String { return self._s[2907]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2908]! } - public var CallFeedback_Title: String { return self._s[2909]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2912]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2913]! } - public var Wallet_Intro_CreateErrorTitle: String { return self._s[2914]! } - public var Conversation_InfoGroup: String { return self._s[2915]! } - public var Compose_NewMessage: String { return self._s[2916]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2917]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2918]! } - public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2919]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2920]! } + public var ChatList_ReadAll: String { return self._s[2893]! } + public var Settings_CopyUsername: String { return self._s[2894]! } + public var Contacts_SearchLabel: String { return self._s[2895]! } + public var Map_OpenInYandexNavigator: String { return self._s[2897]! } + public var PasscodeSettings_EncryptData: String { return self._s[2898]! } + public var Settings_Wallet: String { return self._s[2899]! } + public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2900]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2901]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2902]! } + public var DialogList_AdNoticeAlert: String { return self._s[2903]! } + public var Wallet_Month_GenMay: String { return self._s[2905]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2906]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2907]! } + public var Localization_LanguageCustom: String { return self._s[2908]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2909]! } + public var CallFeedback_Title: String { return self._s[2910]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2913]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2914]! } + public var Wallet_Intro_CreateErrorTitle: String { return self._s[2915]! } + public var Conversation_InfoGroup: String { return self._s[2916]! } + public var Compose_NewMessage: String { return self._s[2917]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2918]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2919]! } + public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2920]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2921]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2921]!, self._r[2921]!, [_0]) + return formatWithArgumentRanges(self._s[2922]!, self._r[2922]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2922]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2923]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2924]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2925]! } - public var Channel_BlackList_Title: String { return self._s[2926]! } - public var UserInfo_PhoneCall: String { return self._s[2927]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2929]! } - public var Wallet_Month_ShortJanuary: String { return self._s[2930]! } - public var State_connecting: String { return self._s[2931]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2932]! } - public var Wallet_Month_GenMarch: String { return self._s[2933]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[2934]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2923]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2924]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2925]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2926]! } + public var Channel_BlackList_Title: String { return self._s[2927]! } + public var UserInfo_PhoneCall: String { return self._s[2928]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2930]! } + public var Wallet_Month_ShortJanuary: String { return self._s[2931]! } + public var State_connecting: String { return self._s[2932]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2933]! } + public var Wallet_Month_GenMarch: String { return self._s[2934]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[2935]! } public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2935]!, self._r[2935]!, [_0]) - } - public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2936]!, self._r[2936]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2937]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2938]! } - public var Passport_Identity_EditPassport: String { return self._s[2939]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2941]! } - public var Localization_EnglishLanguageName: String { return self._s[2942]! } - public var Share_AuthDescription: String { return self._s[2943]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2944]! } - public var Passport_Identity_Surname: String { return self._s[2945]! } - public var Compose_TokenListPlaceholder: String { return self._s[2946]! } - public var Wallet_AccessDenied_Camera: String { return self._s[2947]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[2948]! } - public var Settings_AboutEmpty: String { return self._s[2949]! } - public var Conversation_Unmute: String { return self._s[2950]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[2952]! } - public var Wallet_Sending_Text: String { return self._s[2953]! } - public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2954]!, self._r[2954]!, [_1]) + public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2937]!, self._r[2937]!, [_0]) } - public var Login_CodeSentCall: String { return self._s[2955]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2957]! } - public var ChatSettings_Appearance: String { return self._s[2958]! } - public var ClearCache_StorageUsage: String { return self._s[2959]! } - public var Appearance_PickAccentColor: String { return self._s[2960]! } + public var Notifications_GroupNotifications: String { return self._s[2938]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2939]! } + public var Passport_Identity_EditPassport: String { return self._s[2940]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2942]! } + public var Localization_EnglishLanguageName: String { return self._s[2943]! } + public var Share_AuthDescription: String { return self._s[2944]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2945]! } + public var Passport_Identity_Surname: String { return self._s[2946]! } + public var Compose_TokenListPlaceholder: String { return self._s[2947]! } + public var Wallet_AccessDenied_Camera: String { return self._s[2948]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2949]! } + public var Settings_AboutEmpty: String { return self._s[2950]! } + public var Conversation_Unmute: String { return self._s[2951]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[2953]! } + public var Wallet_Sending_Text: String { return self._s[2954]! } + public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2955]!, self._r[2955]!, [_1]) + } + public var Login_CodeSentCall: String { return self._s[2956]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2958]! } + public var ChatSettings_Appearance: String { return self._s[2959]! } + public var ClearCache_StorageUsage: String { return self._s[2960]! } + public var Appearance_PickAccentColor: String { return self._s[2961]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2961]!, self._r[2961]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2962]!, self._r[2962]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2962]!, self._r[2962]!, [_1]) + return formatWithArgumentRanges(self._s[2963]!, self._r[2963]!, [_1]) } - public var Notification_CallMissed: String { return self._s[2963]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2964]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2965]! } - public var Wallet_Month_GenOctober: String { return self._s[2967]! } - public var ChatAdmins_AdminLabel: String { return self._s[2968]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2969]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[2971]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2972]! } - public var Month_GenJune: String { return self._s[2973]! } - public var IntentsSettings_MainAccountInfo: String { return self._s[2974]! } - public var Watch_Location_Current: String { return self._s[2975]! } - public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2976]! } - public var Conversation_TitleMute: String { return self._s[2977]! } + public var Notification_CallMissed: String { return self._s[2964]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2965]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2966]! } + public var Wallet_Month_GenOctober: String { return self._s[2968]! } + public var ChatAdmins_AdminLabel: String { return self._s[2969]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2970]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2972]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2973]! } + public var Month_GenJune: String { return self._s[2974]! } + public var IntentsSettings_MainAccountInfo: String { return self._s[2975]! } + public var Watch_Location_Current: String { return self._s[2976]! } + public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2977]! } + public var Conversation_TitleMute: String { return self._s[2978]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2978]!, self._r[2978]!, [_1]) + return formatWithArgumentRanges(self._s[2979]!, self._r[2979]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[2979]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2980]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2980]!, self._r[2980]!, [_0]) + return formatWithArgumentRanges(self._s[2981]!, self._r[2981]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[2981]! } - public var Chat_SlowmodeSendError: String { return self._s[2982]! } - public var MaskStickerSettings_Info: String { return self._s[2983]! } - public var EditTheme_Expand_TopInfo: String { return self._s[2984]! } + public var Call_ReportPlaceholder: String { return self._s[2982]! } + public var Chat_SlowmodeSendError: String { return self._s[2983]! } + public var MaskStickerSettings_Info: String { return self._s[2984]! } + public var EditTheme_Expand_TopInfo: String { return self._s[2985]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2985]!, self._r[2985]!, [_0]) + return formatWithArgumentRanges(self._s[2986]!, self._r[2986]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[2986]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[2988]! } - public var Contacts_ShareTelegram: String { return self._s[2989]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2990]! } - public var Map_AddressOnMap: String { return self._s[2991]! } - public var Channel_ErrorAccessDenied: String { return self._s[2992]! } - public var UserInfo_ScamBotWarning: String { return self._s[2994]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[2995]! } - public var Call_ConnectionErrorTitle: String { return self._s[2996]! } - public var UserInfo_NotificationsEnable: String { return self._s[2997]! } - public var ArchivedChats_IntroText1: String { return self._s[2998]! } - public var Tour_Text4: String { return self._s[3001]! } - public var WallpaperSearch_Recent: String { return self._s[3002]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[3003]! } - public var Profile_MessageLifetime2s: String { return self._s[3005]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3006]! } - public var Notification_MessageLifetime2s: String { return self._s[3007]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2987]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2989]! } + public var Contacts_ShareTelegram: String { return self._s[2990]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2991]! } + public var Map_AddressOnMap: String { return self._s[2992]! } + public var Channel_ErrorAccessDenied: String { return self._s[2993]! } + public var UserInfo_ScamBotWarning: String { return self._s[2995]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2996]! } + public var Call_ConnectionErrorTitle: String { return self._s[2997]! } + public var UserInfo_NotificationsEnable: String { return self._s[2998]! } + public var ArchivedChats_IntroText1: String { return self._s[2999]! } + public var Tour_Text4: String { return self._s[3002]! } + public var WallpaperSearch_Recent: String { return self._s[3003]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[3004]! } + public var Profile_MessageLifetime2s: String { return self._s[3006]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3007]! } + public var Notification_MessageLifetime2s: String { return self._s[3008]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3008]!, self._r[3008]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3009]!, self._r[3009]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[3009]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[3010]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3011]! } + public var Cache_ClearCache: String { return self._s[3010]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[3011]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3012]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3015]!, self._r[3015]!, [_0]) + return formatWithArgumentRanges(self._s[3016]!, self._r[3016]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3017]!, self._r[3017]!, [_0]) + return formatWithArgumentRanges(self._s[3018]!, self._r[3018]!, [_0]) } - public var LocalGroup_Text: String { return self._s[3018]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3019]! } - public var SocksProxySetup_TypeSocks: String { return self._s[3020]! } - public var ChatList_UnarchiveAction: String { return self._s[3021]! } - public var AutoNightTheme_Title: String { return self._s[3022]! } - public var InstantPage_FeedbackButton: String { return self._s[3023]! } - public var Passport_FieldAddress: String { return self._s[3024]! } + public var LocalGroup_Text: String { return self._s[3019]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3020]! } + public var SocksProxySetup_TypeSocks: String { return self._s[3021]! } + public var ChatList_UnarchiveAction: String { return self._s[3022]! } + public var AutoNightTheme_Title: String { return self._s[3023]! } + public var InstantPage_FeedbackButton: String { return self._s[3024]! } + public var Passport_FieldAddress: String { return self._s[3025]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3025]!, self._r[3025]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3026]!, self._r[3026]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[3026]! } + public var Month_ShortMarch: String { return self._s[3027]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3027]!, self._r[3027]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3028]!, self._r[3028]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3028]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3029]! } - public var Passport_FloodError: String { return self._s[3030]! } - public var SecretGif_Title: String { return self._s[3031]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3032]! } - public var ChatList_Context_UnhideArchive: String { return self._s[3033]! } - public var Passport_Language_th: String { return self._s[3035]! } - public var Passport_Address_Address: String { return self._s[3036]! } - public var Login_InvalidLastNameError: String { return self._s[3037]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[3038]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[3039]! } - public var ChatList_Context_Archive: String { return self._s[3040]! } - public var SettingsSearch_FAQ: String { return self._s[3041]! } - public var ShareMenu_Send: String { return self._s[3042]! } - public var WallpaperSearch_ColorYellow: String { return self._s[3044]! } - public var Month_GenNovember: String { return self._s[3046]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3048]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3029]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3030]! } + public var Passport_FloodError: String { return self._s[3031]! } + public var SecretGif_Title: String { return self._s[3032]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3033]! } + public var ChatList_Context_UnhideArchive: String { return self._s[3034]! } + public var Passport_Language_th: String { return self._s[3036]! } + public var Passport_Address_Address: String { return self._s[3037]! } + public var Login_InvalidLastNameError: String { return self._s[3038]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[3039]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[3040]! } + public var ChatList_Context_Archive: String { return self._s[3041]! } + public var SettingsSearch_FAQ: String { return self._s[3042]! } + public var ShareMenu_Send: String { return self._s[3043]! } + public var WallpaperSearch_ColorYellow: String { return self._s[3045]! } + public var Month_GenNovember: String { return self._s[3047]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3049]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3049]!, self._r[3049]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3050]!, self._r[3050]!, [_1, _2]) } - public var Conversation_SwipeToReplyHintText: String { return self._s[3050]! } - public var Checkout_Email: String { return self._s[3051]! } - public var NotificationsSound_Tritone: String { return self._s[3052]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[3054]! } - public var Wallet_ContextMenuCopy: String { return self._s[3056]! } + public var Conversation_SwipeToReplyHintText: String { return self._s[3051]! } + public var Checkout_Email: String { return self._s[3052]! } + public var NotificationsSound_Tritone: String { return self._s[3053]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[3055]! } + public var Wallet_ContextMenuCopy: String { return self._s[3057]! } public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3058]!, self._r[3058]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3059]!, self._r[3059]!, [_1, _2, _3]) } - public var Appearance_TextSize_Automatic: String { return self._s[3059]! } + public var Appearance_TextSize_Automatic: String { return self._s[3060]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3060]!, self._r[3060]!, [_1]) + return formatWithArgumentRanges(self._s[3061]!, self._r[3061]!, [_1]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[3061]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[3062]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3062]!, self._r[3062]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[3063]!, self._r[3063]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[3063]! } - public var Notification_Exceptions_Add: String { return self._s[3064]! } - public var DialogList_You: String { return self._s[3065]! } - public var MediaPicker_Send: String { return self._s[3068]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3069]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3070]! } - public var Call_AudioRouteSpeaker: String { return self._s[3071]! } - public var Watch_UserInfo_Title: String { return self._s[3072]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[3073]! } - public var Appearance_AccentColor: String { return self._s[3075]! } + public var ChatList_UndoArchiveTitle: String { return self._s[3064]! } + public var Notification_Exceptions_Add: String { return self._s[3065]! } + public var DialogList_You: String { return self._s[3066]! } + public var MediaPicker_Send: String { return self._s[3069]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3070]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3071]! } + public var Call_AudioRouteSpeaker: String { return self._s[3072]! } + public var Watch_UserInfo_Title: String { return self._s[3073]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[3074]! } + public var Appearance_AccentColor: String { return self._s[3076]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3076]!, self._r[3076]!, [_0]) + return formatWithArgumentRanges(self._s[3077]!, self._r[3077]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3077]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3078]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3078]!, self._r[3078]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3079]!, self._r[3079]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[3079]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[3080]! } - public var Notification_CallOutgoing: String { return self._s[3081]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3082]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3083]! } - public var Call_RecordingDisabledMessage: String { return self._s[3084]! } - public var Message_Game: String { return self._s[3085]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[3086]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3087]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3088]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3089]! } - public var Date_DialogDateFormat: String { return self._s[3090]! } - public var WallpaperColors_SetCustomColor: String { return self._s[3091]! } - public var Notifications_InAppNotifications: String { return self._s[3092]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[3080]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[3081]! } + public var Notification_CallOutgoing: String { return self._s[3082]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3083]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3084]! } + public var Call_RecordingDisabledMessage: String { return self._s[3085]! } + public var Message_Game: String { return self._s[3086]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[3087]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3088]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3089]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3090]! } + public var Date_DialogDateFormat: String { return self._s[3091]! } + public var WallpaperColors_SetCustomColor: String { return self._s[3092]! } + public var Notifications_InAppNotifications: String { return self._s[3093]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3093]!, self._r[3093]!, [_0]) + return formatWithArgumentRanges(self._s[3094]!, self._r[3094]!, [_0]) } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3094]!, self._r[3094]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3095]!, self._r[3095]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[3095]! } + public var NewContact_Title: String { return self._s[3096]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3096]!, self._r[3096]!, [_0]) + return formatWithArgumentRanges(self._s[3097]!, self._r[3097]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[3097]! } + public var Conversation_ViewContactDetails: String { return self._s[3098]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3099]!, self._r[3099]!, [_1]) + return formatWithArgumentRanges(self._s[3100]!, self._r[3100]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3100]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[3101]! } - public var PrivacySettings_Title: String { return self._s[3102]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3105]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[3106]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[3107]! } - public var Contacts_PhoneNumber: String { return self._s[3108]! } - public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3110]! } - public var Map_ShowPlaces: String { return self._s[3111]! } - public var ChatAdmins_Title: String { return self._s[3112]! } - public var InstantPage_Reference: String { return self._s[3114]! } - public var Wallet_Info_Updating: String { return self._s[3115]! } - public var ReportGroupLocation_Text: String { return self._s[3116]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3101]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[3102]! } + public var PrivacySettings_Title: String { return self._s[3103]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3106]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[3107]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[3108]! } + public var Contacts_PhoneNumber: String { return self._s[3109]! } + public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3111]! } + public var Map_ShowPlaces: String { return self._s[3112]! } + public var ChatAdmins_Title: String { return self._s[3113]! } + public var InstantPage_Reference: String { return self._s[3115]! } + public var Wallet_Info_Updating: String { return self._s[3116]! } + public var ReportGroupLocation_Text: String { return self._s[3117]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3117]!, self._r[3117]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3118]!, self._r[3118]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[3118]! } - public var Watch_UserInfo_Block: String { return self._s[3119]! } - public var ChatSettings_Stickers: String { return self._s[3120]! } - public var ChatSettings_DownloadInBackground: String { return self._s[3121]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[3122]! } + public var Camera_FlashOff: String { return self._s[3119]! } + public var Watch_UserInfo_Block: String { return self._s[3120]! } + public var ChatSettings_Stickers: String { return self._s[3121]! } + public var ChatSettings_DownloadInBackground: String { return self._s[3122]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[3123]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3123]!, self._r[3123]!, [_0]) + return formatWithArgumentRanges(self._s[3124]!, self._r[3124]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[3124]! } - public var Login_CheckOtherSessionMessages: String { return self._s[3125]! } - public var AutoDownloadSettings_Cellular: String { return self._s[3126]! } - public var Wallet_Created_ExportErrorTitle: String { return self._s[3127]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3128]! } - public var VoiceOver_MessageContextShare: String { return self._s[3129]! } + public var Settings_ViewPhoto: String { return self._s[3125]! } + public var Login_CheckOtherSessionMessages: String { return self._s[3126]! } + public var AutoDownloadSettings_Cellular: String { return self._s[3127]! } + public var Wallet_Created_ExportErrorTitle: String { return self._s[3128]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3129]! } + public var VoiceOver_MessageContextShare: String { return self._s[3130]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3131]!, self._r[3131]!, [_0]) + return formatWithArgumentRanges(self._s[3132]!, self._r[3132]!, [_0]) } - public var Privacy_DeleteDrafts: String { return self._s[3132]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3133]! } + public var Privacy_DeleteDrafts: String { return self._s[3133]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3134]! } public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3134]!, self._r[3134]!, [_0]) + return formatWithArgumentRanges(self._s[3135]!, self._r[3135]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[3135]! } - public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3136]! } - public var DialogList_SavedMessages: String { return self._s[3137]! } - public var GroupInfo_UpgradeButton: String { return self._s[3138]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3140]! } - public var DialogList_Pin: String { return self._s[3141]! } + public var DialogList_SavedMessagesHelp: String { return self._s[3136]! } + public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3137]! } + public var DialogList_SavedMessages: String { return self._s[3138]! } + public var GroupInfo_UpgradeButton: String { return self._s[3139]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3141]! } + public var DialogList_Pin: String { return self._s[3142]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3142]!, self._r[3142]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3143]!, self._r[3143]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3143]!, self._r[3143]!, [_0]) + return formatWithArgumentRanges(self._s[3144]!, self._r[3144]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3144]! } - public var UserInfo_NotificationsDisable: String { return self._s[3145]! } - public var Paint_Outlined: String { return self._s[3146]! } - public var Activity_PlayingGame: String { return self._s[3147]! } - public var SearchImages_NoImagesFound: String { return self._s[3148]! } - public var SocksProxySetup_ProxyType: String { return self._s[3149]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3151]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[3152]! } - public var Settings_AppLanguage: String { return self._s[3153]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3154]! } - public var Common_ChoosePhoto: String { return self._s[3155]! } - public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3156]! } - public var CallFeedback_ReasonEcho: String { return self._s[3157]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3145]! } + public var UserInfo_NotificationsDisable: String { return self._s[3146]! } + public var Paint_Outlined: String { return self._s[3147]! } + public var Activity_PlayingGame: String { return self._s[3148]! } + public var SearchImages_NoImagesFound: String { return self._s[3149]! } + public var SocksProxySetup_ProxyType: String { return self._s[3150]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3152]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[3153]! } + public var Settings_AppLanguage: String { return self._s[3154]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3155]! } + public var Common_ChoosePhoto: String { return self._s[3156]! } + public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3157]! } + public var CallFeedback_ReasonEcho: String { return self._s[3158]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3158]!, self._r[3158]!, [_1]) + return formatWithArgumentRanges(self._s[3159]!, self._r[3159]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[3159]! } - public var Activity_UploadingVideo: String { return self._s[3160]! } - public var Conversation_WalletRequiredNotNow: String { return self._s[3161]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3162]! } - public var NetworkUsageSettings_Wifi: String { return self._s[3163]! } - public var VoiceOver_Editing_ClearText: String { return self._s[3164]! } - public var PUSH_SENDER_YOU: String { return self._s[3165]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[3166]! } - public var Checkout_PayWithTouchId: String { return self._s[3167]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3168]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[3160]! } + public var Activity_UploadingVideo: String { return self._s[3161]! } + public var Conversation_WalletRequiredNotNow: String { return self._s[3162]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3163]! } + public var NetworkUsageSettings_Wifi: String { return self._s[3164]! } + public var VoiceOver_Editing_ClearText: String { return self._s[3165]! } + public var PUSH_SENDER_YOU: String { return self._s[3166]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[3167]! } + public var Checkout_PayWithTouchId: String { return self._s[3168]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3169]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3170]!, self._r[3170]!, [_1]) + return formatWithArgumentRanges(self._s[3171]!, self._r[3171]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[3171]! } + public var Notifications_ExceptionsNone: String { return self._s[3172]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3172]!, self._r[3172]!, [_0]) + return formatWithArgumentRanges(self._s[3173]!, self._r[3173]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3173]!, self._r[3173]!, [_1]) + return formatWithArgumentRanges(self._s[3174]!, self._r[3174]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[3175]! } - public var Passport_Address_Region: String { return self._s[3178]! } - public var ChatList_DeleteChat: String { return self._s[3179]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[3180]! } - public var PhotoEditor_TiltShift: String { return self._s[3181]! } - public var Settings_FAQ_URL: String { return self._s[3182]! } - public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3183]! } - public var Passport_Language_sl: String { return self._s[3184]! } - public var Settings_PrivacySettings: String { return self._s[3186]! } - public var SharedMedia_TitleLink: String { return self._s[3187]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[3188]! } - public var Settings_SetProfilePhoto: String { return self._s[3189]! } - public var Channel_About_Help: String { return self._s[3190]! } - public var Contacts_PermissionsEnable: String { return self._s[3191]! } - public var Wallet_Sending_Title: String { return self._s[3192]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3193]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[3194]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3196]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3197]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3198]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3199]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[3200]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[3202]! } - public var Map_OpenInYandexMaps: String { return self._s[3204]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3205]! } - public var VoiceOver_MessageContextReply: String { return self._s[3206]! } - public var PhotoEditor_SaturationTool: String { return self._s[3207]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[3176]! } + public var Passport_Address_Region: String { return self._s[3179]! } + public var ChatList_DeleteChat: String { return self._s[3180]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[3181]! } + public var PhotoEditor_TiltShift: String { return self._s[3182]! } + public var Settings_FAQ_URL: String { return self._s[3183]! } + public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3184]! } + public var Passport_Language_sl: String { return self._s[3185]! } + public var Settings_PrivacySettings: String { return self._s[3187]! } + public var SharedMedia_TitleLink: String { return self._s[3188]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[3189]! } + public var Settings_SetProfilePhoto: String { return self._s[3190]! } + public var Channel_About_Help: String { return self._s[3191]! } + public var Contacts_PermissionsEnable: String { return self._s[3192]! } + public var Wallet_Sending_Title: String { return self._s[3193]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3194]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[3195]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3197]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3198]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3199]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3200]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[3201]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[3203]! } + public var Map_OpenInYandexMaps: String { return self._s[3205]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3206]! } + public var VoiceOver_MessageContextReply: String { return self._s[3207]! } + public var PhotoEditor_SaturationTool: String { return self._s[3208]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3208]!, self._r[3208]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3209]!, self._r[3209]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3209]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3210]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3211]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3210]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3211]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3212]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3212]!, self._r[3212]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3213]!, self._r[3213]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3213]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3215]! } - public var SettingsSearch_Synonyms_Wallet: String { return self._s[3216]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3214]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3216]! } + public var SettingsSearch_Synonyms_Wallet: String { return self._s[3217]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3217]!, self._r[3217]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3218]!, self._r[3218]!, [_1, _2]) } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3218]!, self._r[3218]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3219]!, self._r[3219]!, [_1, _2, _3]) } - public var GroupInfo_PublicLinkAdd: String { return self._s[3219]! } - public var Passport_PassportInformation: String { return self._s[3222]! } - public var Theme_Unsupported: String { return self._s[3223]! } - public var WatchRemote_AlertTitle: String { return self._s[3224]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3225]! } - public var ConvertToSupergroup_HelpText: String { return self._s[3227]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[3220]! } + public var Passport_PassportInformation: String { return self._s[3223]! } + public var Theme_Unsupported: String { return self._s[3224]! } + public var WatchRemote_AlertTitle: String { return self._s[3225]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3226]! } + public var ConvertToSupergroup_HelpText: String { return self._s[3228]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3228]!, self._r[3228]!, [_0]) + return formatWithArgumentRanges(self._s[3229]!, self._r[3229]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3229]!, self._r[3229]!, [_1]) + return formatWithArgumentRanges(self._s[3230]!, self._r[3230]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3230]! } - public var Wallet_Navigation_Done: String { return self._s[3232]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3233]! } - public var AccessDenied_CameraDisabled: String { return self._s[3234]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3231]! } + public var Wallet_Navigation_Done: String { return self._s[3233]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3234]! } + public var AccessDenied_CameraDisabled: String { return self._s[3235]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3235]!, self._r[3235]!, [_0]) + return formatWithArgumentRanges(self._s[3236]!, self._r[3236]!, [_0]) } - public var ClearCache_Forever: String { return self._s[3236]! } - public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3237]! } - public var PhotoEditor_ContrastTool: String { return self._s[3240]! } + public var ClearCache_Forever: String { return self._s[3237]! } + public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3238]! } + public var PhotoEditor_ContrastTool: String { return self._s[3241]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3241]!, self._r[3241]!, [_1]) + return formatWithArgumentRanges(self._s[3242]!, self._r[3242]!, [_1]) } - public var DialogList_Draft: String { return self._s[3242]! } - public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3243]! } - public var Privacy_TopPeersDelete: String { return self._s[3245]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[3246]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3247]! } - public var WebSearch_RecentSectionClear: String { return self._s[3248]! } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[3249]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3251]! } - public var Common_Done: String { return self._s[3253]! } - public var Shortcut_SwitchAccount: String { return self._s[3254]! } - public var AuthSessions_EmptyText: String { return self._s[3255]! } - public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3256]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[3257]! } - public var Tour_Title5: String { return self._s[3258]! } - public var Wallet_Settings_Title: String { return self._s[3259]! } + public var DialogList_Draft: String { return self._s[3243]! } + public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3244]! } + public var Privacy_TopPeersDelete: String { return self._s[3246]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[3247]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3248]! } + public var WebSearch_RecentSectionClear: String { return self._s[3249]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[3250]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3252]! } + public var Common_Done: String { return self._s[3254]! } + public var Shortcut_SwitchAccount: String { return self._s[3255]! } + public var AuthSessions_EmptyText: String { return self._s[3256]! } + public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3257]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[3258]! } + public var Tour_Title5: String { return self._s[3259]! } + public var Wallet_Settings_Title: String { return self._s[3260]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_0]) + return formatWithArgumentRanges(self._s[3261]!, self._r[3261]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3261]! } - public var Conversation_LinkDialogSave: String { return self._s[3262]! } - public var GroupInfo_ActionRestrict: String { return self._s[3263]! } - public var Checkout_Title: String { return self._s[3264]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3266]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[3268]! } - public var Notification_RenamedGroup: String { return self._s[3269]! } - public var PeopleNearby_Groups: String { return self._s[3270]! } - public var Checkout_PayWithFaceId: String { return self._s[3271]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3272]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3274]! } - public var Checkout_WebConfirmation_Title: String { return self._s[3275]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[3276]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3262]! } + public var Conversation_LinkDialogSave: String { return self._s[3263]! } + public var GroupInfo_ActionRestrict: String { return self._s[3264]! } + public var Checkout_Title: String { return self._s[3265]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3267]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[3269]! } + public var Notification_RenamedGroup: String { return self._s[3270]! } + public var PeopleNearby_Groups: String { return self._s[3271]! } + public var Checkout_PayWithFaceId: String { return self._s[3272]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3273]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3275]! } + public var Checkout_WebConfirmation_Title: String { return self._s[3276]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[3277]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3277]!, self._r[3277]!, [_0]) + return formatWithArgumentRanges(self._s[3278]!, self._r[3278]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[3279]! } + public var Profile_AddToExisting: String { return self._s[3280]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3280]!, self._r[3280]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3281]!, self._r[3281]!, [_0, _1]) } - public var Cache_Files: String { return self._s[3282]! } - public var Permissions_PrivacyPolicy: String { return self._s[3283]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[3284]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3285]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[3287]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3289]! } - public var Calls_NoCallsPlaceholder: String { return self._s[3290]! } + public var Cache_Files: String { return self._s[3283]! } + public var Permissions_PrivacyPolicy: String { return self._s[3284]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[3285]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3286]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[3288]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3290]! } + public var Calls_NoCallsPlaceholder: String { return self._s[3291]! } public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3291]!, self._r[3291]!, [_0]) + return formatWithArgumentRanges(self._s[3292]!, self._r[3292]!, [_0]) } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3292]! } - public var VoiceOver_AttachMedia: String { return self._s[3294]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3295]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3293]! } + public var VoiceOver_AttachMedia: String { return self._s[3295]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3296]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3296]!, self._r[3296]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3297]!, self._r[3297]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3297]! } - public var Conversation_SetReminder_Title: String { return self._s[3298]! } - public var Passport_FieldAddressHelp: String { return self._s[3299]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3300]! } - public var PUSH_REMINDER_TITLE: String { return self._s[3301]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3298]! } + public var Conversation_SetReminder_Title: String { return self._s[3299]! } + public var Passport_FieldAddressHelp: String { return self._s[3300]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3301]! } + public var PUSH_REMINDER_TITLE: String { return self._s[3302]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3302]!, self._r[3302]!, [_0]) + return formatWithArgumentRanges(self._s[3303]!, self._r[3303]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[3303]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[3304]! } - public var Login_UnknownError: String { return self._s[3305]! } - public var Group_UpgradeNoticeText2: String { return self._s[3308]! } - public var Watch_Compose_AddContact: String { return self._s[3309]! } - public var ClearCache_StorageServiceFiles: String { return self._s[3310]! } - public var Web_Error: String { return self._s[3311]! } - public var Gif_Search: String { return self._s[3312]! } - public var Profile_MessageLifetime1h: String { return self._s[3313]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3314]! } - public var Channel_Username_CheckingUsername: String { return self._s[3315]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[3316]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[3317]! } - public var Channel_AboutItem: String { return self._s[3318]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3320]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[3321]! } - public var GroupInfo_SharedMedia: String { return self._s[3322]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[3304]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[3305]! } + public var Login_UnknownError: String { return self._s[3306]! } + public var Group_UpgradeNoticeText2: String { return self._s[3309]! } + public var Watch_Compose_AddContact: String { return self._s[3310]! } + public var ClearCache_StorageServiceFiles: String { return self._s[3311]! } + public var Web_Error: String { return self._s[3312]! } + public var Gif_Search: String { return self._s[3313]! } + public var Profile_MessageLifetime1h: String { return self._s[3314]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3315]! } + public var Channel_Username_CheckingUsername: String { return self._s[3316]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[3317]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[3318]! } + public var Channel_AboutItem: String { return self._s[3319]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3321]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[3322]! } + public var GroupInfo_SharedMedia: String { return self._s[3323]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3323]!, self._r[3323]!, [_1]) + return formatWithArgumentRanges(self._s[3324]!, self._r[3324]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[3324]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3325]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3325]!, self._r[3325]!, [_1]) + return formatWithArgumentRanges(self._s[3326]!, self._r[3326]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3326]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3327]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3328]! } - public var CreatePoll_AddOption: String { return self._s[3329]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3330]! } - public var Group_UpgradeNoticeHeader: String { return self._s[3331]! } - public var Channel_Management_AddModerator: String { return self._s[3332]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[3333]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[3334]! } - public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3335]! } - public var Theme_Colors_Background: String { return self._s[3336]! } - public var NotificationsSound_Hello: String { return self._s[3338]! } - public var SocksProxySetup_SavedProxies: String { return self._s[3339]! } - public var Channel_Stickers_Placeholder: String { return self._s[3341]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3327]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3328]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3329]! } + public var CreatePoll_AddOption: String { return self._s[3330]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3331]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3332]! } + public var Channel_Management_AddModerator: String { return self._s[3333]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3334]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3335]! } + public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3336]! } + public var Theme_Colors_Background: String { return self._s[3337]! } + public var NotificationsSound_Hello: String { return self._s[3339]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3340]! } + public var Channel_Stickers_Placeholder: String { return self._s[3342]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3342]!, self._r[3342]!, [_0]) + return formatWithArgumentRanges(self._s[3343]!, self._r[3343]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3343]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[3344]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3345]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3346]! } - public var AutoDownloadSettings_Channels: String { return self._s[3347]! } - public var Passport_Language_mn: String { return self._s[3348]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3351]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3352]! } - public var Passport_Language_ja: String { return self._s[3354]! } - public var Settings_About_Title: String { return self._s[3355]! } - public var Settings_NotificationsAndSounds: String { return self._s[3356]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3357]! } - public var Settings_BlockedUsers: String { return self._s[3358]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3344]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3345]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3346]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3347]! } + public var AutoDownloadSettings_Channels: String { return self._s[3348]! } + public var Passport_Language_mn: String { return self._s[3349]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3352]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3353]! } + public var Passport_Language_ja: String { return self._s[3355]! } + public var Settings_About_Title: String { return self._s[3356]! } + public var Settings_NotificationsAndSounds: String { return self._s[3357]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3358]! } + public var Settings_BlockedUsers: String { return self._s[3359]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3359]!, self._r[3359]!, [_0]) + return formatWithArgumentRanges(self._s[3360]!, self._r[3360]!, [_0]) } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3360]! } - public var Wallet_Weekday_Today: String { return self._s[3361]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3362]! } - public var Widget_ApplicationLocked: String { return self._s[3363]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3364]! } - public var Channel_Username_Title: String { return self._s[3365]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3361]! } + public var Wallet_Weekday_Today: String { return self._s[3362]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3363]! } + public var Widget_ApplicationLocked: String { return self._s[3364]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3365]! } + public var Channel_Username_Title: String { return self._s[3366]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3366]!, self._r[3366]!, [_0]) + return formatWithArgumentRanges(self._s[3367]!, self._r[3367]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3368]! } - public var AppleWatch_Title: String { return self._s[3369]! } - public var Activity_RecordingVideoMessage: String { return self._s[3370]! } + public var AttachmentMenu_File: String { return self._s[3369]! } + public var AppleWatch_Title: String { return self._s[3370]! } + public var Activity_RecordingVideoMessage: String { return self._s[3371]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3371]!, self._r[3371]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3372]!, self._r[3372]!, [_1, _2]) } - public var Theme_Colors_Messages: String { return self._s[3372]! } - public var Weekday_Saturday: String { return self._s[3373]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3374]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3375]! } - public var Common_Next: String { return self._s[3377]! } - public var Channel_Stickers_YourStickers: String { return self._s[3379]! } - public var Message_Theme: String { return self._s[3380]! } - public var Call_AudioRouteHeadphones: String { return self._s[3381]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3383]! } - public var Watch_Contacts_NoResults: String { return self._s[3385]! } - public var PhotoEditor_TintTool: String { return self._s[3388]! } - public var LoginPassword_ResetAccount: String { return self._s[3390]! } - public var Settings_SavedMessages: String { return self._s[3391]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3392]! } - public var Bot_GenericSupportStatus: String { return self._s[3393]! } - public var StickerPack_Add: String { return self._s[3394]! } - public var Checkout_TotalAmount: String { return self._s[3395]! } - public var Your_cards_number_is_invalid: String { return self._s[3396]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3397]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3398]! } + public var Theme_Colors_Messages: String { return self._s[3373]! } + public var Weekday_Saturday: String { return self._s[3374]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3375]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3376]! } + public var Common_Next: String { return self._s[3378]! } + public var Channel_Stickers_YourStickers: String { return self._s[3380]! } + public var Message_Theme: String { return self._s[3381]! } + public var Call_AudioRouteHeadphones: String { return self._s[3382]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3384]! } + public var Watch_Contacts_NoResults: String { return self._s[3386]! } + public var PhotoEditor_TintTool: String { return self._s[3389]! } + public var LoginPassword_ResetAccount: String { return self._s[3391]! } + public var Settings_SavedMessages: String { return self._s[3392]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3393]! } + public var Bot_GenericSupportStatus: String { return self._s[3394]! } + public var StickerPack_Add: String { return self._s[3395]! } + public var Checkout_TotalAmount: String { return self._s[3396]! } + public var Your_cards_number_is_invalid: String { return self._s[3397]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3398]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3399]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3399]!, self._r[3399]!, [_0]) + return formatWithArgumentRanges(self._s[3400]!, self._r[3400]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3400]!, self._r[3400]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3401]!, self._r[3401]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3401]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3402]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3403]!, self._r[3403]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3404]!, self._r[3404]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3404]!, self._r[3404]!, [_0]) + return formatWithArgumentRanges(self._s[3405]!, self._r[3405]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3405]! } - public var StickerPack_Share: String { return self._s[3406]! } - public var Passport_DeleteAddress: String { return self._s[3407]! } - public var Settings_Passport: String { return self._s[3408]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3409]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3410]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3411]! } - public var Contacts_PermissionsText: String { return self._s[3412]! } - public var Group_Setup_HistoryVisible: String { return self._s[3413]! } - public var Wallet_Month_ShortDecember: String { return self._s[3415]! } - public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3416]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3417]! } - public var SocksProxySetup_Title: String { return self._s[3418]! } - public var Notification_Mute1h: String { return self._s[3419]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3406]! } + public var StickerPack_Share: String { return self._s[3407]! } + public var Passport_DeleteAddress: String { return self._s[3408]! } + public var Settings_Passport: String { return self._s[3409]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3410]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3411]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3412]! } + public var Contacts_PermissionsText: String { return self._s[3413]! } + public var Group_Setup_HistoryVisible: String { return self._s[3414]! } + public var Wallet_Month_ShortDecember: String { return self._s[3416]! } + public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3417]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3418]! } + public var SocksProxySetup_Title: String { return self._s[3419]! } + public var Notification_Mute1h: String { return self._s[3420]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3420]!, self._r[3420]!, [_0]) + return formatWithArgumentRanges(self._s[3421]!, self._r[3421]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3421]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3422]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3422]!, self._r[3422]!, [_1]) + return formatWithArgumentRanges(self._s[3423]!, self._r[3423]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3423]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3426]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3428]! } - public var DialogList_NoMessagesText: String { return self._s[3429]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3430]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3431]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3433]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3434]! } - public var Common_TakePhotoOrVideo: String { return self._s[3435]! } - public var Wallet_Words_Text: String { return self._s[3436]! } - public var Call_StatusBusy: String { return self._s[3437]! } - public var Conversation_PinnedMessage: String { return self._s[3438]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3439]! } - public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3440]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3441]! } - public var Undo_ChatCleared: String { return self._s[3442]! } - public var AppleWatch_ReplyPresets: String { return self._s[3443]! } - public var Passport_DiscardMessageDescription: String { return self._s[3445]! } - public var Login_NetworkError: String { return self._s[3446]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3424]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3427]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3429]! } + public var DialogList_NoMessagesText: String { return self._s[3430]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3431]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3432]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3434]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3435]! } + public var Common_TakePhotoOrVideo: String { return self._s[3436]! } + public var Wallet_Words_Text: String { return self._s[3437]! } + public var Call_StatusBusy: String { return self._s[3438]! } + public var Conversation_PinnedMessage: String { return self._s[3439]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3440]! } + public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3441]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3442]! } + public var Undo_ChatCleared: String { return self._s[3443]! } + public var AppleWatch_ReplyPresets: String { return self._s[3444]! } + public var Passport_DiscardMessageDescription: String { return self._s[3446]! } + public var Login_NetworkError: String { return self._s[3447]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3447]!, self._r[3447]!, [_0]) - } - public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3448]!, self._r[3448]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3449]! } - public var Wallet_WordCheck_ViewWords: String { return self._s[3451]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3452]! } + public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3449]!, self._r[3449]!, [_0]) + } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3450]! } + public var Wallet_WordCheck_ViewWords: String { return self._s[3452]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3453]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3454]!, self._r[3454]!, [_0]) + return formatWithArgumentRanges(self._s[3455]!, self._r[3455]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[3455]! } - public var VoiceOver_Chat_Music: String { return self._s[3456]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3457]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3459]! } - public var ConversationMedia_Title: String { return self._s[3460]! } - public var EncryptionKey_Title: String { return self._s[3462]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3463]! } - public var Notification_Exceptions_AddException: String { return self._s[3464]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3465]! } - public var Profile_MessageLifetime1m: String { return self._s[3466]! } + public var Call_ConnectionErrorMessage: String { return self._s[3456]! } + public var VoiceOver_Chat_Music: String { return self._s[3457]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3458]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3460]! } + public var ConversationMedia_Title: String { return self._s[3461]! } + public var EncryptionKey_Title: String { return self._s[3463]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3464]! } + public var Notification_Exceptions_AddException: String { return self._s[3465]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3466]! } + public var Profile_MessageLifetime1m: String { return self._s[3467]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3467]!, self._r[3467]!, [_1]) + return formatWithArgumentRanges(self._s[3468]!, self._r[3468]!, [_1]) } - public var Month_GenMay: String { return self._s[3468]! } + public var Month_GenMay: String { return self._s[3469]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3469]!, self._r[3469]!, [_0]) + return formatWithArgumentRanges(self._s[3470]!, self._r[3470]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[3470]! } - public var Wallet_Send_AddressInfo: String { return self._s[3471]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3472]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3473]! } + public var PeopleNearby_Users: String { return self._s[3471]! } + public var Wallet_Send_AddressInfo: String { return self._s[3472]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3473]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3474]! } public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3475]!, self._r[3475]!, [_0]) + return formatWithArgumentRanges(self._s[3476]!, self._r[3476]!, [_0]) } - public var Conversation_EmptyPlaceholder: String { return self._s[3476]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3477]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3478]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3479]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3480]! } - public var Channel_JoinChannel: String { return self._s[3482]! } - public var Appearance_Animations: String { return self._s[3485]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3477]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3478]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3479]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3480]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3481]! } + public var Channel_JoinChannel: String { return self._s[3483]! } + public var Appearance_Animations: String { return self._s[3486]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3486]!, self._r[3486]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3487]!, self._r[3487]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[3488]! } - public var Appearance_ShareTheme: String { return self._s[3489]! } - public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3490]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3492]! } - public var Passport_Address_Street: String { return self._s[3493]! } - public var Conversation_AddContact: String { return self._s[3494]! } - public var Login_PhonePlaceholder: String { return self._s[3495]! } - public var Channel_Members_InviteLink: String { return self._s[3497]! } - public var Bot_Stop: String { return self._s[3498]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3500]! } - public var Notification_PassportValueAddress: String { return self._s[3501]! } - public var Month_ShortJuly: String { return self._s[3502]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3503]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3504]! } - public var Passport_Identity_ReverseSide: String { return self._s[3505]! } - public var Watch_Stickers_Recents: String { return self._s[3508]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3510]! } - public var Map_SendThisLocation: String { return self._s[3511]! } + public var Stickers_GroupStickers: String { return self._s[3489]! } + public var Appearance_ShareTheme: String { return self._s[3490]! } + public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3491]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3493]! } + public var Passport_Address_Street: String { return self._s[3494]! } + public var Conversation_AddContact: String { return self._s[3495]! } + public var Login_PhonePlaceholder: String { return self._s[3496]! } + public var Channel_Members_InviteLink: String { return self._s[3498]! } + public var Bot_Stop: String { return self._s[3499]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3501]! } + public var Notification_PassportValueAddress: String { return self._s[3502]! } + public var Month_ShortJuly: String { return self._s[3503]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3504]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3505]! } + public var Passport_Identity_ReverseSide: String { return self._s[3506]! } + public var Watch_Stickers_Recents: String { return self._s[3509]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3511]! } + public var Map_SendThisLocation: String { return self._s[3512]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3512]!, self._r[3512]!, [_0]) - } - public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3513]!, self._r[3513]!, [_0]) } - public var ConvertToSupergroup_Note: String { return self._s[3514]! } - public var Wallet_Intro_NotNow: String { return self._s[3515]! } + public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3514]!, self._r[3514]!, [_0]) + } + public var ConvertToSupergroup_Note: String { return self._s[3515]! } + public var Wallet_Intro_NotNow: String { return self._s[3516]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3516]!, self._r[3516]!, [_0]) + return formatWithArgumentRanges(self._s[3517]!, self._r[3517]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3517]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3518]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3518]!, self._r[3518]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3519]!, self._r[3519]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3520]! } - public var Wallpaper_SearchShort: String { return self._s[3521]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3523]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3524]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3525]! } + public var Login_CallRequestState3: String { return self._s[3521]! } + public var Wallpaper_SearchShort: String { return self._s[3522]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3524]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3525]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3526]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3526]!, self._r[3526]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3527]!, self._r[3527]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3527]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3531]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3528]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3532]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3532]!, self._r[3532]!, [_0]) + return formatWithArgumentRanges(self._s[3533]!, self._r[3533]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[3533]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3534]! } + public var Passport_CorrectErrors: String { return self._s[3534]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3535]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3535]!, self._r[3535]!, [_0]) + return formatWithArgumentRanges(self._s[3536]!, self._r[3536]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[3536]! } - public var Channel_DiscussionGroup: String { return self._s[3537]! } - public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3538]! } + public var Map_SendMyCurrentLocation: String { return self._s[3537]! } + public var Channel_DiscussionGroup: String { return self._s[3538]! } + public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3539]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3539]!, self._r[3539]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3540]!, self._r[3540]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[3540]! } - public var Permissions_NotificationsText_v0: String { return self._s[3541]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3542]! } - public var Appearance_AppIcon: String { return self._s[3543]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3544]! } - public var LoginPassword_FloodError: String { return self._s[3545]! } - public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3547]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3548]! } + public var SharedMedia_SearchNoResults: String { return self._s[3541]! } + public var Permissions_NotificationsText_v0: String { return self._s[3542]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3543]! } + public var Appearance_AppIcon: String { return self._s[3544]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3545]! } + public var LoginPassword_FloodError: String { return self._s[3546]! } + public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3548]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3549]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3549]!, self._r[3549]!, [_0]) + return formatWithArgumentRanges(self._s[3550]!, self._r[3550]!, [_0]) } - public var Passport_Language_bn: String { return self._s[3550]! } + public var Passport_Language_bn: String { return self._s[3551]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3551]!, self._r[3551]!, [_0]) + return formatWithArgumentRanges(self._s[3552]!, self._r[3552]!, [_0]) } - public var ChatList_Context_Pin: String { return self._s[3552]! } + public var ChatList_Context_Pin: String { return self._s[3553]! } public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3553]!, self._r[3553]!, [_0]) - } - public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3554]!, self._r[3554]!, [_0]) } - public var Wallet_Navigation_Close: String { return self._s[3555]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3559]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3561]! } - public var Wallet_Month_GenDecember: String { return self._s[3562]! } - public var Contacts_PermissionsAllow: String { return self._s[3563]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3564]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3565]! } - public var WallpaperPreview_Pattern: String { return self._s[3566]! } - public var Paint_Duplicate: String { return self._s[3567]! } - public var Passport_Address_Country: String { return self._s[3568]! } - public var Notification_RenamedChannel: String { return self._s[3570]! } - public var ChatList_Context_Unmute: String { return self._s[3571]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3572]! } - public var Group_MessagePhotoUpdated: String { return self._s[3573]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3574]! } - public var Conversation_ContextMenuBan: String { return self._s[3575]! } - public var TwoStepAuth_EmailSent: String { return self._s[3576]! } - public var MessagePoll_NoVotes: String { return self._s[3577]! } - public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3578]! } - public var Passport_Language_is: String { return self._s[3579]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3581]! } - public var Tour_Text5: String { return self._s[3582]! } + public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3555]!, self._r[3555]!, [_0]) + } + public var Wallet_Navigation_Close: String { return self._s[3556]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3560]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3562]! } + public var Wallet_Month_GenDecember: String { return self._s[3563]! } + public var Contacts_PermissionsAllow: String { return self._s[3564]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3565]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3566]! } + public var WallpaperPreview_Pattern: String { return self._s[3567]! } + public var Paint_Duplicate: String { return self._s[3568]! } + public var Passport_Address_Country: String { return self._s[3569]! } + public var Notification_RenamedChannel: String { return self._s[3571]! } + public var ChatList_Context_Unmute: String { return self._s[3572]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3573]! } + public var Group_MessagePhotoUpdated: String { return self._s[3574]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3575]! } + public var Conversation_ContextMenuBan: String { return self._s[3576]! } + public var TwoStepAuth_EmailSent: String { return self._s[3577]! } + public var MessagePoll_NoVotes: String { return self._s[3578]! } + public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3579]! } + public var Passport_Language_is: String { return self._s[3580]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3582]! } + public var Tour_Text5: String { return self._s[3583]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3584]!, self._r[3584]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3585]!, self._r[3585]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3585]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3586]! } + public var Undo_SecretChatDeleted: String { return self._s[3586]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3587]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3587]!, self._r[3587]!, [_0]) + return formatWithArgumentRanges(self._s[3588]!, self._r[3588]!, [_0]) } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3588]! } - public var Paint_Edit: String { return self._s[3590]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3592]! } - public var Undo_DeletedGroup: String { return self._s[3594]! } - public var LoginPassword_ForgotPassword: String { return self._s[3595]! } - public var Wallet_WordImport_IncorrectTitle: String { return self._s[3596]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3597]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3589]! } + public var Paint_Edit: String { return self._s[3591]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3593]! } + public var Undo_DeletedGroup: String { return self._s[3595]! } + public var LoginPassword_ForgotPassword: String { return self._s[3596]! } + public var Wallet_WordImport_IncorrectTitle: String { return self._s[3597]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3598]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3598]!, self._r[3598]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3599]!, self._r[3599]!, [_0, _1]) } - public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3599]! } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3600]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3601]! } - public var Passport_Language_uz: String { return self._s[3602]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3603]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3604]! } - public var Map_StopLiveLocation: String { return self._s[3606]! } - public var VoiceOver_MessageContextSend: String { return self._s[3608]! } - public var PasscodeSettings_Help: String { return self._s[3609]! } - public var NotificationsSound_Input: String { return self._s[3610]! } - public var Share_Title: String { return self._s[3613]! } - public var LogoutOptions_Title: String { return self._s[3614]! } - public var Wallet_Send_AddressText: String { return self._s[3615]! } - public var Login_TermsOfServiceAgree: String { return self._s[3616]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3617]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3618]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3619]! } - public var EnterPasscode_EnterTitle: String { return self._s[3620]! } + public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3600]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3601]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3602]! } + public var Passport_Language_uz: String { return self._s[3603]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3604]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3605]! } + public var Map_StopLiveLocation: String { return self._s[3607]! } + public var VoiceOver_MessageContextSend: String { return self._s[3609]! } + public var PasscodeSettings_Help: String { return self._s[3610]! } + public var NotificationsSound_Input: String { return self._s[3611]! } + public var Share_Title: String { return self._s[3614]! } + public var LogoutOptions_Title: String { return self._s[3615]! } + public var Wallet_Send_AddressText: String { return self._s[3616]! } + public var Login_TermsOfServiceAgree: String { return self._s[3617]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3618]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3619]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3620]! } + public var EnterPasscode_EnterTitle: String { return self._s[3621]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3621]!, self._r[3621]!, [_0]) + return formatWithArgumentRanges(self._s[3622]!, self._r[3622]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3622]! } - public var Conversation_AddToContacts: String { return self._s[3623]! } + public var Settings_CopyPhoneNumber: String { return self._s[3623]! } + public var Conversation_AddToContacts: String { return self._s[3624]! } public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3624]!, self._r[3624]!, [_0]) + return formatWithArgumentRanges(self._s[3625]!, self._r[3625]!, [_0]) } - public var NotificationsSound_Keys: String { return self._s[3625]! } + public var NotificationsSound_Keys: String { return self._s[3626]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3626]!, self._r[3626]!, [_0]) + return formatWithArgumentRanges(self._s[3627]!, self._r[3627]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3627]! } - public var Message_Video: String { return self._s[3628]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3629]! } + public var Notification_MessageLifetime1w: String { return self._s[3628]! } + public var Message_Video: String { return self._s[3629]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3630]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3630]!, self._r[3630]!, [_1]) + return formatWithArgumentRanges(self._s[3631]!, self._r[3631]!, [_1]) } - public var Wallet_Receive_AmountInfo: String { return self._s[3633]! } + public var Wallet_Receive_AmountInfo: String { return self._s[3634]! } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3634]!, self._r[3634]!, [_0]) - } - public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3635]!, self._r[3635]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3636]! } - public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3637]!, self._r[3637]!, [_1, _2, _3]) + public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3636]!, self._r[3636]!, [_0]) } - public var CreatePoll_CancelConfirmation: String { return self._s[3638]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3640]! } - public var PrivacyPolicy_Decline: String { return self._s[3641]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3642]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3643]! } - public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3644]! } - public var Permissions_SiriAllow_v0: String { return self._s[3646]! } - public var Wallet_Month_ShortAugust: String { return self._s[3647]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3648]! } + public var Passport_Language_mk: String { return self._s[3637]! } + public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3638]!, self._r[3638]!, [_1, _2, _3]) + } + public var CreatePoll_CancelConfirmation: String { return self._s[3639]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3641]! } + public var PrivacyPolicy_Decline: String { return self._s[3642]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3643]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3644]! } + public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3645]! } + public var Permissions_SiriAllow_v0: String { return self._s[3647]! } + public var Wallet_Month_ShortAugust: String { return self._s[3648]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3649]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3649]!, self._r[3649]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3650]!, self._r[3650]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3650]!, self._r[3650]!, [_0]) + return formatWithArgumentRanges(self._s[3651]!, self._r[3651]!, [_0]) } - public var Paint_Regular: String { return self._s[3651]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3652]! } - public var SocksProxySetup_ShareLink: String { return self._s[3653]! } - public var Wallet_Qr_Title: String { return self._s[3654]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3655]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3657]! } - public var Wallet_Settings_Configuration: String { return self._s[3658]! } - public var GroupInfo_InviteByLink: String { return self._s[3659]! } - public var MessageTimer_Custom: String { return self._s[3660]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3661]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3663]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3664]! } - public var VoiceOver_Chat_Selected: String { return self._s[3665]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3666]! } - public var Channel_Username_InvalidTaken: String { return self._s[3667]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3668]! } - public var Wallet_WordCheck_TryAgain: String { return self._s[3669]! } - public var Wallet_Info_TransactionPendingHeader: String { return self._s[3670]! } - public var Settings_ChatBackground: String { return self._s[3671]! } - public var Channel_Subscribers_Title: String { return self._s[3672]! } - public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3673]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3674]! } - public var Watch_ConnectionDescription: String { return self._s[3675]! } - public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3678]! } - public var IntentsSettings_SuggestBy: String { return self._s[3680]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3681]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3682]! } - public var Wallet_Send_TransactionInProgress: String { return self._s[3683]! } - public var EditProfile_Title: String { return self._s[3684]! } - public var NotificationsSound_Bamboo: String { return self._s[3686]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3688]! } - public var Login_SmsRequestState2: String { return self._s[3689]! } - public var Passport_Language_ar: String { return self._s[3690]! } + public var Paint_Regular: String { return self._s[3652]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3653]! } + public var SocksProxySetup_ShareLink: String { return self._s[3654]! } + public var Wallet_Qr_Title: String { return self._s[3655]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3656]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3658]! } + public var Wallet_Settings_Configuration: String { return self._s[3659]! } + public var GroupInfo_InviteByLink: String { return self._s[3660]! } + public var MessageTimer_Custom: String { return self._s[3661]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3662]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3664]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3665]! } + public var VoiceOver_Chat_Selected: String { return self._s[3666]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3667]! } + public var Channel_Username_InvalidTaken: String { return self._s[3668]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3669]! } + public var Wallet_WordCheck_TryAgain: String { return self._s[3670]! } + public var Wallet_Info_TransactionPendingHeader: String { return self._s[3671]! } + public var Settings_ChatBackground: String { return self._s[3672]! } + public var Channel_Subscribers_Title: String { return self._s[3673]! } + public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3674]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3675]! } + public var Watch_ConnectionDescription: String { return self._s[3676]! } + public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3679]! } + public var IntentsSettings_SuggestBy: String { return self._s[3681]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3682]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3683]! } + public var Wallet_Send_TransactionInProgress: String { return self._s[3684]! } + public var EditProfile_Title: String { return self._s[3685]! } + public var NotificationsSound_Bamboo: String { return self._s[3687]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3689]! } + public var Login_SmsRequestState2: String { return self._s[3690]! } + public var Passport_Language_ar: String { return self._s[3691]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3691]!, self._r[3691]!, [_0]) + return formatWithArgumentRanges(self._s[3692]!, self._r[3692]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3692]! } - public var Wallet_Created_Text: String { return self._s[3693]! } - public var Conversation_MessageDialogEdit: String { return self._s[3695]! } - public var Wallet_Created_Proceed: String { return self._s[3696]! } - public var Wallet_Words_Done: String { return self._s[3697]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3698]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3693]! } + public var Wallet_Created_Text: String { return self._s[3694]! } + public var Conversation_MessageDialogEdit: String { return self._s[3696]! } + public var Wallet_Created_Proceed: String { return self._s[3697]! } + public var Wallet_Words_Done: String { return self._s[3698]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3699]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3699]!, self._r[3699]!, [_1]) + return formatWithArgumentRanges(self._s[3700]!, self._r[3700]!, [_1]) } - public var Common_Close: String { return self._s[3700]! } - public var GroupInfo_PublicLink: String { return self._s[3701]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3702]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3703]! } + public var Common_Close: String { return self._s[3701]! } + public var GroupInfo_PublicLink: String { return self._s[3702]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3703]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3704]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3707]!, self._r[3707]!, [_0]) + return formatWithArgumentRanges(self._s[3708]!, self._r[3708]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3708]! } + public var UserInfo_About_Placeholder: String { return self._s[3709]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3709]!, self._r[3709]!, [_0]) + return formatWithArgumentRanges(self._s[3710]!, self._r[3710]!, [_0]) } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3710]! } - public var Channel_Info_Banned: String { return self._s[3712]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3711]! } + public var Channel_Info_Banned: String { return self._s[3713]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3713]!, self._r[3713]!, [_0]) + return formatWithArgumentRanges(self._s[3714]!, self._r[3714]!, [_0]) } - public var Appearance_Other: String { return self._s[3714]! } - public var Passport_Language_my: String { return self._s[3715]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3716]! } + public var Appearance_Other: String { return self._s[3715]! } + public var Passport_Language_my: String { return self._s[3716]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3717]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3717]!, self._r[3717]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3718]!, self._r[3718]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3718]! } - public var Preview_CopyAddress: String { return self._s[3719]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3719]! } + public var Preview_CopyAddress: String { return self._s[3720]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3720]!, self._r[3720]!, [_0]) + return formatWithArgumentRanges(self._s[3721]!, self._r[3721]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3721]! } - public var UserInfo_BotSettings: String { return self._s[3722]! } - public var LiveLocation_MenuStopAll: String { return self._s[3724]! } - public var Passport_PasswordCreate: String { return self._s[3725]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3726]! } - public var Message_PinnedLocationMessage: String { return self._s[3727]! } - public var Map_Satellite: String { return self._s[3728]! } - public var Watch_Message_Unsupported: String { return self._s[3729]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3730]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3731]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3722]! } + public var UserInfo_BotSettings: String { return self._s[3723]! } + public var LiveLocation_MenuStopAll: String { return self._s[3725]! } + public var Passport_PasswordCreate: String { return self._s[3726]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3727]! } + public var Message_PinnedLocationMessage: String { return self._s[3728]! } + public var Map_Satellite: String { return self._s[3729]! } + public var Watch_Message_Unsupported: String { return self._s[3730]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3731]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3732]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3732]!, self._r[3732]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3733]!, self._r[3733]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3733]!, self._r[3733]!, [_0]) + return formatWithArgumentRanges(self._s[3734]!, self._r[3734]!, [_0]) } - public var Wallet_WordImport_Continue: String { return self._s[3734]! } + public var Wallet_WordImport_Continue: String { return self._s[3735]! } public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3735]!, self._r[3735]!, [_0]) + return formatWithArgumentRanges(self._s[3736]!, self._r[3736]!, [_0]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3736]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3737]! } - public var NotificationsSound_None: String { return self._s[3738]! } - public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3739]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3741]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3742]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3737]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3738]! } + public var NotificationsSound_None: String { return self._s[3739]! } + public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3740]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3742]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3743]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3743]!, self._r[3743]!, [_1]) + return formatWithArgumentRanges(self._s[3744]!, self._r[3744]!, [_1]) } - public var Cache_Indexing: String { return self._s[3744]! } - public var DialogList_RecentTitlePeople: String { return self._s[3746]! } - public var DialogList_EncryptionRejected: String { return self._s[3747]! } - public var GroupInfo_Administrators: String { return self._s[3748]! } - public var Passport_ScanPassportHelp: String { return self._s[3749]! } - public var Application_Name: String { return self._s[3750]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3751]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3753]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3754]! } + public var Cache_Indexing: String { return self._s[3745]! } + public var DialogList_RecentTitlePeople: String { return self._s[3747]! } + public var DialogList_EncryptionRejected: String { return self._s[3748]! } + public var GroupInfo_Administrators: String { return self._s[3749]! } + public var Passport_ScanPassportHelp: String { return self._s[3750]! } + public var Application_Name: String { return self._s[3751]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3752]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3754]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3755]! } public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3755]!, self._r[3755]!, [_0]) - } - public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3756]!, self._r[3756]!, [_0]) } - public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { + public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3757]!, self._r[3757]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3758]! } - public var Privacy_ChatsTitle: String { return self._s[3759]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3760]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3761]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3762]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3763]! } - public var WebBrowser_Title: String { return self._s[3764]! } - public var Group_LinkedChannel: String { return self._s[3765]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3766]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3767]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3768]! } - public var Appearance_TextSize_UseSystem: String { return self._s[3769]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3770]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3772]! } - public var Channel_Setup_TypePublic: String { return self._s[3774]! } + public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3758]!, self._r[3758]!, [_0]) + } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3759]! } + public var Privacy_ChatsTitle: String { return self._s[3760]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3761]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3762]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3763]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3764]! } + public var WebBrowser_Title: String { return self._s[3765]! } + public var Group_LinkedChannel: String { return self._s[3766]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3767]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3768]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3769]! } + public var Appearance_TextSize_UseSystem: String { return self._s[3770]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3771]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3773]! } + public var Channel_Setup_TypePublic: String { return self._s[3775]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3775]!, self._r[3775]!, [_0]) + return formatWithArgumentRanges(self._s[3776]!, self._r[3776]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3777]! } - public var Map_OpenInMaps: String { return self._s[3779]! } + public var Channel_TypeSetup_Title: String { return self._s[3778]! } + public var Map_OpenInMaps: String { return self._s[3780]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3780]!, self._r[3780]!, [_1]) + return formatWithArgumentRanges(self._s[3781]!, self._r[3781]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3782]! } + public var NotificationsSound_Tremolo: String { return self._s[3783]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3783]!, self._r[3783]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3784]!, self._r[3784]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3784]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3785]! } - public var Passport_PasswordHelp: String { return self._s[3786]! } - public var Login_CodeExpiredError: String { return self._s[3787]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3788]! } - public var Conversation_TitleUnmute: String { return self._s[3789]! } - public var Passport_Identity_ScansHelp: String { return self._s[3790]! } - public var Passport_Language_lo: String { return self._s[3791]! } - public var Camera_FlashAuto: String { return self._s[3792]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3793]! } - public var Common_Cancel: String { return self._s[3794]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3795]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3796]! } - public var Appearance_TintAllColors: String { return self._s[3797]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3785]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3786]! } + public var Passport_PasswordHelp: String { return self._s[3787]! } + public var Login_CodeExpiredError: String { return self._s[3788]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3789]! } + public var Conversation_TitleUnmute: String { return self._s[3790]! } + public var Passport_Identity_ScansHelp: String { return self._s[3791]! } + public var Passport_Language_lo: String { return self._s[3792]! } + public var Camera_FlashAuto: String { return self._s[3793]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3794]! } + public var Common_Cancel: String { return self._s[3795]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3796]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3797]! } + public var Appearance_TintAllColors: String { return self._s[3798]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3798]!, self._r[3798]!, [_1]) + return formatWithArgumentRanges(self._s[3799]!, self._r[3799]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3799]! } - public var ChatSettings_Title: String { return self._s[3801]! } - public var Passport_PasswordReset: String { return self._s[3802]! } - public var SocksProxySetup_TypeNone: String { return self._s[3803]! } - public var EditTheme_Title: String { return self._s[3805]! } - public var PhoneNumberHelp_Help: String { return self._s[3806]! } - public var Checkout_EnterPassword: String { return self._s[3807]! } - public var Share_AuthTitle: String { return self._s[3809]! } - public var Activity_UploadingDocument: String { return self._s[3810]! } - public var State_Connecting: String { return self._s[3811]! } - public var Profile_MessageLifetime1w: String { return self._s[3812]! } - public var Conversation_ContextMenuReport: String { return self._s[3813]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3814]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3815]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3800]! } + public var ChatSettings_Title: String { return self._s[3802]! } + public var Passport_PasswordReset: String { return self._s[3803]! } + public var SocksProxySetup_TypeNone: String { return self._s[3804]! } + public var EditTheme_Title: String { return self._s[3806]! } + public var PhoneNumberHelp_Help: String { return self._s[3807]! } + public var Checkout_EnterPassword: String { return self._s[3808]! } + public var Share_AuthTitle: String { return self._s[3810]! } + public var Activity_UploadingDocument: String { return self._s[3811]! } + public var State_Connecting: String { return self._s[3812]! } + public var Profile_MessageLifetime1w: String { return self._s[3813]! } + public var Conversation_ContextMenuReport: String { return self._s[3814]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3815]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3816]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3816]!, self._r[3816]!, [_0]) + return formatWithArgumentRanges(self._s[3817]!, self._r[3817]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3817]! } - public var Wallet_WordImport_CanNotRemember: String { return self._s[3818]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3820]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3821]! } - public var PhotoEditor_Set: String { return self._s[3822]! } - public var EmptyGroupInfo_Title: String { return self._s[3823]! } - public var Login_PadPhoneHelp: String { return self._s[3824]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3826]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3828]! } - public var NotificationsSound_Complete: String { return self._s[3829]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3830]! } - public var Group_Info_AdminLog: String { return self._s[3831]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3832]! } + public var AuthSessions_Terminate: String { return self._s[3818]! } + public var Wallet_WordImport_CanNotRemember: String { return self._s[3819]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3821]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3822]! } + public var PhotoEditor_Set: String { return self._s[3823]! } + public var EmptyGroupInfo_Title: String { return self._s[3824]! } + public var Login_PadPhoneHelp: String { return self._s[3825]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3827]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3829]! } + public var NotificationsSound_Complete: String { return self._s[3830]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3831]! } + public var Group_Info_AdminLog: String { return self._s[3832]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3833]! } public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3833]!, self._r[3833]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_1, _2, _3]) } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3834]! } - public var Group_Location_CreateInThisPlace: String { return self._s[3836]! } - public var Conversation_Admin: String { return self._s[3837]! } - public var Conversation_GifTooltip: String { return self._s[3838]! } - public var Passport_NotLoggedInMessage: String { return self._s[3839]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3835]! } + public var Group_Location_CreateInThisPlace: String { return self._s[3837]! } + public var Conversation_Admin: String { return self._s[3838]! } + public var Conversation_GifTooltip: String { return self._s[3839]! } + public var Passport_NotLoggedInMessage: String { return self._s[3840]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3841]!, self._r[3841]!, [_0]) + return formatWithArgumentRanges(self._s[3842]!, self._r[3842]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3842]! } - public var SharedMedia_EmptyTitle: String { return self._s[3844]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3846]! } - public var Username_Help: String { return self._s[3847]! } - public var DialogList_LanguageTooltip: String { return self._s[3849]! } - public var Map_LoadError: String { return self._s[3850]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3851]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3852]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3853]! } - public var Notification_Exceptions_NewException: String { return self._s[3854]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3855]! } - public var WatchRemote_AlertText: String { return self._s[3856]! } + public var Profile_MessageLifetimeForever: String { return self._s[3843]! } + public var SharedMedia_EmptyTitle: String { return self._s[3845]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3847]! } + public var Username_Help: String { return self._s[3848]! } + public var DialogList_LanguageTooltip: String { return self._s[3850]! } + public var Map_LoadError: String { return self._s[3851]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3852]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3853]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3854]! } + public var Notification_Exceptions_NewException: String { return self._s[3855]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3856]! } + public var WatchRemote_AlertText: String { return self._s[3857]! } public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3857]!, self._r[3857]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3858]!, self._r[3858]!, [_1, _2, _3]) } - public var ChatSettings_ConnectionType_Title: String { return self._s[3861]! } - public var WebBrowser_DefaultBrowser: String { return self._s[3862]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3862]! } + public var WebBrowser_DefaultBrowser: String { return self._s[3863]! } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3863]!, self._r[3863]!, [_0]) + return formatWithArgumentRanges(self._s[3864]!, self._r[3864]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3864]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3865]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3865]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3866]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3866]!, self._r[3866]!, [_0]) + return formatWithArgumentRanges(self._s[3867]!, self._r[3867]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3867]!, self._r[3867]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3868]!, self._r[3868]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3868]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3869]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3871]! } - public var Wallet_Created_ExportErrorText: String { return self._s[3872]! } - public var ChatList_UndoArchiveText1: String { return self._s[3873]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3874]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3875]! } - public var Cache_ClearNone: String { return self._s[3876]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3877]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3878]! } + public var Group_AdminLog_EmptyText: String { return self._s[3869]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3870]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3872]! } + public var Wallet_Created_ExportErrorText: String { return self._s[3873]! } + public var ChatList_UndoArchiveText1: String { return self._s[3874]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3875]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3876]! } + public var Cache_ClearNone: String { return self._s[3877]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3878]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3879]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3879]!, self._r[3879]!, [_0]) + return formatWithArgumentRanges(self._s[3880]!, self._r[3880]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[3880]! } + public var Passport_Identity_Country: String { return self._s[3881]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3881]!, self._r[3881]!, [_0]) - } - public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3882]!, self._r[3882]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3883]! } - public var AccessDenied_Settings: String { return self._s[3884]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3885]! } - public var Month_ShortMay: String { return self._s[3886]! } - public var Compose_NewGroup: String { return self._s[3888]! } - public var Group_Setup_TypePrivate: String { return self._s[3890]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3892]! } - public var Appearance_ThemeDayClassic: String { return self._s[3893]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3894]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3895]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3896]! } - public var Conversation_typing: String { return self._s[3898]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[3899]! } - public var Paint_Masks: String { return self._s[3900]! } - public var Contacts_DeselectAll: String { return self._s[3901]! } - public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3902]!, self._r[3902]!, [_0]) + public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3883]!, self._r[3883]!, [_0]) } - public var Username_InvalidTaken: String { return self._s[3903]! } - public var Call_StatusNoAnswer: String { return self._s[3904]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3905]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3906]! } - public var Passport_Identity_Selfie: String { return self._s[3907]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3908]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3909]! } - public var Conversation_ClearSecretHistory: String { return self._s[3910]! } - public var PeopleNearby_Description: String { return self._s[3912]! } - public var NetworkUsageSettings_Title: String { return self._s[3913]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3915]! } + public var Exceptions_AddToExceptions: String { return self._s[3884]! } + public var AccessDenied_Settings: String { return self._s[3885]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3886]! } + public var Month_ShortMay: String { return self._s[3887]! } + public var Compose_NewGroup: String { return self._s[3889]! } + public var Group_Setup_TypePrivate: String { return self._s[3891]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3893]! } + public var Appearance_ThemeDayClassic: String { return self._s[3894]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3895]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3896]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3897]! } + public var Conversation_typing: String { return self._s[3899]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[3900]! } + public var Paint_Masks: String { return self._s[3901]! } + public var Contacts_DeselectAll: String { return self._s[3902]! } + public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3903]!, self._r[3903]!, [_0]) + } + public var Username_InvalidTaken: String { return self._s[3904]! } + public var Call_StatusNoAnswer: String { return self._s[3905]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[3906]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3907]! } + public var Passport_Identity_Selfie: String { return self._s[3908]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[3909]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3910]! } + public var Conversation_ClearSecretHistory: String { return self._s[3911]! } + public var PeopleNearby_Description: String { return self._s[3913]! } + public var NetworkUsageSettings_Title: String { return self._s[3914]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3916]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3917]!, self._r[3917]!, [_0]) + return formatWithArgumentRanges(self._s[3918]!, self._r[3918]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3918]!, self._r[3918]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3919]!, self._r[3919]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[3920]! } - public var VoiceOver_Navigation_Search: String { return self._s[3921]! } - public var Map_LiveLocationTitle: String { return self._s[3922]! } - public var Login_InfoAvatarAdd: String { return self._s[3923]! } - public var Passport_Identity_FilesView: String { return self._s[3924]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[3925]! } - public var Privacy_Calls_NeverAllow: String { return self._s[3926]! } - public var VoiceOver_Chat_File: String { return self._s[3927]! } - public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3928]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[3921]! } + public var VoiceOver_Navigation_Search: String { return self._s[3922]! } + public var Map_LiveLocationTitle: String { return self._s[3923]! } + public var Login_InfoAvatarAdd: String { return self._s[3924]! } + public var Passport_Identity_FilesView: String { return self._s[3925]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[3926]! } + public var Privacy_Calls_NeverAllow: String { return self._s[3927]! } + public var VoiceOver_Chat_File: String { return self._s[3928]! } + public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3929]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3929]!, self._r[3929]!, [_0]) + return formatWithArgumentRanges(self._s[3930]!, self._r[3930]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[3930]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[3931]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3932]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[3931]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[3932]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3933]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3933]!, self._r[3933]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3934]!, self._r[3934]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3934]! } - public var Wallet_Intro_CreateErrorText: String { return self._s[3935]! } - public var Tour_Title2: String { return self._s[3936]! } - public var Wallet_Sent_ViewWallet: String { return self._s[3937]! } - public var Conversation_FileOpenIn: String { return self._s[3938]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3939]! } - public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3940]! } - public var Wallpaper_Set: String { return self._s[3941]! } - public var Passport_Identity_Translations: String { return self._s[3943]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3935]! } + public var Wallet_Intro_CreateErrorText: String { return self._s[3936]! } + public var Tour_Title2: String { return self._s[3937]! } + public var Wallet_Sent_ViewWallet: String { return self._s[3938]! } + public var Conversation_FileOpenIn: String { return self._s[3939]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3940]! } + public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3941]! } + public var Wallpaper_Set: String { return self._s[3942]! } + public var Passport_Identity_Translations: String { return self._s[3944]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3944]!, self._r[3944]!, [_0]) + return formatWithArgumentRanges(self._s[3945]!, self._r[3945]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[3945]! } + public var Channel_LeaveChannel: String { return self._s[3946]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3946]!, self._r[3946]!, [_1]) + return formatWithArgumentRanges(self._s[3947]!, self._r[3947]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3948]! } - public var PhotoEditor_HighlightsTint: String { return self._s[3949]! } - public var Passport_Email_Delete: String { return self._s[3950]! } - public var Conversation_Mute: String { return self._s[3952]! } - public var Channel_AddBotAsAdmin: String { return self._s[3953]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[3955]! } - public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[3956]! } - public var ChatSettings_IntentsSettings: String { return self._s[3958]! } - public var Channel_Management_LabelOwner: String { return self._s[3959]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3949]! } + public var PhotoEditor_HighlightsTint: String { return self._s[3950]! } + public var Passport_Email_Delete: String { return self._s[3951]! } + public var Conversation_Mute: String { return self._s[3953]! } + public var Channel_AddBotAsAdmin: String { return self._s[3954]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[3956]! } + public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[3957]! } + public var ChatSettings_IntentsSettings: String { return self._s[3959]! } + public var Channel_Management_LabelOwner: String { return self._s[3960]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3960]!, self._r[3960]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3961]!, self._r[3961]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[3961]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[3962]! } - public var Common_No: String { return self._s[3963]! } - public var Weekday_Sunday: String { return self._s[3964]! } - public var Notification_Reply: String { return self._s[3965]! } - public var Conversation_ViewMessage: String { return self._s[3966]! } + public var Calls_CallTabDescription: String { return self._s[3962]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[3963]! } + public var Common_No: String { return self._s[3964]! } + public var Weekday_Sunday: String { return self._s[3965]! } + public var Notification_Reply: String { return self._s[3966]! } + public var Conversation_ViewMessage: String { return self._s[3967]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3967]!, self._r[3967]!, [_0]) - } - public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3968]!, self._r[3968]!, [_0]) } + public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3969]!, self._r[3969]!, [_0]) + } public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3969]!, self._r[3969]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3970]!, self._r[3970]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3970]! } - public var Wallet_Send_Title: String { return self._s[3971]! } - public var Message_PinnedDocumentMessage: String { return self._s[3972]! } - public var Wallet_Info_RefreshErrorText: String { return self._s[3973]! } - public var DialogList_TabTitle: String { return self._s[3975]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[3976]! } - public var Passport_FieldEmail: String { return self._s[3977]! } - public var Conversation_UnpinMessageAlert: String { return self._s[3978]! } - public var Passport_Address_TypeBankStatement: String { return self._s[3979]! } - public var Wallet_SecureStorageReset_Title: String { return self._s[3980]! } - public var Passport_Identity_ExpiryDate: String { return self._s[3981]! } - public var Privacy_Calls_P2P: String { return self._s[3982]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3971]! } + public var Wallet_Send_Title: String { return self._s[3972]! } + public var Message_PinnedDocumentMessage: String { return self._s[3973]! } + public var Wallet_Info_RefreshErrorText: String { return self._s[3974]! } + public var DialogList_TabTitle: String { return self._s[3976]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[3977]! } + public var Passport_FieldEmail: String { return self._s[3978]! } + public var Conversation_UnpinMessageAlert: String { return self._s[3979]! } + public var Passport_Address_TypeBankStatement: String { return self._s[3980]! } + public var Wallet_SecureStorageReset_Title: String { return self._s[3981]! } + public var Passport_Identity_ExpiryDate: String { return self._s[3982]! } + public var Privacy_Calls_P2P: String { return self._s[3983]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3984]!, self._r[3984]!, [_0]) + return formatWithArgumentRanges(self._s[3985]!, self._r[3985]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[3985]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[3986]! } public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3986]!, self._r[3986]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3987]!, self._r[3987]!, [_1, _2]) } - public var Stickers_ClearRecent: String { return self._s[3987]! } - public var EnterPasscode_ChangeTitle: String { return self._s[3988]! } - public var TwoFactorSetup_Email_Title: String { return self._s[3989]! } - public var Passport_InfoText: String { return self._s[3990]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3991]! } + public var Stickers_ClearRecent: String { return self._s[3988]! } + public var EnterPasscode_ChangeTitle: String { return self._s[3989]! } + public var TwoFactorSetup_Email_Title: String { return self._s[3990]! } + public var Passport_InfoText: String { return self._s[3991]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3992]! } public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3992]!, self._r[3992]!, [_0]) + return formatWithArgumentRanges(self._s[3993]!, self._r[3993]!, [_0]) } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3993]!, self._r[3993]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3994]!, self._r[3994]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3994]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[3995]! } - public var VoiceOver_Navigation_Compose: String { return self._s[3996]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[3997]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[3999]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4000]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3995]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[3996]! } + public var VoiceOver_Navigation_Compose: String { return self._s[3997]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[3998]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[4000]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4001]! } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4001]!, self._r[4001]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4002]!, self._r[4002]!, [_1, _2]) } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4003]! } - public var ChatSettings_OpenLinksIn: String { return self._s[4004]! } - public var Map_HomeAndWorkTitle: String { return self._s[4005]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4004]! } + public var ChatSettings_OpenLinksIn: String { return self._s[4005]! } + public var Map_HomeAndWorkTitle: String { return self._s[4006]! } public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4007]!, self._r[4007]!, [_0]) + return formatWithArgumentRanges(self._s[4008]!, self._r[4008]!, [_0]) } - public var DialogList_Unread: String { return self._s[4008]! } + public var DialogList_Unread: String { return self._s[4009]! } public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4009]!, self._r[4009]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4010]!, self._r[4010]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[4010]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4011]! } + public var User_DeletedAccount: String { return self._s[4011]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4012]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4012]!, self._r[4012]!, [_0]) + return formatWithArgumentRanges(self._s[4013]!, self._r[4013]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[4013]! } - public var SharedMedia_CategoryMedia: String { return self._s[4014]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4015]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4016]! } - public var Watch_ChatList_Compose: String { return self._s[4017]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4018]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[4019]! } - public var Watch_Microphone_Access: String { return self._s[4020]! } - public var Group_Setup_HistoryHeader: String { return self._s[4021]! } - public var Map_SetThisLocation: String { return self._s[4022]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4023]! } - public var Activity_UploadingPhoto: String { return self._s[4024]! } - public var Conversation_Edit: String { return self._s[4026]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[4027]! } - public var Login_TermsOfServiceDecline: String { return self._s[4028]! } - public var Message_PinnedContactMessage: String { return self._s[4029]! } + public var UserInfo_NotificationsDefault: String { return self._s[4014]! } + public var SharedMedia_CategoryMedia: String { return self._s[4015]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4016]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4017]! } + public var Watch_ChatList_Compose: String { return self._s[4018]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4019]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[4020]! } + public var Watch_Microphone_Access: String { return self._s[4021]! } + public var Group_Setup_HistoryHeader: String { return self._s[4022]! } + public var Map_SetThisLocation: String { return self._s[4023]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4024]! } + public var Activity_UploadingPhoto: String { return self._s[4025]! } + public var Conversation_Edit: String { return self._s[4027]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[4028]! } + public var Login_TermsOfServiceDecline: String { return self._s[4029]! } + public var Message_PinnedContactMessage: String { return self._s[4030]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4030]!, self._r[4030]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4031]!, self._r[4031]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4031]!, self._r[4031]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[4032]!, self._r[4032]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[4032]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[4034]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4035]! } + public var Appearance_LargeEmoji: String { return self._s[4033]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[4035]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4036]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4036]!, self._r[4036]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4037]!, self._r[4037]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[4037]! } - public var Message_PinnedPhotoMessage: String { return self._s[4038]! } - public var Passport_FieldPhone: String { return self._s[4039]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4040]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[4041]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[4043]! } - public var Conversation_Call: String { return self._s[4044]! } - public var Common_TakePhoto: String { return self._s[4046]! } - public var Group_EditAdmin_RankTitle: String { return self._s[4047]! } - public var Wallet_Receive_CommentHeader: String { return self._s[4048]! } - public var Channel_NotificationLoading: String { return self._s[4049]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[4038]! } + public var Message_PinnedPhotoMessage: String { return self._s[4039]! } + public var Passport_FieldPhone: String { return self._s[4040]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4041]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[4042]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[4044]! } + public var Conversation_Call: String { return self._s[4045]! } + public var Common_TakePhoto: String { return self._s[4047]! } + public var Group_EditAdmin_RankTitle: String { return self._s[4048]! } + public var Wallet_Receive_CommentHeader: String { return self._s[4049]! } + public var Channel_NotificationLoading: String { return self._s[4050]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4050]!, self._r[4050]!, [_0]) - } - public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4051]!, self._r[4051]!, [_0]) } + public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4052]!, self._r[4052]!, [_0]) + } public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4052]!, self._r[4052]!, [_1]) + return formatWithArgumentRanges(self._s[4053]!, self._r[4053]!, [_1]) } - public var Permissions_SiriTitle_v0: String { return self._s[4053]! } + public var Permissions_SiriTitle_v0: String { return self._s[4054]! } public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4054]!, self._r[4054]!, [_0]) - } - public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4055]!, self._r[4055]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[4056]! } - public var Wallet_Info_ReceiveGrams: String { return self._s[4057]! } - public var ClearCache_FreeSpace: String { return self._s[4058]! } - public var Common_edit: String { return self._s[4059]! } - public var PrivacySettings_AuthSessions: String { return self._s[4060]! } - public var Month_ShortJune: String { return self._s[4061]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4062]! } - public var Call_ReportSend: String { return self._s[4063]! } - public var Watch_LastSeen_JustNow: String { return self._s[4064]! } - public var Notifications_MessageNotifications: String { return self._s[4065]! } - public var WallpaperSearch_ColorGreen: String { return self._s[4066]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[4068]! } - public var Group_Status: String { return self._s[4069]! } + public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4056]!, self._r[4056]!, [_0]) + } + public var Channel_MessagePhotoRemoved: String { return self._s[4057]! } + public var Wallet_Info_ReceiveGrams: String { return self._s[4058]! } + public var ClearCache_FreeSpace: String { return self._s[4059]! } + public var Common_edit: String { return self._s[4060]! } + public var PrivacySettings_AuthSessions: String { return self._s[4061]! } + public var Month_ShortJune: String { return self._s[4062]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4063]! } + public var Call_ReportSend: String { return self._s[4064]! } + public var Watch_LastSeen_JustNow: String { return self._s[4065]! } + public var Notifications_MessageNotifications: String { return self._s[4066]! } + public var WallpaperSearch_ColorGreen: String { return self._s[4067]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[4069]! } + public var Group_Status: String { return self._s[4070]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4070]!, self._r[4070]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4071]!, self._r[4071]!, [_0, _1]) } - public var TextFormat_AddLinkTitle: String { return self._s[4071]! } - public var ShareMenu_ShareTo: String { return self._s[4072]! } - public var Conversation_Moderate_Ban: String { return self._s[4073]! } + public var TextFormat_AddLinkTitle: String { return self._s[4072]! } + public var ShareMenu_ShareTo: String { return self._s[4073]! } + public var Conversation_Moderate_Ban: String { return self._s[4074]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4074]!, self._r[4074]!, [_0]) + return formatWithArgumentRanges(self._s[4075]!, self._r[4075]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[4075]! } - public var Map_LiveLocationFor8Hours: String { return self._s[4076]! } + public var SharedMedia_ViewInChat: String { return self._s[4076]! } + public var Map_LiveLocationFor8Hours: String { return self._s[4077]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4077]!, self._r[4077]!, [_1]) + return formatWithArgumentRanges(self._s[4078]!, self._r[4078]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4078]!, self._r[4078]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4079]!, self._r[4079]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4080]!, self._r[4080]!, [_0]) + return formatWithArgumentRanges(self._s[4081]!, self._r[4081]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[4081]! } - public var Appearance_ReduceMotion: String { return self._s[4082]! } + public var Map_OpenInHereMaps: String { return self._s[4082]! } + public var Appearance_ReduceMotion: String { return self._s[4083]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4083]!, self._r[4083]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4084]!, self._r[4084]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[4084]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[4085]! } - public var PhotoEditor_Skip: String { return self._s[4086]! } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[4085]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[4086]! } + public var PhotoEditor_Skip: String { return self._s[4087]! } + public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, _1, _2) } - public func ChatList_DeletedChats(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, _1, _2) } - public func Media_ShareVideo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Minutes(_ value: Int32) -> String { + public func UserCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) } - public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) } - public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) } - public func ChatList_SelectedChats(_ value: Int32) -> String { + public func Conversation_StatusOnline(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) } - public func SharedMedia_File(_ value: Int32) -> String { + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notification_GameScoreSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { + public func MessageTimer_Years(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedVideos(_ value: Int32) -> String { + public func Conversation_StatusSubscribers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Theme_UsersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Contacts_ImportersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Generic(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortHours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Weeks(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Seconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_SharePhoto(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_UserInfo_Mute(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteFor_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedGifs(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_StickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) } public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + public func Contacts_ImportersCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddStickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareItem(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAudios(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MessagePoll_VotedCount(_ value: Int32) -> String { + public func Conversation_StatusMembers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_ShortSeconds(_ value: Int32) -> String { + public func ForwardedPhotos(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) } - public func SharedMedia_Photo(_ value: Int32) -> String { + public func MessageTimer_Weeks(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedPolls(_ value: Int32) -> String { + public func SharedMedia_File(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) } - public func MuteExpires_Minutes(_ value: Int32) -> String { + public func StickerPack_AddMaskCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) } public func SharedMedia_Video(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) } public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessageTimer_Hours(_ value: Int32) -> String { + public func Call_Minutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + public func AttachmentMenu_SendGif(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) } public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func ForwardedLocations(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedGifs(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedStickers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Months(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) + } + public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedVideoMessages(_ value: Int32) -> String { + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notifications_Exceptions(_ value: Int32) -> String { + public func Map_ETAMinutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_SelectedMessages(_ value: Int32) -> String { + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedStickers(_ value: Int32) -> String { + public func SharedMedia_Generic(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) @@ -4888,264 +4890,264 @@ public final class PresentationStrings: Equatable { let form = getPluralizationForm(self.lc, selector) return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, _1, _2) } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { + public func LastSeen_HoursAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + public func SharedMedia_Link(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) } - public func UserCount(_ value: Int32) -> String { + public func Passport_Scans(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MuteExpires_Hours(_ value: Int32) -> String { + public func ForwardedFiles(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) } - public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func ForwardedMessages(_ value: Int32) -> String { + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) } - public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String { + public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) } - public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortDays(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Call_ShortMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortWeeks(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Months(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func StickerPack_AddStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendVideo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Seconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_Link(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func InviteText_ContactsCountText(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPhotos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusOnline(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedLocations(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAudios(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, _2, _1, _3) } public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + public func MessageTimer_ShortHours(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_StatusMembers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) - } - public func QuickSend_Photos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Years(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Invitation_Members(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareItem(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, _1, _2) } - public func AttachmentMenu_SendGif(_ value: Int32) -> String { + public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_StickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Call_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) } public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareVideo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendItem(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeletedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_SharePhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPolls(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessagePoll_VotedCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessageTimer_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) + } + public func QuickSend_Photos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Invitation_Members(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_SelectedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Theme_UsersCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideoMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedContacts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + } + public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + public func ForwardedMessages(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue) @@ -5155,47 +5157,46 @@ public final class PresentationStrings: Equatable { let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) } - public func Map_ETAHours(_ value: Int32) -> String { + public func LastSeen_MinutesAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) } - public func Map_ETAMinutes(_ value: Int32) -> String { + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue) } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { + public func MessageTimer_Hours(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue) } - public func MuteFor_Days(_ value: Int32) -> String { + public func MessageTimer_ShortDays(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue) } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { + public func Notifications_Exceptions(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedFiles(_ value: Int32) -> String { + public func Conversation_SelectedMessages(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue) } - public func Passport_Scans(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, stringValue) + public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, _1, _2) } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + public func Call_ShortSeconds(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue) diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Tip.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Tip.imageset/Contents.json new file mode 100644 index 0000000000..8a66114530 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Tip.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_lamp.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Tip.imageset/ic_lamp.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Tip.imageset/ic_lamp.pdf new file mode 100644 index 0000000000..4b286ac00c Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Tip.imageset/ic_lamp.pdf differ diff --git a/submodules/TelegramUI/TelegramUI/ChatButtonKeyboardInputNode.swift b/submodules/TelegramUI/TelegramUI/ChatButtonKeyboardInputNode.swift index 8bb088f540..eb746e1e21 100644 --- a/submodules/TelegramUI/TelegramUI/ChatButtonKeyboardInputNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatButtonKeyboardInputNode.swift @@ -162,9 +162,11 @@ final class ChatButtonKeyboardInputNode: ChatInputNode { @objc func buttonPressed(_ button: ASButtonNode) { if let button = button as? ChatButtonKeyboardInputButtonNode, let markupButton = button.button { + var dismissIfOnce = false switch markupButton.action { case .text: self.controllerInteraction.sendMessage(markupButton.title) + dismissIfOnce = true case let .url(url): self.controllerInteraction.openUrl(url, true, nil, nil) case .requestMap: @@ -209,6 +211,18 @@ final class ChatButtonKeyboardInputNode: ChatInputNode { self.controllerInteraction.requestMessageActionUrlAuth(url, message.id, buttonId) } } + if dismissIfOnce { + if let message = self.message { + for attribute in message.attributes { + if let attribute = attribute as? ReplyMarkupMessageAttribute { + if attribute.flags.contains(.once) { + self.controllerInteraction.dismissReplyMarkupMessage(message) + } + break + } + } + } + } } } } diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 2a966570d8..2036f5b7bf 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -561,7 +561,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G break } } - let _ = combineLatest(queue: .mainQueue(), contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState: strongSelf.presentationInterfaceState, context: strongSelf.context, messages: updatedMessages, controllerInteraction: strongSelf.controllerInteraction, selectAll: selectAll, interfaceInteraction: strongSelf.interfaceInteraction), loadedStickerPack(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, reference: .animatedEmoji, forceActualized: false)).start(next: { actions, animatedEmojiStickers in + let _ = combineLatest(queue: .mainQueue(), contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState: strongSelf.presentationInterfaceState, context: strongSelf.context, messages: updatedMessages, controllerInteraction: strongSelf.controllerInteraction, selectAll: selectAll, interfaceInteraction: strongSelf.interfaceInteraction), loadedStickerPack(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, reference: .animatedEmoji, forceActualized: false), ApplicationSpecificNotice.getChatTextSelectionTips(accountManager: strongSelf.context.sharedContext.accountManager) + ).start(next: { actions, animatedEmojiStickers, chatTextSelectionTips in guard let strongSelf = self, !actions.isEmpty else { return } @@ -590,7 +591,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if Namespaces.Message.allScheduled.contains(message.id.namespace) { reactionItems = [] } - let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: message)), items: .single(actions), reactionItems: reactionItems, recognizer: recognizer) + + let displayTextSelectionTip = !message.text.isEmpty && chatTextSelectionTips < 3 + if displayTextSelectionTip { + let _ = ApplicationSpecificNotice.incrementChatTextSelectionTips(accountManager: strongSelf.context.sharedContext.accountManager).start() + } + + let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: message)), items: .single(actions), reactionItems: reactionItems, recognizer: recognizer, displayTextSelectionTip: displayTextSelectionTip) strongSelf.currentContextController = controller controller.reactionSelected = { [weak controller] value in guard let strongSelf = self, let message = updatedMessages.first else { @@ -1721,6 +1728,19 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let strongSelf = self, let validLayout = strongSelf.validLayout, min(validLayout.size.width, validLayout.size.height) > 320.0 { strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .swipeToReply(title: strongSelf.presentationData.strings.Conversation_SwipeToReplyHintTitle, text: strongSelf.presentationData.strings.Conversation_SwipeToReplyHintText), elevatedLayout: true, action: { _ in }), in: .window(.root)) } + }, dismissReplyMarkupMessage: { [weak self] message in + guard let strongSelf = self, strongSelf.presentationInterfaceState.keyboardButtonsMessage?.id == message.id else { + return + } + strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { + return $0.updatedInputMode({ _ in .text }).updatedInterfaceState({ + $0.withUpdatedMessageActionsState({ value in + var value = value + value.closedButtonKeyboardMessageId = message.id + return value + }) + }) + }) }, requestMessageUpdate: { [weak self] id in if let strongSelf = self { strongSelf.chatDisplayNode.historyNode.requestMessageUpdate(id) diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift b/submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift index cd1d8b5424..c105e47ee5 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerInteraction.swift @@ -101,6 +101,7 @@ public final class ChatControllerInteraction { let updateMessageReaction: (MessageId, String?) -> Void let openMessageReactions: (MessageId) -> Void let displaySwipeToReplyHint: () -> Void + let dismissReplyMarkupMessage: (Message) -> Void let requestMessageUpdate: (MessageId) -> Void let cancelInteractiveKeyboardGestures: () -> Void @@ -115,7 +116,7 @@ public final class ChatControllerInteraction { var searchTextHighightState: (String, [MessageIndex])? var seenOneTimeAnimatedMedia = Set() - init(openMessage: @escaping (Message, ChatControllerInteractionOpenMessageMode) -> Bool, openPeer: @escaping (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void, openPeerMention: @escaping (String) -> Void, openMessageContextMenu: @escaping (Message, Bool, ASDisplayNode, CGRect, TapLongTapOrDoubleTapGestureRecognizer?) -> Void, openMessageContextActions: @escaping (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void, navigateToMessage: @escaping (MessageId, MessageId) -> Void, clickThroughMessage: @escaping () -> Void, toggleMessagesSelection: @escaping ([MessageId], Bool) -> Void, sendCurrentMessage: @escaping (Bool) -> Void, sendMessage: @escaping (String) -> Void, sendSticker: @escaping (FileMediaReference, Bool, ASDisplayNode, CGRect) -> Bool, sendGif: @escaping (FileMediaReference, ASDisplayNode, CGRect) -> Bool, requestMessageActionCallback: @escaping (MessageId, MemoryBuffer?, Bool) -> Void, requestMessageActionUrlAuth: @escaping (String, MessageId, Int32) -> Void, activateSwitchInline: @escaping (PeerId?, String) -> Void, openUrl: @escaping (String, Bool, Bool?, Message?) -> Void, shareCurrentLocation: @escaping () -> Void, shareAccountContact: @escaping () -> Void, sendBotCommand: @escaping (MessageId?, String) -> Void, openInstantPage: @escaping (Message, ChatMessageItemAssociatedData?) -> Void, openWallpaper: @escaping (Message) -> Void, openTheme: @escaping (Message) -> Void, openHashtag: @escaping (String?, String) -> Void, updateInputState: @escaping ((ChatTextInputState) -> ChatTextInputState) -> Void, updateInputMode: @escaping ((ChatInputMode) -> ChatInputMode) -> Void, openMessageShareMenu: @escaping (MessageId) -> Void, presentController: @escaping (ViewController, Any?) -> Void, navigationController: @escaping () -> NavigationController?, chatControllerNode: @escaping () -> ASDisplayNode?, reactionContainerNode: @escaping () -> ReactionSelectionParentNode?, presentGlobalOverlayController: @escaping (ViewController, Any?) -> Void, callPeer: @escaping (PeerId) -> Void, longTap: @escaping (ChatControllerInteractionLongTapAction, Message?) -> Void, openCheckoutOrReceipt: @escaping (MessageId) -> Void, openSearch: @escaping () -> Void, setupReply: @escaping (MessageId) -> Void, canSetupReply: @escaping (Message) -> Bool, navigateToFirstDateMessage: @escaping(Int32) ->Void, requestRedeliveryOfFailedMessages: @escaping (MessageId) -> Void, addContact: @escaping (String) -> Void, rateCall: @escaping (Message, CallId) -> Void, requestSelectMessagePollOption: @escaping (MessageId, Data) -> Void, openAppStorePage: @escaping () -> Void, displayMessageTooltip: @escaping (MessageId, String, ASDisplayNode?, CGRect?) -> Void, seekToTimecode: @escaping (Message, Double, Bool) -> Void, scheduleCurrentMessage: @escaping () -> Void, sendScheduledMessagesNow: @escaping ([MessageId]) -> Void, editScheduledMessagesTime: @escaping ([MessageId]) -> Void, performTextSelectionAction: @escaping (UInt32, String, TextSelectionAction) -> Void, updateMessageReaction: @escaping (MessageId, String?) -> Void, openMessageReactions: @escaping (MessageId) -> Void, displaySwipeToReplyHint: @escaping () -> Void, requestMessageUpdate: @escaping (MessageId) -> Void, cancelInteractiveKeyboardGestures: @escaping () -> Void, automaticMediaDownloadSettings: MediaAutoDownloadSettings, pollActionState: ChatInterfacePollActionState, stickerSettings: ChatInterfaceStickerSettings) { + init(openMessage: @escaping (Message, ChatControllerInteractionOpenMessageMode) -> Bool, openPeer: @escaping (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void, openPeerMention: @escaping (String) -> Void, openMessageContextMenu: @escaping (Message, Bool, ASDisplayNode, CGRect, TapLongTapOrDoubleTapGestureRecognizer?) -> Void, openMessageContextActions: @escaping (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void, navigateToMessage: @escaping (MessageId, MessageId) -> Void, clickThroughMessage: @escaping () -> Void, toggleMessagesSelection: @escaping ([MessageId], Bool) -> Void, sendCurrentMessage: @escaping (Bool) -> Void, sendMessage: @escaping (String) -> Void, sendSticker: @escaping (FileMediaReference, Bool, ASDisplayNode, CGRect) -> Bool, sendGif: @escaping (FileMediaReference, ASDisplayNode, CGRect) -> Bool, requestMessageActionCallback: @escaping (MessageId, MemoryBuffer?, Bool) -> Void, requestMessageActionUrlAuth: @escaping (String, MessageId, Int32) -> Void, activateSwitchInline: @escaping (PeerId?, String) -> Void, openUrl: @escaping (String, Bool, Bool?) -> Void, shareCurrentLocation: @escaping () -> Void, shareAccountContact: @escaping () -> Void, sendBotCommand: @escaping (MessageId?, String) -> Void, openInstantPage: @escaping (Message, ChatMessageItemAssociatedData?) -> Void, openWallpaper: @escaping (Message) -> Void, openTheme: @escaping (Message) -> Void, openHashtag: @escaping (String?, String) -> Void, updateInputState: @escaping ((ChatTextInputState) -> ChatTextInputState) -> Void, updateInputMode: @escaping ((ChatInputMode) -> ChatInputMode) -> Void, openMessageShareMenu: @escaping (MessageId) -> Void, presentController: @escaping (ViewController, Any?) -> Void, navigationController: @escaping () -> NavigationController?, chatControllerNode: @escaping () -> ASDisplayNode?, reactionContainerNode: @escaping () -> ReactionSelectionParentNode?, presentGlobalOverlayController: @escaping (ViewController, Any?) -> Void, callPeer: @escaping (PeerId) -> Void, longTap: @escaping (ChatControllerInteractionLongTapAction, Message?) -> Void, openCheckoutOrReceipt: @escaping (MessageId) -> Void, openSearch: @escaping () -> Void, setupReply: @escaping (MessageId) -> Void, canSetupReply: @escaping (Message) -> Bool, navigateToFirstDateMessage: @escaping(Int32) ->Void, requestRedeliveryOfFailedMessages: @escaping (MessageId) -> Void, addContact: @escaping (String) -> Void, rateCall: @escaping (Message, CallId) -> Void, requestSelectMessagePollOption: @escaping (MessageId, Data) -> Void, openAppStorePage: @escaping () -> Void, displayMessageTooltip: @escaping (MessageId, String, ASDisplayNode?, CGRect?) -> Void, seekToTimecode: @escaping (Message, Double, Bool) -> Void, scheduleCurrentMessage: @escaping () -> Void, sendScheduledMessagesNow: @escaping ([MessageId]) -> Void, editScheduledMessagesTime: @escaping ([MessageId]) -> Void, performTextSelectionAction: @escaping (UInt32, String, TextSelectionAction) -> Void, updateMessageReaction: @escaping (MessageId, String?) -> Void, openMessageReactions: @escaping (MessageId) -> Void, displaySwipeToReplyHint: @escaping () -> Void, dismissReplyMarkupMessage: @escaping (Message) -> Void, requestMessageUpdate: @escaping (MessageId) -> Void, cancelInteractiveKeyboardGestures: @escaping () -> Void, automaticMediaDownloadSettings: MediaAutoDownloadSettings, pollActionState: ChatInterfacePollActionState, stickerSettings: ChatInterfaceStickerSettings) { self.openMessage = openMessage self.openPeer = openPeer self.openPeerMention = openPeerMention @@ -168,6 +169,7 @@ public final class ChatControllerInteraction { self.updateMessageReaction = updateMessageReaction self.openMessageReactions = openMessageReactions self.displaySwipeToReplyHint = displaySwipeToReplyHint + self.dismissReplyMarkupMessage = dismissReplyMarkupMessage self.requestMessageUpdate = requestMessageUpdate self.cancelInteractiveKeyboardGestures = cancelInteractiveKeyboardGestures @@ -205,6 +207,7 @@ public final class ChatControllerInteraction { }, updateMessageReaction: { _, _ in }, openMessageReactions: { _ in }, displaySwipeToReplyHint: { + }, dismissReplyMarkupMessage: { _ in }, requestMessageUpdate: { _ in }, cancelInteractiveKeyboardGestures: { }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings, diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift index 0541115ec1..747ef6ada8 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift @@ -7,6 +7,7 @@ import AsyncDisplayKit import TelegramCore import SyncCore import TelegramPresentationData +import TelegramUIPreferences import AccountContext private class ChatGridLiveSelectorRecognizer: UIPanGestureRecognizer { @@ -73,11 +74,11 @@ struct ChatHistoryGridViewTransition { let stationaryItems: GridNodeStationaryItems } -private func mappedInsertEntries(context: AccountContext, peerId: PeerId, controllerInteraction: ChatControllerInteraction, entries: [ChatHistoryViewTransitionInsertEntry], theme: PresentationTheme, strings: PresentationStrings) -> [GridNodeInsertItem] { +private func mappedInsertEntries(context: AccountContext, peerId: PeerId, controllerInteraction: ChatControllerInteraction, entries: [ChatHistoryViewTransitionInsertEntry], theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) -> [GridNodeInsertItem] { return entries.map { entry -> GridNodeInsertItem in switch entry.entry { case let .MessageEntry(message, _, _, _, _, _): - return GridNodeInsertItem(index: entry.index, item: GridMessageItem(theme: theme, strings: strings, context: context, message: message, controllerInteraction: controllerInteraction), previousIndex: entry.previousIndex) + return GridNodeInsertItem(index: entry.index, item: GridMessageItem(theme: theme, strings: strings, fontSize: fontSize, context: context, message: message, controllerInteraction: controllerInteraction), previousIndex: entry.previousIndex) case .MessageGroupEntry: return GridNodeInsertItem(index: entry.index, item: GridHoleItem(), previousIndex: entry.previousIndex) case .UnreadEntry: @@ -90,11 +91,11 @@ private func mappedInsertEntries(context: AccountContext, peerId: PeerId, contro } } -private func mappedUpdateEntries(context: AccountContext, peerId: PeerId, controllerInteraction: ChatControllerInteraction, entries: [ChatHistoryViewTransitionUpdateEntry], theme: PresentationTheme, strings: PresentationStrings) -> [GridNodeUpdateItem] { +private func mappedUpdateEntries(context: AccountContext, peerId: PeerId, controllerInteraction: ChatControllerInteraction, entries: [ChatHistoryViewTransitionUpdateEntry], theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) -> [GridNodeUpdateItem] { return entries.map { entry -> GridNodeUpdateItem in switch entry.entry { case let .MessageEntry(message, _, _, _, _, _): - return GridNodeUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: GridMessageItem(theme: theme, strings: strings, context: context, message: message, controllerInteraction: controllerInteraction)) + return GridNodeUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: GridMessageItem(theme: theme, strings: strings, fontSize: fontSize, context: context, message: message, controllerInteraction: controllerInteraction)) case .MessageGroupEntry: return GridNodeUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: GridHoleItem()) case .UnreadEntry: @@ -189,7 +190,7 @@ private func mappedChatHistoryViewListTransition(context: AccountContext, peerId } } - return ChatHistoryGridViewTransition(historyView: transition.historyView, topOffsetWithinMonth: topOffsetWithinMonth, deleteItems: transition.deleteItems.map { $0.index }, insertItems: mappedInsertEntries(context: context, peerId: peerId, controllerInteraction: controllerInteraction, entries: transition.insertEntries, theme: presentationData.theme.theme, strings: presentationData.strings), updateItems: mappedUpdateEntries(context: context, peerId: peerId, controllerInteraction: controllerInteraction, entries: transition.updateEntries, theme: presentationData.theme.theme, strings: presentationData.strings), scrollToItem: mappedScrollToItem, stationaryItems: stationaryItems) + return ChatHistoryGridViewTransition(historyView: transition.historyView, topOffsetWithinMonth: topOffsetWithinMonth, deleteItems: transition.deleteItems.map { $0.index }, insertItems: mappedInsertEntries(context: context, peerId: peerId, controllerInteraction: controllerInteraction, entries: transition.insertEntries, theme: presentationData.theme.theme, strings: presentationData.strings, fontSize: presentationData.fontSize), updateItems: mappedUpdateEntries(context: context, peerId: peerId, controllerInteraction: controllerInteraction, entries: transition.updateEntries, theme: presentationData.theme.theme, strings: presentationData.strings, fontSize: presentationData.fontSize), scrollToItem: mappedScrollToItem, stationaryItems: stationaryItems) } private func gridNodeLayoutForContainerLayout(size: CGSize) -> GridNodeLayoutType { diff --git a/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift index db70caeb37..60c68d88c1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInputContextPanelNode.swift @@ -5,6 +5,7 @@ import Display import TelegramCore import SyncCore import TelegramPresentationData +import TelegramUIPreferences import AccountContext enum ChatInputContextPanelPlacement { @@ -17,10 +18,12 @@ class ChatInputContextPanelNode: ASDisplayNode { var interfaceInteraction: ChatPanelInterfaceInteraction? var placement: ChatInputContextPanelPlacement = .overPanels var theme: PresentationTheme + var fontSize: PresentationFontSize - init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.context = context self.theme = theme + self.fontSize = fontSize super.init() } diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceInputContextPanels.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceInputContextPanels.swift index 56b2bd8bca..470d350837 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceInputContextPanels.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceInputContextPanels.swift @@ -59,7 +59,7 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa if let currentPanel = currentPanel as? DisabledContextResultsChatInputContextPanelNode { return currentPanel } else { - let panel = DisabledContextResultsChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) + let panel = DisabledContextResultsChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize) panel.interfaceInteraction = interfaceInteraction return panel } @@ -75,7 +75,7 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa currentPanel.updateResults(results.map({ $0.file })) return currentPanel } else { - let panel = HorizontalStickersChatContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) + let panel = HorizontalStickersChatContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize) panel.controllerInteraction = controllerInteraction panel.interfaceInteraction = interfaceInteraction panel.updateResults(results.map({ $0.file })) @@ -88,7 +88,7 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa currentPanel.updateResults(results) return currentPanel } else { - let panel = HashtagChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) + let panel = HashtagChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize) panel.interfaceInteraction = interfaceInteraction panel.updateResults(results) return panel @@ -100,7 +100,7 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa currentPanel.updateResults(results) return currentPanel } else { - let panel = EmojisChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) + let panel = EmojisChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize) panel.interfaceInteraction = interfaceInteraction panel.updateResults(results) return panel @@ -112,7 +112,7 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa currentPanel.updateResults(peers) return currentPanel } else { - let panel = MentionChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, mode: .input) + let panel = MentionChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize, mode: .input) panel.interfaceInteraction = interfaceInteraction panel.updateResults(peers) return panel @@ -126,7 +126,7 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa currentPanel.updateResults(commands) return currentPanel } else { - let panel = CommandChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) + let panel = CommandChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize) panel.interfaceInteraction = interfaceInteraction panel.updateResults(commands) return panel @@ -142,7 +142,7 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa currentPanel.updateResults(results) return currentPanel } else { - let panel = VerticalListContextResultsChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) + let panel = VerticalListContextResultsChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize) panel.interfaceInteraction = interfaceInteraction panel.updateResults(results) return panel @@ -152,7 +152,7 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa currentPanel.updateResults(results) return currentPanel } else { - let panel = HorizontalListContextResultsChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings) + let panel = HorizontalListContextResultsChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize) panel.interfaceInteraction = interfaceInteraction panel.updateResults(results) return panel @@ -178,7 +178,7 @@ func chatOverlayContextPanelForChatPresentationIntefaceState(_ chatPresentationI currentPanel.updateResults(peers) return currentPanel } else { - let panel = MentionChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, mode: .search) + let panel = MentionChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize, mode: .search) panel.interfaceInteraction = interfaceInteraction panel.updateResults(peers) return panel diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift index 7994d97c62..13f6f2f3aa 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift @@ -417,6 +417,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { }, updateMessageReaction: { _, _ in }, openMessageReactions: { _ in }, displaySwipeToReplyHint: { + }, dismissReplyMarkupMessage: { _ in }, requestMessageUpdate: { _ in }, cancelInteractiveKeyboardGestures: { }, automaticMediaDownloadSettings: self.automaticMediaDownloadSettings, diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchResultsContollerNode.swift b/submodules/TelegramUI/TelegramUI/ChatSearchResultsContollerNode.swift index 0a64d185cb..e8c1df5a77 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSearchResultsContollerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSearchResultsContollerNode.swift @@ -11,6 +11,7 @@ import TelegramStringFormatting import MergeLists import ChatListUI import AccountContext +import ContextUI private enum ChatListSearchEntryStableId: Hashable { case messageId(MessageId) @@ -76,7 +77,7 @@ private enum ChatListSearchEntry: Comparable, Identifiable { public func item(context: AccountContext, interaction: ChatListNodeInteraction) -> ListViewItem { switch self { case let .message(message, peer, readState, presentationData): - return ChatListItem(presentationData: presentationData, context: context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: message.index), content: .peer(message: message, peer: peer, combinedReadState: readState, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: true, displayAsMessage: true), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction) + return ChatListItem(presentationData: presentationData, context: context, peerGroupId: .root, index: ChatListIndex(pinningIndex: nil, messageIndex: message.index), content: .peer(message: message, peer: peer, combinedReadState: readState, notificationSettings: nil, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), embeddedState: nil, inputActivities: nil, isAd: false, ignoreUnreadBadge: true, displayAsMessage: true, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: nil, enableContextActions: false, hiddenOffset: false, interaction: interaction) } } } @@ -129,7 +130,7 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe private let previousEntries = Atomic<[ChatListSearchEntry]?>(value: nil) - init(context: AccountContext, location: SearchMessagesLocation, searchQuery: String, searchResult: SearchMessagesResult, searchState: SearchMessagesState) { + init(context: AccountContext, location: SearchMessagesLocation, searchQuery: String, searchResult: SearchMessagesResult, searchState: SearchMessagesState, presentInGlobalOverlay: @escaping (ViewController) -> Void) { self.context = context self.location = location self.searchQuery = searchQuery @@ -183,7 +184,24 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in }, toggleArchivedFolderHiddenByDefault: { - }, activateChatPreview: { _, _, _ in + }, activateChatPreview: { [weak self] item, node, gesture in + guard let strongSelf = self else { + gesture?.cancel() + return + } + switch item.content { + case let .peer(peer): + if let message = peer.message { + let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(peer.peer.peerId), subject: .message(message.id), botStart: nil, mode: .standard(previewing: true)) + chatController.canReadHistory.set(false) + let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: .single([]), reactionItems: [], gesture: gesture) + presentInGlobalOverlay(contextController) + } else { + gesture?.cancel() + } + default: + gesture?.cancel() + } }) interaction.searchTextHighightState = searchQuery self.interaction = interaction @@ -317,3 +335,32 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe } } } + +private final class ContextControllerContentSourceImpl: ContextControllerContentSource { + let controller: ViewController + weak var sourceNode: ASDisplayNode? + + let navigationController: NavigationController? = nil + + let passthroughTouches: Bool = true + + init(controller: ViewController, sourceNode: ASDisplayNode?) { + self.controller = controller + self.sourceNode = sourceNode + } + + func transitionInfo() -> ContextControllerTakeControllerInfo? { + let sourceNode = self.sourceNode + return ContextControllerTakeControllerInfo(contentAreaInScreenSpace: CGRect(origin: CGPoint(), size: CGSize(width: 10.0, height: 10.0)), sourceNode: { [weak sourceNode] in + if let sourceNode = sourceNode { + return (sourceNode, sourceNode.bounds) + } else { + return nil + } + }) + } + + func animatedIn() { + } +} + diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchResultsController.swift b/submodules/TelegramUI/TelegramUI/ChatSearchResultsController.swift index fc3a3c14c4..313a5eb0dd 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSearchResultsController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSearchResultsController.swift @@ -64,7 +64,9 @@ final class ChatSearchResultsController: ViewController { } override public func loadDisplayNode() { - self.displayNode = ChatSearchResultsControllerNode(context: self.context, location: self.location, searchQuery: self.searchQuery, searchResult: self.searchResult, searchState: self.searchState) + self.displayNode = ChatSearchResultsControllerNode(context: self.context, location: self.location, searchQuery: self.searchQuery, searchResult: self.searchResult, searchState: self.searchState, presentInGlobalOverlay: { [weak self] c in + self?.presentInGlobalOverlay(c) + }) self.controllerNode.resultSelected = { [weak self] messageIndex in self?.navigateToMessageIndex(messageIndex) self?.dismiss() diff --git a/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift index 8b03144222..92197a821b 100644 --- a/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/CommandChatInputContextPanelNode.swift @@ -6,6 +6,7 @@ import TelegramCore import SyncCore import Display import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AccountContext @@ -34,8 +35,8 @@ private struct CommandChatInputContextPanelEntry: Comparable, Identifiable { return lhs.index < rhs.index } - func item(context: AccountContext, commandSelected: @escaping (PeerCommand, Bool) -> Void) -> ListViewItem { - return CommandChatInputPanelItem(context: context, theme: self.theme, command: self.command, commandSelected: commandSelected) + func item(context: AccountContext, fontSize: PresentationFontSize, commandSelected: @escaping (PeerCommand, Bool) -> Void) -> ListViewItem { + return CommandChatInputPanelItem(context: context, theme: self.theme, fontSize: fontSize, command: self.command, commandSelected: commandSelected) } } @@ -45,12 +46,12 @@ private struct CommandChatInputContextPanelTransition { let updates: [ListViewUpdateItem] } -private func preparedTransition(from fromEntries: [CommandChatInputContextPanelEntry], to toEntries: [CommandChatInputContextPanelEntry], context: AccountContext, commandSelected: @escaping (PeerCommand, Bool) -> Void) -> CommandChatInputContextPanelTransition { +private func preparedTransition(from fromEntries: [CommandChatInputContextPanelEntry], to toEntries: [CommandChatInputContextPanelEntry], context: AccountContext, fontSize: PresentationFontSize, commandSelected: @escaping (PeerCommand, Bool) -> Void) -> CommandChatInputContextPanelTransition { let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } - let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, commandSelected: commandSelected), directionHint: nil) } - let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, commandSelected: commandSelected), directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, fontSize: fontSize, commandSelected: commandSelected), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, fontSize: fontSize, commandSelected: commandSelected), directionHint: nil) } return CommandChatInputContextPanelTransition(deletions: deletions, insertions: insertions, updates: updates) } @@ -62,7 +63,7 @@ final class CommandChatInputContextPanelNode: ChatInputContextPanelNode { private var enqueuedTransitions: [(CommandChatInputContextPanelTransition, Bool)] = [] private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? - override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.listView = ListView() self.listView.isOpaque = false self.listView.stackFromBottom = true @@ -70,7 +71,7 @@ final class CommandChatInputContextPanelNode: ChatInputContextPanelNode { self.listView.limitHitTestToNodes = true self.listView.view.disablesInteractiveTransitionGestureRecognizer = true - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.isOpaque = false self.clipsToBounds = true @@ -96,7 +97,7 @@ final class CommandChatInputContextPanelNode: ChatInputContextPanelNode { private func prepareTransition(from: [CommandChatInputContextPanelEntry]? , to: [CommandChatInputContextPanelEntry]) { let firstTime = self.currentEntries == nil - let transition = preparedTransition(from: from ?? [], to: to, context: self.context, commandSelected: { [weak self] command, sendImmediately in + let transition = preparedTransition(from: from ?? [], to: to, context: self.context, fontSize: self.fontSize, commandSelected: { [weak self] command, sendImmediately in if let strongSelf = self, let interfaceInteraction = strongSelf.interfaceInteraction { if sendImmediately { interfaceInteraction.sendBotCommand(command.peer, "/" + command.command.text) diff --git a/submodules/TelegramUI/TelegramUI/CommandChatInputPanelItem.swift b/submodules/TelegramUI/TelegramUI/CommandChatInputPanelItem.swift index 9ba6cef634..a6d809ba14 100644 --- a/submodules/TelegramUI/TelegramUI/CommandChatInputPanelItem.swift +++ b/submodules/TelegramUI/TelegramUI/CommandChatInputPanelItem.swift @@ -7,20 +7,23 @@ import SyncCore import SwiftSignalKit import Postbox import TelegramPresentationData +import TelegramUIPreferences import AvatarNode import AccountContext final class CommandChatInputPanelItem: ListViewItem { fileprivate let context: AccountContext fileprivate let theme: PresentationTheme + fileprivate let fontSize: PresentationFontSize fileprivate let command: PeerCommand fileprivate let commandSelected: (PeerCommand, Bool) -> Void let selectable: Bool = true - public init(context: AccountContext, theme: PresentationTheme, command: PeerCommand, commandSelected: @escaping (PeerCommand, Bool) -> Void) { + public init(context: AccountContext, theme: PresentationTheme, fontSize: PresentationFontSize, command: PeerCommand, commandSelected: @escaping (PeerCommand, Bool) -> Void) { self.context = context self.theme = theme + self.fontSize = fontSize self.command = command self.commandSelected = commandSelected } @@ -78,8 +81,6 @@ final class CommandChatInputPanelItem: ListViewItem { } private let avatarFont = avatarPlaceholderFont(size: 16.0) -private let textFont = Font.medium(14.0) -private let descriptionFont = Font.regular(14.0) final class CommandChatInputPanelItemNode: ListViewItemNode { static let itemHeight: CGFloat = 42.0 @@ -134,6 +135,9 @@ final class CommandChatInputPanelItemNode: ListViewItemNode { let makeTextLayout = TextNode.asyncLayout(self.textNode) return { [weak self] item, params, mergedTop, mergedBottom in + let textFont = Font.medium(floor(item.fontSize.baseDisplaySize * 14.0 / 17.0)) + let descriptionFont = Font.regular(floor(item.fontSize.baseDisplaySize * 14.0 / 17.0)) + let leftInset: CGFloat = 55.0 + params.leftInset let rightInset: CGFloat = 10.0 + params.rightInset diff --git a/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift index 8d8b412d1e..cb96e43f19 100644 --- a/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/DisabledContextResultsChatInputContextPanelNode.swift @@ -6,6 +6,7 @@ import AsyncDisplayKit import Display import TelegramPresentationData import TelegramStringFormatting +import TelegramUIPreferences import AccountContext final class DisabledContextResultsChatInputContextPanelNode: ChatInputContextPanelNode { @@ -15,14 +16,14 @@ final class DisabledContextResultsChatInputContextPanelNode: ChatInputContextPan private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? - override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.containerNode = ASDisplayNode() self.separatorNode = ASDisplayNode() self.textNode = ImmediateTextNode() self.textNode.maximumNumberOfLines = 0 self.textNode.textAlignment = .center - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.isOpaque = false self.clipsToBounds = true diff --git a/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift index c7efec6d06..7362cd166a 100644 --- a/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/EmojisChatInputContextPanelNode.swift @@ -6,6 +6,7 @@ import TelegramCore import SyncCore import Display import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AccountContext import Emoji @@ -105,7 +106,7 @@ final class EmojisChatInputContextPanelNode: ChatInputContextPanelNode { private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? private var presentationInterfaceState: ChatPresentationInterfaceState? - override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.backgroundNode = ASImageNode() self.backgroundNode.displayWithoutProcessing = true self.backgroundNode.displaysAsynchronously = false @@ -130,7 +131,7 @@ final class EmojisChatInputContextPanelNode: ChatInputContextPanelNode { self.listView.view.disablesInteractiveTransitionGestureRecognizer = true self.listView.transform = CATransform3DMakeRotation(-CGFloat.pi / 2.0, 0.0, 0.0, 1.0) - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.placement = .overTextInput self.isOpaque = false diff --git a/submodules/TelegramUI/TelegramUI/GridMessageItem.swift b/submodules/TelegramUI/TelegramUI/GridMessageItem.swift index 5aa593044b..d0166ceadd 100644 --- a/submodules/TelegramUI/TelegramUI/GridMessageItem.swift +++ b/submodules/TelegramUI/TelegramUI/GridMessageItem.swift @@ -7,6 +7,7 @@ import SyncCore import Postbox import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import TelegramStringFormatting import AccountContext import RadialStatusNode @@ -39,6 +40,7 @@ final class GridMessageItemSection: GridSection { fileprivate let theme: PresentationTheme private let strings: PresentationStrings + private let fontSize: PresentationFontSize private let roundedTimestamp: Int32 private let month: Int32 @@ -48,9 +50,10 @@ final class GridMessageItemSection: GridSection { return self.roundedTimestamp.hashValue } - init(timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings) { + init(timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.theme = theme self.strings = strings + self.fontSize = fontSize var now = time_t(timestamp) var timeinfoNow: tm = tm() @@ -70,20 +73,20 @@ final class GridMessageItemSection: GridSection { } func node() -> ASDisplayNode { - return GridMessageItemSectionNode(theme: self.theme, strings: self.strings, roundedTimestamp: self.roundedTimestamp, month: self.month, year: self.year) + return GridMessageItemSectionNode(theme: self.theme, strings: self.strings, fontSize: self.fontSize, roundedTimestamp: self.roundedTimestamp, month: self.month, year: self.year) } } -private let sectionTitleFont = Font.regular(14.0) - final class GridMessageItemSectionNode: ASDisplayNode { var theme: PresentationTheme var strings: PresentationStrings + var fontSize: PresentationFontSize let titleNode: ASTextNode - init(theme: PresentationTheme, strings: PresentationStrings, roundedTimestamp: Int32, month: Int32, year: Int32) { + init(theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize, roundedTimestamp: Int32, month: Int32, year: Int32) { self.theme = theme self.strings = strings + self.fontSize = fontSize self.titleNode = ASTextNode() self.titleNode.isUserInteractionEnabled = false @@ -92,6 +95,8 @@ final class GridMessageItemSectionNode: ASDisplayNode { self.backgroundColor = theme.list.plainBackgroundColor.withAlphaComponent(0.9) + let sectionTitleFont = Font.regular(floor(fontSize.baseDisplaySize * 14.0 / 17.0)) + let dateText = stringForMonth(strings: strings, month: month, ofYear: year) self.addSubnode(self.titleNode) self.titleNode.attributedText = NSAttributedString(string: dateText, font: sectionTitleFont, textColor: theme.list.itemPrimaryTextColor) @@ -105,7 +110,7 @@ final class GridMessageItemSectionNode: ASDisplayNode { let bounds = self.bounds let titleSize = self.titleNode.measure(CGSize(width: bounds.size.width - 24.0, height: CGFloat.greatestFiniteMagnitude)) - self.titleNode.frame = CGRect(origin: CGPoint(x: 12.0, y: 8.0), size: titleSize) + self.titleNode.frame = CGRect(origin: CGPoint(x: 12.0, y: floor((bounds.size.height - titleSize.height) / 2.0)), size: titleSize) } } @@ -117,13 +122,13 @@ final class GridMessageItem: GridItem { private let controllerInteraction: ChatControllerInteraction let section: GridSection? - init(theme: PresentationTheme, strings: PresentationStrings, context: AccountContext, message: Message, controllerInteraction: ChatControllerInteraction) { + init(theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize, context: AccountContext, message: Message, controllerInteraction: ChatControllerInteraction) { self.theme = theme self.strings = strings self.context = context self.message = message self.controllerInteraction = controllerInteraction - self.section = GridMessageItemSection(timestamp: message.timestamp, theme: theme, strings: strings) + self.section = GridMessageItemSection(timestamp: message.timestamp, theme: theme, strings: strings, fontSize: fontSize) } func node(layout: GridNodeLayout, synchronousLoad: Bool) -> GridItemNode { diff --git a/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift index b7f4d6590e..4105db2245 100644 --- a/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/HashtagChatInputContextPanelNode.swift @@ -6,6 +6,7 @@ import TelegramCore import SyncCore import Display import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AccountContext import AccountContext @@ -35,8 +36,8 @@ private struct HashtagChatInputContextPanelEntry: Comparable, Identifiable { return lhs.index < rhs.index } - func item(account: Account, hashtagSelected: @escaping (String) -> Void) -> ListViewItem { - return HashtagChatInputPanelItem(theme: self.theme, text: self.text, hashtagSelected: hashtagSelected) + func item(account: Account, fontSize: PresentationFontSize, hashtagSelected: @escaping (String) -> Void) -> ListViewItem { + return HashtagChatInputPanelItem(theme: self.theme, fontSize: fontSize, text: self.text, hashtagSelected: hashtagSelected) } } @@ -46,12 +47,12 @@ private struct HashtagChatInputContextPanelTransition { let updates: [ListViewUpdateItem] } -private func preparedTransition(from fromEntries: [HashtagChatInputContextPanelEntry], to toEntries: [HashtagChatInputContextPanelEntry], account: Account, hashtagSelected: @escaping (String) -> Void) -> HashtagChatInputContextPanelTransition { +private func preparedTransition(from fromEntries: [HashtagChatInputContextPanelEntry], to toEntries: [HashtagChatInputContextPanelEntry], account: Account, fontSize: PresentationFontSize, hashtagSelected: @escaping (String) -> Void) -> HashtagChatInputContextPanelTransition { let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } - let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, hashtagSelected: hashtagSelected), directionHint: nil) } - let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, hashtagSelected: hashtagSelected), directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, fontSize: fontSize, hashtagSelected: hashtagSelected), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, fontSize: fontSize, hashtagSelected: hashtagSelected), directionHint: nil) } return HashtagChatInputContextPanelTransition(deletions: deletions, insertions: insertions, updates: updates) } @@ -63,7 +64,7 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode { private var enqueuedTransitions: [(HashtagChatInputContextPanelTransition, Bool)] = [] private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? - override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.listView = ListView() self.listView.isOpaque = false self.listView.stackFromBottom = true @@ -71,7 +72,7 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode { self.listView.limitHitTestToNodes = true self.listView.view.disablesInteractiveTransitionGestureRecognizer = true - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.isOpaque = false self.clipsToBounds = true @@ -97,7 +98,7 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode { private func prepareTransition(from: [HashtagChatInputContextPanelEntry]? , to: [HashtagChatInputContextPanelEntry]) { let firstTime = from == nil - let transition = preparedTransition(from: from ?? [], to: to, account: self.context.account, hashtagSelected: { [weak self] text in + let transition = preparedTransition(from: from ?? [], to: to, account: self.context.account, fontSize: self.fontSize, hashtagSelected: { [weak self] text in if let strongSelf = self, let interfaceInteraction = strongSelf.interfaceInteraction { interfaceInteraction.updateTextInputStateAndMode { textInputState, inputMode in var hashtagQueryRange: NSRange? diff --git a/submodules/TelegramUI/TelegramUI/HashtagChatInputPanelItem.swift b/submodules/TelegramUI/TelegramUI/HashtagChatInputPanelItem.swift index 9af929732a..57247e8a23 100644 --- a/submodules/TelegramUI/TelegramUI/HashtagChatInputPanelItem.swift +++ b/submodules/TelegramUI/TelegramUI/HashtagChatInputPanelItem.swift @@ -7,16 +7,19 @@ import SyncCore import SwiftSignalKit import Postbox import TelegramPresentationData +import TelegramUIPreferences final class HashtagChatInputPanelItem: ListViewItem { fileprivate let theme: PresentationTheme + fileprivate let fontSize: PresentationFontSize fileprivate let text: String private let hashtagSelected: (String) -> Void let selectable: Bool = true - public init(theme: PresentationTheme, text: String, hashtagSelected: @escaping (String) -> Void) { + public init(theme: PresentationTheme, fontSize: PresentationFontSize, text: String, hashtagSelected: @escaping (String) -> Void) { self.theme = theme + self.fontSize = fontSize self.text = text self.hashtagSelected = hashtagSelected } @@ -73,8 +76,6 @@ final class HashtagChatInputPanelItem: ListViewItem { } } -private let textFont = Font.medium(14.0) - final class HashtagChatInputPanelItemNode: ListViewItemNode { static let itemHeight: CGFloat = 42.0 private let textNode: TextNode @@ -115,6 +116,8 @@ final class HashtagChatInputPanelItemNode: ListViewItemNode { func asyncLayout() -> (_ item: HashtagChatInputPanelItem, _ params: ListViewItemLayoutParams, _ mergedTop: Bool, _ mergedBottom: Bool) -> (ListViewItemNodeLayout, (ListViewItemUpdateAnimation) -> Void) { let makeTextLayout = TextNode.asyncLayout(self.textNode) return { [weak self] item, params, mergedTop, mergedBottom in + let textFont = Font.medium(floor(item.fontSize.baseDisplaySize * 14.0 / 17.0)) + let baseWidth = params.width - params.leftInset - params.rightInset let leftInset: CGFloat = 15.0 + params.leftInset diff --git a/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift index 1c0d07952b..08e87ea73b 100644 --- a/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/HorizontalListContextResultsChatInputContextPanelNode.swift @@ -7,6 +7,7 @@ import SyncCore import Display import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AccountContext import StickerPackPreviewUI @@ -86,7 +87,7 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont private var enqueuedTransitions: [(HorizontalListContextResultsChatInputContextPanelTransition, Bool)] = [] private var hasValidLayout = false - override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.strings = strings self.separatorNode = ASDisplayNode() @@ -100,7 +101,7 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont self.listView.transform = CATransform3DMakeRotation(-CGFloat(CGFloat.pi / 2.0), 0.0, 0.0, 1.0) self.listView.isHidden = true - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.isOpaque = false self.clipsToBounds = true diff --git a/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift index 7c87f7bb9d..6ba4e9586c 100755 --- a/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/HorizontalStickersChatContextPanelNode.swift @@ -7,6 +7,7 @@ import SyncCore import Display import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AccountContext import StickerPackPreviewUI @@ -109,7 +110,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { private var stickerPreviewController: StickerPreviewController? - override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.strings = strings self.backgroundNode = ASImageNode() @@ -136,7 +137,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { self.stickersInteraction = HorizontalStickersChatContextPanelInteraction() - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.placement = .overTextInput self.isOpaque = false diff --git a/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift b/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift index f23ac1ed90..5a3d511455 100644 --- a/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift +++ b/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift @@ -3,6 +3,7 @@ import UIKit import Display import AsyncDisplayKit import TelegramPresentationData +import TelegramUIPreferences import TelegramStringFormatting private let timezoneOffset: Int32 = { @@ -22,11 +23,13 @@ final class ListMessageDateHeader: ListViewItemHeader { let id: Int64 let theme: PresentationTheme let strings: PresentationStrings + let fontSize: PresentationFontSize - init(timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings) { + init(timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.timestamp = timestamp self.theme = theme self.strings = strings + self.fontSize = fontSize var time: time_t = time_t(timestamp + timezoneOffset) var timeinfo: tm = tm() @@ -44,25 +47,24 @@ final class ListMessageDateHeader: ListViewItemHeader { let height: CGFloat = 36.0 func node() -> ListViewItemHeaderNode { - return ListMessageDateHeaderNode(theme: self.theme, strings: self.strings, roundedTimestamp: self.roundedTimestamp, month: self.month, year: self.year) + return ListMessageDateHeaderNode(theme: self.theme, strings: self.strings, fontSize: self.fontSize, roundedTimestamp: self.roundedTimestamp, month: self.month, year: self.year) } func updateNode(_ node: ListViewItemHeaderNode, previous: ListViewItemHeader?, next: ListViewItemHeader?) { - } } -private let sectionTitleFont = Font.regular(14.0) - final class ListMessageDateHeaderNode: ListViewItemHeaderNode { var theme: PresentationTheme var strings: PresentationStrings + var fontSize: PresentationFontSize let titleNode: ASTextNode let backgroundNode: ASDisplayNode - init(theme: PresentationTheme, strings: PresentationStrings, roundedTimestamp: Int32, month: Int32, year: Int32) { + init(theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize, roundedTimestamp: Int32, month: Int32, year: Int32) { self.theme = theme self.strings = strings + self.fontSize = fontSize self.backgroundNode = ASDisplayNode() self.backgroundNode.isLayerBacked = true @@ -75,6 +77,8 @@ final class ListMessageDateHeaderNode: ListViewItemHeaderNode { let dateText = stringForMonth(strings: strings, month: month, ofYear: year) + let sectionTitleFont = Font.regular(floor(fontSize.baseDisplaySize * 14.0 / 17.0)) + self.addSubnode(self.backgroundNode) self.addSubnode(self.titleNode) self.titleNode.attributedText = NSAttributedString(string: dateText, font: sectionTitleFont, textColor: theme.list.itemPrimaryTextColor) @@ -97,7 +101,7 @@ final class ListMessageDateHeaderNode: ListViewItemHeaderNode { override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat) { let titleSize = self.titleNode.measure(CGSize(width: size.width - leftInset - rightInset - 24.0, height: CGFloat.greatestFiniteMagnitude)) - self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + 12.0, y: 8.0), size: titleSize) + self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + 12.0, y: floor((size.height - titleSize.height) / 2.0)), size: titleSize) self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size) } } diff --git a/submodules/TelegramUI/TelegramUI/ListMessageItem.swift b/submodules/TelegramUI/TelegramUI/ListMessageItem.swift index ee7fc455c1..b3264a7cad 100644 --- a/submodules/TelegramUI/TelegramUI/ListMessageItem.swift +++ b/submodules/TelegramUI/TelegramUI/ListMessageItem.swift @@ -35,7 +35,7 @@ final class ListMessageItem: ListViewItem { self.controllerInteraction = controllerInteraction self.message = message if displayHeader { - self.header = ListMessageDateHeader(timestamp: message.timestamp, theme: theme, strings: strings) + self.header = ListMessageDateHeader(timestamp: message.timestamp, theme: theme, strings: strings, fontSize: fontSize) } else { self.header = nil } diff --git a/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift index 2ffa10c9ab..6dc770a61c 100644 --- a/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/MentionChatInputContextPanelNode.swift @@ -6,6 +6,7 @@ import TelegramCore import SyncCore import Display import TelegramPresentationData +import TelegramUIPreferences import MergeLists import TextFormat import AccountContext @@ -27,8 +28,8 @@ private struct MentionChatInputContextPanelEntry: Comparable, Identifiable { return lhs.index < rhs.index } - func item(context: AccountContext, theme: PresentationTheme, inverted: Bool, peerSelected: @escaping (Peer) -> Void) -> ListViewItem { - return MentionChatInputPanelItem(context: context, theme: theme, inverted: inverted, peer: self.peer, peerSelected: peerSelected) + func item(context: AccountContext, theme: PresentationTheme, fontSize: PresentationFontSize, inverted: Bool, peerSelected: @escaping (Peer) -> Void) -> ListViewItem { + return MentionChatInputPanelItem(context: context, theme: theme, fontSize: fontSize, inverted: inverted, peer: self.peer, peerSelected: peerSelected) } } @@ -38,12 +39,12 @@ private struct CommandChatInputContextPanelTransition { let updates: [ListViewUpdateItem] } -private func preparedTransition(from fromEntries: [MentionChatInputContextPanelEntry], to toEntries: [MentionChatInputContextPanelEntry], context: AccountContext, theme: PresentationTheme, inverted: Bool, forceUpdate: Bool, peerSelected: @escaping (Peer) -> Void) -> CommandChatInputContextPanelTransition { +private func preparedTransition(from fromEntries: [MentionChatInputContextPanelEntry], to toEntries: [MentionChatInputContextPanelEntry], context: AccountContext, theme: PresentationTheme, fontSize: PresentationFontSize, inverted: Bool, forceUpdate: Bool, peerSelected: @escaping (Peer) -> Void) -> CommandChatInputContextPanelTransition { let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries, allUpdated: forceUpdate) let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } - let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, theme: theme, inverted: inverted, peerSelected: peerSelected), directionHint: nil) } - let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, theme: theme, inverted: inverted, peerSelected: peerSelected), directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, theme: theme, fontSize: fontSize, inverted: inverted, peerSelected: peerSelected), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, theme: theme, fontSize: fontSize, inverted: inverted, peerSelected: peerSelected), directionHint: nil) } return CommandChatInputContextPanelTransition(deletions: deletions, insertions: insertions, updates: updates) } @@ -62,7 +63,7 @@ final class MentionChatInputContextPanelNode: ChatInputContextPanelNode { private var enqueuedTransitions: [(CommandChatInputContextPanelTransition, Bool)] = [] private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? - init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, mode: MentionChatInputContextPanelMode) { + init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize, mode: MentionChatInputContextPanelMode) { self.mode = mode self.listView = ListView() @@ -72,7 +73,7 @@ final class MentionChatInputContextPanelNode: ChatInputContextPanelNode { self.listView.limitHitTestToNodes = true self.listView.view.disablesInteractiveTransitionGestureRecognizer = true - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.isOpaque = false self.clipsToBounds = true @@ -102,7 +103,7 @@ final class MentionChatInputContextPanelNode: ChatInputContextPanelNode { private func updateToEntries(entries: [MentionChatInputContextPanelEntry], forceUpdate: Bool) { let firstTime = self.currentEntries == nil - let transition = preparedTransition(from: self.currentEntries ?? [], to: entries, context: self.context, theme: self.theme, inverted: self.mode == .search, forceUpdate: forceUpdate, peerSelected: { [weak self] peer in + let transition = preparedTransition(from: self.currentEntries ?? [], to: entries, context: self.context, theme: self.theme, fontSize: self.fontSize, inverted: self.mode == .search, forceUpdate: forceUpdate, peerSelected: { [weak self] peer in if let strongSelf = self, let interfaceInteraction = strongSelf.interfaceInteraction { switch strongSelf.mode { case .input: diff --git a/submodules/TelegramUI/TelegramUI/MentionChatInputPanelItem.swift b/submodules/TelegramUI/TelegramUI/MentionChatInputPanelItem.swift index 6c83fed9f9..a97d6708fe 100644 --- a/submodules/TelegramUI/TelegramUI/MentionChatInputPanelItem.swift +++ b/submodules/TelegramUI/TelegramUI/MentionChatInputPanelItem.swift @@ -7,21 +7,24 @@ import SyncCore import SwiftSignalKit import Postbox import TelegramPresentationData +import TelegramUIPreferences import AvatarNode import AccountContext final class MentionChatInputPanelItem: ListViewItem { fileprivate let context: AccountContext fileprivate let theme: PresentationTheme + fileprivate let fontSize: PresentationFontSize fileprivate let inverted: Bool fileprivate let peer: Peer private let peerSelected: (Peer) -> Void let selectable: Bool = true - public init(context: AccountContext, theme: PresentationTheme, inverted: Bool, peer: Peer, peerSelected: @escaping (Peer) -> Void) { + public init(context: AccountContext, theme: PresentationTheme, fontSize: PresentationFontSize, inverted: Bool, peer: Peer, peerSelected: @escaping (Peer) -> Void) { self.context = context self.theme = theme + self.fontSize = fontSize self.inverted = inverted self.peer = peer self.peerSelected = peerSelected @@ -80,8 +83,6 @@ final class MentionChatInputPanelItem: ListViewItem { } private let avatarFont = avatarPlaceholderFont(size: 16.0) -private let primaryFont = Font.medium(14.0) -private let secondaryFont = Font.regular(14.0) final class MentionChatInputPanelItemNode: ListViewItemNode { static let itemHeight: CGFloat = 42.0 @@ -133,6 +134,9 @@ final class MentionChatInputPanelItemNode: ListViewItemNode { let previousItem = self.item return { [weak self] item, params, mergedTop, mergedBottom in + let primaryFont = Font.medium(floor(item.fontSize.baseDisplaySize * 14.0 / 17.0)) + let secondaryFont = Font.regular(floor(item.fontSize.baseDisplaySize * 14.0 / 17.0)) + let leftInset: CGFloat = 55.0 + params.leftInset let rightInset: CGFloat = 10.0 + params.rightInset diff --git a/submodules/TelegramUI/TelegramUI/OverlayPlayerControllerNode.swift b/submodules/TelegramUI/TelegramUI/OverlayPlayerControllerNode.swift index e2f4ccd343..7972f2df0a 100644 --- a/submodules/TelegramUI/TelegramUI/OverlayPlayerControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/OverlayPlayerControllerNode.swift @@ -118,6 +118,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu }, updateMessageReaction: { _, _ in }, openMessageReactions: { _ in }, displaySwipeToReplyHint: { + }, dismissReplyMarkupMessage: { _ in }, requestMessageUpdate: { _ in }, cancelInteractiveKeyboardGestures: { }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings, pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false)) diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift index c7491a5105..a27fdafab7 100644 --- a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift +++ b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift @@ -423,6 +423,7 @@ public class PeerMediaCollectionController: TelegramBaseController { }, updateMessageReaction: { _, _ in }, openMessageReactions: { _ in }, displaySwipeToReplyHint: { + }, dismissReplyMarkupMessage: { _ in }, requestMessageUpdate: { _ in }, cancelInteractiveKeyboardGestures: { }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings, diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 10b92b2cc5..3ef4900888 100644 Binary files a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping and b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping differ diff --git a/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift index 2c0ebd153f..d60e5a0630 100644 --- a/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/StickersChatInputContextPanelNode.swift @@ -7,6 +7,7 @@ import SyncCore import Display import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AccountContext import StickerPackPreviewUI @@ -80,7 +81,7 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode { private var stickerPreviewController: StickerPreviewController? - override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.strings = strings self.listView = ListView() @@ -92,7 +93,7 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode { self.stickersInteraction = StickersChatInputContextPanelInteraction() - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.isOpaque = false self.clipsToBounds = true diff --git a/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift index 803bd4ebe8..db08657b50 100644 --- a/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/VerticalListContextResultsChatInputContextPanelNode.swift @@ -6,6 +6,7 @@ import TelegramCore import SyncCore import Display import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AccountContext @@ -127,7 +128,7 @@ final class VerticalListContextResultsChatInputContextPanelNode: ChatInputContex private var enqueuedTransitions: [(VerticalListContextResultsChatInputContextPanelTransition, Bool)] = [] private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)? - override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + override init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { self.listView = ListView() self.listView.isOpaque = false self.listView.stackFromBottom = true @@ -136,7 +137,7 @@ final class VerticalListContextResultsChatInputContextPanelNode: ChatInputContex self.listView.isHidden = true self.listView.view.disablesInteractiveTransitionGestureRecognizer = true - super.init(context: context, theme: theme, strings: strings) + super.init(context: context, theme: theme, strings: strings, fontSize: fontSize) self.isOpaque = false self.clipsToBounds = true diff --git a/submodules/TextSelectionNode/Sources/TextSelectionNode.swift b/submodules/TextSelectionNode/Sources/TextSelectionNode.swift index a196e51f00..f1381e0d11 100644 --- a/submodules/TextSelectionNode/Sources/TextSelectionNode.swift +++ b/submodules/TextSelectionNode/Sources/TextSelectionNode.swift @@ -34,12 +34,12 @@ private func cancelScrollViewGestures(view: UIView?) { } } -private func generateKnobImage(color: UIColor, inverted: Bool = false) -> UIImage? { +private func generateKnobImage(color: UIColor, diameter: CGFloat, inverted: Bool = false) -> UIImage? { let f: (CGSize, CGContext) -> Void = { size, context in context.clear(CGRect(origin: CGPoint(), size: size)) context.setFillColor(color.cgColor) context.fill(CGRect(origin: CGPoint(x: (size.width - 2.0) / 2.0, y: size.width / 2.0), size: CGSize(width: 2.0, height: size.height - size.width / 2.0 - 1.0))) - context.fillEllipse(in: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.width))) + context.fillEllipse(in: CGRect(origin: CGPoint(x: floor((size.width - diameter) / 2.0), y: floor((size.width - diameter) / 2.0)), size: CGSize(width: diameter, height: diameter))) context.fillEllipse(in: CGRect(origin: CGPoint(x: (size.width - 2.0) / 2.0, y: size.width + 2.0), size: CGSize(width: 2.0, height: 2.0))) } let size = CGSize(width: 12.0, height: 12.0 + 2.0 + 2.0) @@ -53,10 +53,12 @@ private func generateKnobImage(color: UIColor, inverted: Bool = false) -> UIImag public final class TextSelectionTheme { public let selection: UIColor public let knob: UIColor + public let knobDiameter: CGFloat - public init(selection: UIColor, knob: UIColor) { + public init(selection: UIColor, knob: UIColor, knobDiameter: CGFloat = 12.0) { self.selection = selection self.knob = knob + self.knobDiameter = knobDiameter } } @@ -204,6 +206,9 @@ public final class TextSelectionNode: ASDisplayNode { public let highlightAreaNode: ASDisplayNode + private var recognizer: TextSelectionGetureRecognizer? + private var displayLinkAnimator: DisplayLinkAnimator? + public init(theme: TextSelectionTheme, strings: PresentationStrings, textNode: TextNode, updateIsActive: @escaping (Bool) -> Void, present: @escaping (ViewController, Any?) -> Void, rootNode: ASDisplayNode, performAction: @escaping (String, TextSelectionAction) -> Void) { self.theme = theme self.strings = strings @@ -214,13 +219,13 @@ public final class TextSelectionNode: ASDisplayNode { self.performAction = performAction self.leftKnob = ASImageNode() self.leftKnob.isUserInteractionEnabled = false - self.leftKnob.image = generateKnobImage(color: theme.knob) + self.leftKnob.image = generateKnobImage(color: theme.knob, diameter: theme.knobDiameter) self.leftKnob.displaysAsynchronously = false self.leftKnob.displayWithoutProcessing = true self.leftKnob.alpha = 0.0 self.rightKnob = ASImageNode() self.rightKnob.isUserInteractionEnabled = false - self.rightKnob.image = generateKnobImage(color: theme.knob, inverted: true) + self.rightKnob.image = generateKnobImage(color: theme.knob, diameter: theme.knobDiameter, inverted: true) self.rightKnob.displaysAsynchronously = false self.rightKnob.displayWithoutProcessing = true self.rightKnob.alpha = 0.0 @@ -255,7 +260,6 @@ public final class TextSelectionNode: ASDisplayNode { let mappedPoint = strongSelf.view.convert(point, to: strongSelf.textNode.view) if let stringIndex = strongSelf.textNode.attributesAtPoint(mappedPoint, orNearest: true)?.0 { - //let string = attributedString.string as NSString var updatedMin = currentRange.0 var updatedMax = currentRange.1 switch knob { @@ -324,6 +328,7 @@ public final class TextSelectionNode: ASDisplayNode { self?.dismissSelection() self?.updateIsActive(false) } + self.recognizer = recognizer self.view.addGestureRecognizer(recognizer) } @@ -337,6 +342,60 @@ public final class TextSelectionNode: ASDisplayNode { } } + public func pretendInitiateSelection() { + guard let cachedLayout = self.textNode.cachedLayout, let attributedString = cachedLayout.attributedString else { + return + } + + var resultRange: NSRange? + let stringIndex = 0 + let string = attributedString.string as NSString + + let inputRange = CFRangeMake(0, string.length) + let flag = UInt(kCFStringTokenizerUnitWord) + let locale = CFLocaleCopyCurrent() + let tokenizer = CFStringTokenizerCreate(kCFAllocatorDefault, string as CFString, inputRange, flag, locale) + var tokenType = CFStringTokenizerAdvanceToNextToken(tokenizer) + + while !tokenType.isEmpty { + let currentTokenRange = CFStringTokenizerGetCurrentTokenRange(tokenizer) + if currentTokenRange.location <= stringIndex && currentTokenRange.location + currentTokenRange.length > stringIndex { + resultRange = NSRange(location: currentTokenRange.location, length: currentTokenRange.length) + break + } + tokenType = CFStringTokenizerAdvanceToNextToken(tokenizer) + } + if resultRange == nil { + resultRange = NSRange(location: stringIndex, length: 1) + } + + self.currentRange = resultRange.flatMap { + ($0.lowerBound, $0.upperBound) + } + self.updateSelection(range: resultRange, animateIn: true) + self.updateIsActive(true) + } + + public func pretendExtendSelection(to index: Int) { + guard let cachedLayout = self.textNode.cachedLayout, let attributedString = cachedLayout.attributedString, let endRangeRect = cachedLayout.rangeRects(in: NSRange(location: index, length: 1))?.first else { + return + } + let startPoint = self.rightKnob.frame.center + let endPoint = endRangeRect.center + let displayLinkAnimator = DisplayLinkAnimator(duration: 0.3, from: 0.0, to: 1.0, update: { [weak self] progress in + guard let strongSelf = self else { + return + } + let point = CGPoint(x: (1.0 - progress) * startPoint.x + progress * endPoint.x, y: (1.0 - progress) * startPoint.y + progress * endPoint.y) + strongSelf.recognizer?.moveKnob?(.right, point) + }, completion: { [weak self] in + guard let strongSelf = self else { + return + } + }) + self.displayLinkAnimator = displayLinkAnimator + } + private func updateSelection(range: NSRange?, animateIn: Bool) { var rects: [CGRect]? @@ -362,8 +421,8 @@ public final class TextSelectionNode: ASDisplayNode { highlightOverlay.frame = self.bounds highlightOverlay.updateRects(rects) if let image = self.leftKnob.image { - self.leftKnob.frame = CGRect(origin: CGPoint(x: floor(rects[0].minX - 1.0 - image.size.width / 2.0), y: rects[0].minY - 1.0 - image.size.width), size: CGSize(width: image.size.width, height: image.size.width + rects[0].height + 2.0)) - self.rightKnob.frame = CGRect(origin: CGPoint(x: floor(rects[rects.count - 1].maxX + 1.0 - image.size.width / 2.0), y: rects[rects.count - 1].maxY + 1.0 - (rects[0].height + 2.0)), size: CGSize(width: image.size.width, height: image.size.width + rects[0].height + 2.0)) + self.leftKnob.frame = CGRect(origin: CGPoint(x: floor(rects[0].minX - 1.0 - image.size.width / 2.0), y: rects[0].minY - 1.0 - self.theme.knobDiameter), size: CGSize(width: image.size.width, height: self.theme.knobDiameter + rects[0].height + 2.0)) + self.rightKnob.frame = CGRect(origin: CGPoint(x: floor(rects[rects.count - 1].maxX + 1.0 - image.size.width / 2.0), y: rects[rects.count - 1].maxY + 1.0 - (rects[0].height + 2.0)), size: CGSize(width: image.size.width, height: self.theme.knobDiameter + rects[0].height + 2.0)) } if self.leftKnob.alpha.isZero { highlightOverlay.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue) diff --git a/submodules/WatchBridge/Sources/WatchBridge.swift b/submodules/WatchBridge/Sources/WatchBridge.swift index b074778ab7..b5cfd95ff5 100644 --- a/submodules/WatchBridge/Sources/WatchBridge.swift +++ b/submodules/WatchBridge/Sources/WatchBridge.swift @@ -319,7 +319,7 @@ func makeBridgeMedia(message: Message, strings: PresentationStrings, chatPeer: P } func makeBridgeChat(_ entry: ChatListEntry, strings: PresentationStrings) -> (TGBridgeChat, [Int64 : TGBridgeUser])? { - if case let .MessageEntry(index, message, readState, _, _, renderedPeer, _, _) = entry { + if case let .MessageEntry(index, message, readState, _, _, renderedPeer, _, _, hasFailed) = entry { guard index.messageIndex.id.peerId.namespace != Namespaces.Peer.SecretChat else { return nil } @@ -332,7 +332,7 @@ func makeBridgeChat(_ entry: ChatListEntry, strings: PresentationStrings) -> (TG bridgeChat.text = message.text bridgeChat.outgoing = !message.flags.contains(.Incoming) bridgeChat.deliveryState = makeBridgeDeliveryState(message) - bridgeChat.deliveryError = message.flags.contains(.Failed) + bridgeChat.deliveryError = hasFailed bridgeChat.media = makeBridgeMedia(message: message, strings: strings, filterUnsupportedActions: false) } bridgeChat.unread = readState?.isUnread ?? false diff --git a/tools/buck-build/prepare_buck_source.sh b/tools/buck-build/prepare_buck_source.sh index ebf91824a2..1b8db8da32 100644 --- a/tools/buck-build/prepare_buck_source.sh +++ b/tools/buck-build/prepare_buck_source.sh @@ -12,6 +12,23 @@ fi mkdir -p "$target_directory" +jdk_archive_name="jdk.tar.gz" +jdk_archive_path="$target_directory/$jdk_archive_name" +jdk_unpacked_path="$target_directory/jdk8u232-b09" +jdk_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_mac_hotspot_8u232b09.tar.gz" + +if [ ! -f "$jdk_archive_path" ]; then + echo "Fetching JDK 8" + curl "$jdk_url" -L -o "$target_directory/jdk.tar.gz" +fi + +if [ ! -d "$jdk_unpacked_path" ]; then + echo "Unpacking JDK 8" + pushd "$target_directory" + tar -xf "$jdk_archive_name" + popd +fi + patch_file="$(ls *.patch | head -1)" patch_path="$(pwd)/$patch_file" @@ -39,10 +56,7 @@ git reset --hard "$commit_sha" git apply --check "$patch_path" git apply "$patch_path" -ant - -./bin/buck build --show-output buck - -#result_path="$(pwd)/buck-out/gen/programs/buck.pex" +PATH="$PATH:$jdk_unpacked_path/Contents/Home/bin" ant +PATH="$PATH:$jdk_unpacked_path/Contents/Home/bin" ./bin/buck build --show-output buck cd "$dir"