diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 17be566783..ca1aa843c2 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -5114,6 +5114,7 @@ Any member of this group will be able to see messages in the channel."; "Theme.Colors.ColorWallpaperWarning" = "Are you sure you want to change your chat wallpaper to a color?"; "Theme.Colors.ColorWallpaperWarningProceed" = "Proceed"; +"ChatSettings.IntentsSettings" = "Share Sheet"; "IntentsSettings.Title" = "Share Sheet"; "IntentsSettings.MainAccount" = "Main Account"; "IntentsSettings.MainAccountInfo" = "Choose an account for Siri and share suggestions."; @@ -5146,3 +5147,9 @@ Any member of this group will be able to see messages in the channel."; "Map.SendThisPlace" = "Send This Place"; "Map.SetThisPlace" = "Set This Place"; +"Map.AddressOnMap" = "Address On Map"; +"Map.PlacesNearby" = "Places Nearby"; +"Map.Home" = "Home"; +"Map.Work" = "Work"; +"Map.HomeAndWorkTitle" = "Home & Work Addresses"; +"Map.HomeAndWorkInfo" = "Telegram uses the Home and Work addresses from your Contact Card.\n\nKeep your Contact Card up to date for quick access to sending Home and Work addresses."; diff --git a/Widget/PeerNode.swift b/Widget/PeerNode.swift index ccc57c330a..82e9f95362 100644 --- a/Widget/PeerNode.swift +++ b/Widget/PeerNode.swift @@ -135,9 +135,13 @@ final class PeerView: UIView { title.append("\n") title.append(lastName) } + + let systemFontSize = UIFont.preferredFont(forTextStyle: .body).pointSize + let fontSize = floor(systemFontSize * 11.0 / 17.0) + self.titleLabel.text = title self.titleLabel.textColor = primaryColor - self.titleLabel.font = UIFont.systemFont(ofSize: 11.0) + self.titleLabel.font = UIFont.systemFont(ofSize: fontSize) self.titleLabel.lineBreakMode = .byTruncatingTail self.titleLabel.numberOfLines = 2 self.titleLabel.textAlignment = .center diff --git a/Widget/TodayViewController.swift b/Widget/TodayViewController.swift index e18ee5af81..c1edbafbca 100644 --- a/Widget/TodayViewController.swift +++ b/Widget/TodayViewController.swift @@ -54,10 +54,12 @@ class TodayViewController: UIViewController, NCWidgetProviding { presentationData = WidgetPresentationData(applicationLockedString: "Unlock the app to use widget") } + let fontSize = UIFont.preferredFont(forTextStyle: .body).pointSize + if let data = try? Data(contentsOf: URL(fileURLWithPath: appLockStatePath(rootPath: rootPath))), let state = try? JSONDecoder().decode(LockState.self, from: data), isAppLocked(state: state) { let appLockedLabel = UILabel() appLockedLabel.textColor = self.primaryColor - appLockedLabel.font = UIFont.systemFont(ofSize: 16.0) + appLockedLabel.font = UIFont.systemFont(ofSize: fontSize) appLockedLabel.text = presentationData.applicationLockedString appLockedLabel.sizeToFit() self.appLockedLabel = appLockedLabel diff --git a/submodules/ActionSheetPeerItem/Sources/ActionSheetPeerItem.swift b/submodules/ActionSheetPeerItem/Sources/ActionSheetPeerItem.swift index d3e81caa6a..b227f15efb 100644 --- a/submodules/ActionSheetPeerItem/Sources/ActionSheetPeerItem.swift +++ b/submodules/ActionSheetPeerItem/Sources/ActionSheetPeerItem.swift @@ -48,7 +48,7 @@ private let avatarFont = avatarPlaceholderFont(size: 15.0) public class ActionSheetPeerItemNode: ActionSheetItemNode { private let theme: ActionSheetControllerTheme - public static let defaultFont: UIFont = Font.regular(20.0) + private let defaultFont: UIFont private var item: ActionSheetPeerItem? @@ -62,6 +62,8 @@ public class ActionSheetPeerItemNode: ActionSheetItemNode { override public init(theme: ActionSheetControllerTheme) { self.theme = theme + self.defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + self.button = HighlightTrackingButton() self.button.isAccessibilityElement = false @@ -114,8 +116,10 @@ public class ActionSheetPeerItemNode: ActionSheetItemNode { func setItem(_ item: ActionSheetPeerItem) { self.item = item + let defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + let textColor: UIColor = self.theme.primaryTextColor - self.label.attributedText = NSAttributedString(string: item.title, font: ActionSheetButtonNode.defaultFont, textColor: textColor) + self.label.attributedText = NSAttributedString(string: item.title, font: defaultFont, textColor: textColor) self.avatarNode.setPeer(account: item.account, theme: item.theme, peer: item.peer) diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentMethodSheet.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentMethodSheet.swift index f67d0f2c32..58d07f8c43 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentMethodSheet.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentMethodSheet.swift @@ -42,11 +42,11 @@ final class BotCheckoutPaymentMethodSheetController: ActionSheetController { let theme = presentationData.theme let strings = presentationData.strings - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self.presentationDisposable = context.sharedContext.presentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) @@ -137,7 +137,7 @@ public class BotCheckoutPaymentMethodItem: ActionSheetItem { } public class BotCheckoutPaymentMethodItemNode: ActionSheetItemNode { - public static let defaultFont: UIFont = Font.regular(20.0) + private let defaultFont: UIFont private let theme: ActionSheetControllerTheme @@ -150,6 +150,7 @@ public class BotCheckoutPaymentMethodItemNode: ActionSheetItemNode { public override init(theme: ActionSheetControllerTheme) { self.theme = theme + self.defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) self.button = HighlightTrackingButton() @@ -201,7 +202,7 @@ public class BotCheckoutPaymentMethodItemNode: ActionSheetItemNode { func setItem(_ item: BotCheckoutPaymentMethodItem) { self.item = item - self.titleNode.attributedText = NSAttributedString(string: item.title, font: BotCheckoutPaymentMethodItemNode.defaultFont, textColor: self.theme.primaryTextColor) + self.titleNode.attributedText = NSAttributedString(string: item.title, font: self.defaultFont, textColor: self.theme.primaryTextColor) self.iconNode.image = item.icon if let value = item.value { self.checkNode.isHidden = !value diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentShippingOptionSheetController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentShippingOptionSheetController.swift index 5150821641..495a5e674d 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentShippingOptionSheetController.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentShippingOptionSheetController.swift @@ -16,11 +16,11 @@ final class BotCheckoutPaymentShippingOptionSheetController: ActionSheetControll let theme = presentationData.theme let strings = presentationData.strings - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self.presentationDisposable = context.sharedContext.presentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) @@ -113,7 +113,7 @@ public class BotCheckoutPaymentShippingOptionItem: ActionSheetItem { } public class BotCheckoutPaymentShippingOptionItemNode: ActionSheetItemNode { - public static let defaultFont: UIFont = Font.regular(20.0) + private let defaultFont: UIFont private let theme: ActionSheetControllerTheme @@ -126,6 +126,7 @@ public class BotCheckoutPaymentShippingOptionItemNode: ActionSheetItemNode { public override init(theme: ActionSheetControllerTheme) { self.theme = theme + self.defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) self.button = HighlightTrackingButton() @@ -178,8 +179,8 @@ public class BotCheckoutPaymentShippingOptionItemNode: ActionSheetItemNode { func setItem(_ item: BotCheckoutPaymentShippingOptionItem) { self.item = item - self.titleNode.attributedText = NSAttributedString(string: item.title, font: BotCheckoutPaymentShippingOptionItemNode.defaultFont, textColor: self.theme.primaryTextColor) - self.labelNode.attributedText = NSAttributedString(string: item.label, font: BotCheckoutPaymentShippingOptionItemNode.defaultFont, textColor: self.theme.primaryTextColor) + self.titleNode.attributedText = NSAttributedString(string: item.title, font: self.defaultFont, textColor: self.theme.primaryTextColor) + self.labelNode.attributedText = NSAttributedString(string: item.label, font: self.defaultFont, textColor: self.theme.primaryTextColor) if let value = item.value { self.checkNode.isHidden = !value } else { diff --git a/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift b/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift index 833a1c2f7f..f1bce3461d 100644 --- a/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift +++ b/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift @@ -17,6 +17,8 @@ public enum ChatListSearchItemHeaderType: Int32 { case phoneNumber case exceptions case addToExceptions + case mapAddress + case nearbyVenues } public final class ChatListSearchItemHeader: ListViewItemHeader { @@ -30,7 +32,7 @@ public final class ChatListSearchItemHeader: ListViewItemHeader { public let height: CGFloat = 28.0 - public init(type: ChatListSearchItemHeaderType, theme: PresentationTheme, strings: PresentationStrings, actionTitle: String?, action: (() -> Void)?) { + public init(type: ChatListSearchItemHeaderType, theme: PresentationTheme, strings: PresentationStrings, actionTitle: String? = nil, action: (() -> Void)? = nil) { self.type = type self.id = Int64(self.type.rawValue) self.theme = theme @@ -93,6 +95,10 @@ public final class ChatListSearchItemHeaderNode: ListViewItemHeaderNode { self.sectionHeaderNode.title = strings.GroupInfo_Permissions_Exceptions.uppercased() case .addToExceptions: self.sectionHeaderNode.title = strings.Exceptions_AddToExceptions.uppercased() + case .mapAddress: + self.sectionHeaderNode.title = strings.Map_AddressOnMap.uppercased() + case .nearbyVenues: + self.sectionHeaderNode.title = strings.Map_PlacesNearby.uppercased() } self.sectionHeaderNode.action = actionTitle diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift index 13e3c32b99..86bfd13c60 100644 --- a/submodules/ChatListUI/Sources/ChatListController.swift +++ b/submodules/ChatListUI/Sources/ChatListController.swift @@ -308,7 +308,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, if case .root = groupId, checkProxy { if strongSelf.proxyUnavailableTooltipController == nil && !strongSelf.didShowProxyUnavailableTooltipController && strongSelf.isNodeLoaded && strongSelf.displayNode.view.window != nil { strongSelf.didShowProxyUnavailableTooltipController = true - let tooltipController = TooltipController(content: .text(strongSelf.presentationData.strings.Proxy_TooltipUnavailable), timeout: 60.0, dismissByTapOutside: true) + let tooltipController = TooltipController(content: .text(strongSelf.presentationData.strings.Proxy_TooltipUnavailable), baseFontSize: strongSelf.presentationData.fontSize.baseDisplaySize, timeout: 60.0, dismissByTapOutside: true) strongSelf.proxyUnavailableTooltipController = tooltipController tooltipController.dismissed = { [weak tooltipController] _ in if let strongSelf = self, let tooltipController = tooltipController, strongSelf.proxyUnavailableTooltipController === tooltipController { @@ -588,7 +588,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, self.chatListDisplayNode.requestOpenRecentPeerOptions = { [weak self] peer in if let strongSelf = self { strongSelf.view.window?.endEditing(true) - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ ActionSheetItemGroup(items: [ @@ -669,12 +669,12 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, case let .groupReference(groupReference): let chatListController = ChatListControllerImpl(context: strongSelf.context, groupId: groupReference.groupId, controlsHistoryPreload: false, hideNetworkActivityStatus: true, previewing: true, enableDebugActions: false) chatListController.navigationPresentation = .master - let contextController = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatListController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: archiveContextMenuItems(context: strongSelf.context, groupId: groupReference.groupId, chatListController: strongSelf), reactionItems: [], gesture: gesture) + let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatListController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: archiveContextMenuItems(context: strongSelf.context, groupId: groupReference.groupId, chatListController: strongSelf), reactionItems: [], gesture: gesture) strongSelf.presentInGlobalOverlay(contextController) case let .peer(peer): let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(peer.peer.peerId), subject: nil, botStart: nil, mode: .standard(previewing: true)) chatController.canReadHistory.set(false) - let contextController = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: chatContextMenuItems(context: strongSelf.context, peerId: peer.peer.peerId, source: .chatList, chatListController: strongSelf), reactionItems: [], gesture: gesture) + let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: chatContextMenuItems(context: strongSelf.context, peerId: peer.peer.peerId, source: .chatList, chatListController: strongSelf), reactionItems: [], gesture: gesture) strongSelf.presentInGlobalOverlay(contextController) } } @@ -687,7 +687,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(peer.id), subject: nil, botStart: nil, mode: .standard(previewing: true)) chatController.canReadHistory.set(false) - let contextController = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: chatContextMenuItems(context: strongSelf.context, peerId: peer.id, source: .search(source), chatListController: strongSelf), reactionItems: [], gesture: gesture) + let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: chatContextMenuItems(context: strongSelf.context, peerId: peer.id, source: .search(source), chatListController: strongSelf), reactionItems: [], gesture: gesture) strongSelf.presentInGlobalOverlay(contextController) } @@ -798,7 +798,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, if hasPasscode { let _ = ApplicationSpecificNotice.setPasscodeLockTips(accountManager: strongSelf.context.sharedContext.accountManager).start() - let tooltipController = TooltipController(content: .text(strongSelf.presentationData.strings.DialogList_PasscodeLockHelp), dismissByTapOutside: true) + let tooltipController = TooltipController(content: .text(strongSelf.presentationData.strings.DialogList_PasscodeLockHelp), baseFontSize: strongSelf.presentationData.fontSize.baseDisplaySize, dismissByTapOutside: true) strongSelf.present(tooltipController, in: .window(.root), with: TooltipControllerPresentationArguments(sourceViewAndRect: { [weak self] in if let strongSelf = self { return (strongSelf.titleView, lockViewFrame.offsetBy(dx: 4.0, dy: 14.0)) @@ -1199,7 +1199,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, self?.donePressed() }) } else if case .right = action, !peerIds.isEmpty { - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetButtonItem(title: self.presentationData.strings.ChatList_DeleteConfirmation(Int32(peerIds.count)), color: .destructive, action: { [weak self, weak actionSheet] in actionSheet?.dismissAnimated() @@ -1385,7 +1385,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, if let user = chatPeer as? TelegramUser, user.botInfo == nil, canRemoveGlobally { strongSelf.maybeAskForPeerChatRemoval(peer: peer, completion: { _ in }, removed: {}) } else { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] var canClear = true var canStop = false @@ -1468,7 +1468,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, } if canRemoveGlobally { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(DeleteChatPeerActionSheetItem(context: strongSelf.context, peer: mainPeer, chatPeer: chatPeer, action: .clearHistory, strings: strongSelf.presentationData.strings, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder)) @@ -1556,7 +1556,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, } if canRemoveGlobally { - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) var items: [ActionSheetItem] = [] items.append(DeleteChatPeerActionSheetItem(context: self.context, peer: mainPeer, chatPeer: chatPeer, action: .delete, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder)) diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift index f06e3fb0b5..83dc27d38a 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift @@ -774,7 +774,10 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { let enableChatListPhotos = item.context.sharedContext.immediateExperimentalUISettings.chatListPhotos - let leftInset: CGFloat = params.leftInset + 78.0 + let avatarDiameter = floor(item.presentationData.fontSize.baseDisplaySize * 60.0 / 17.0) + let avatarLeftInset = 18.0 + avatarDiameter + + let leftInset: CGFloat = params.leftInset + avatarLeftInset enum ContentData { case chat(itemPeer: RenderedPeer, peer: Peer?, hideAuthor: Bool, messageText: String) @@ -1337,7 +1340,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { transition.updateAlpha(node: strongSelf.statusNode, alpha: 1.0) } - let avatarFrame = CGRect(origin: CGPoint(x: leftInset - 78.0 + editingOffset + 10.0 + revealOffset, y: floor((layout.contentSize.height - 60.0) / 2.0)), size: CGSize(width: 60.0, height: 60.0)) + let avatarFrame = CGRect(origin: CGPoint(x: leftInset - avatarLeftInset + editingOffset + 10.0 + revealOffset, y: floor((layout.contentSize.height - avatarDiameter) / 2.0)), size: CGSize(width: avatarDiameter, height: avatarDiameter)) transition.updateFrame(node: strongSelf.avatarNode, frame: avatarFrame) let onlineFrame = CGRect(origin: CGPoint(x: avatarFrame.maxX - onlineLayout.width - 2.0, y: avatarFrame.maxY - onlineLayout.height - 2.0), size: onlineLayout) @@ -1417,7 +1420,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { strongSelf.secretIconNode = iconNode } iconNode.image = currentSecretIconImage - transition.updateFrame(node: iconNode, frame: CGRect(origin: CGPoint(x: contentRect.origin.x, y: contentRect.origin.y + 4.0), size: currentSecretIconImage.size)) + transition.updateFrame(node: iconNode, frame: CGRect(origin: CGPoint(x: contentRect.origin.x, y: contentRect.origin.y + floor((strongSelf.titleNode.frame.height - currentSecretIconImage.size.height) / 2.0)), size: currentSecretIconImage.size)) titleOffset += currentSecretIconImage.size.width + 3.0 } else if let secretIconNode = strongSelf.secretIconNode { strongSelf.secretIconNode = nil @@ -1616,7 +1619,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { override func updateRevealOffset(offset: CGFloat, transition: ContainedViewLayoutTransition) { super.updateRevealOffset(offset: offset, transition: transition) - if let _ = self.item, let params = self.layoutParams?.5, let countersSize = self.layoutParams?.6 { + if let item = self.item, let params = self.layoutParams?.5, let countersSize = self.layoutParams?.6 { let editingOffset: CGFloat if let selectableControlNode = self.selectableControlNode { editingOffset = selectableControlNode.bounds.size.width @@ -1635,14 +1638,17 @@ class ChatListItemNode: ItemListRevealOptionsItemNode { transition.updateFrame(node: reorderControlNode, frame: reorderControlFrame) } - let leftInset: CGFloat = params.leftInset + 78.0 + let avatarDiameter = floor(item.presentationData.fontSize.baseDisplaySize * 60.0 / 17.0) + let avatarLeftInset = 18.0 + avatarDiameter + + let leftInset: CGFloat = params.leftInset + avatarLeftInset let rawContentRect = CGRect(origin: CGPoint(x: 2.0, y: layoutOffset + 8.0), size: CGSize(width: params.width - leftInset - params.rightInset - 10.0 - 1.0 - editingOffset, height: self.bounds.size.height - 12.0 - 9.0)) let contentRect = rawContentRect.offsetBy(dx: editingOffset + leftInset + offset, dy: 0.0) var avatarFrame = self.avatarNode.frame - avatarFrame.origin.x = leftInset - 78.0 + editingOffset + 10.0 + offset + avatarFrame.origin.x = leftInset - avatarLeftInset + editingOffset + 10.0 + offset transition.updateFrame(node: self.avatarNode, frame: avatarFrame) var onlineFrame = self.onlineNode.frame diff --git a/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift b/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift index d927b769f1..73d9d2f377 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift @@ -40,7 +40,9 @@ public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder: processed = true break inner case let .Audio(isVoice, _, title, performer, _): - if isVoice { + if !message.text.isEmpty { + messageText = "🎤 \(messageText)" + } else if isVoice { if message.text.isEmpty { messageText = strings.Message_Audio } else { diff --git a/submodules/ContactListUI/Sources/ContactsController.swift b/submodules/ContactListUI/Sources/ContactsController.swift index 7597864b6b..7dcfc4b716 100644 --- a/submodules/ContactListUI/Sources/ContactsController.swift +++ b/submodules/ContactListUI/Sources/ContactsController.swift @@ -495,7 +495,7 @@ public class ContactsController: ViewController { } } - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: self.presentationData.strings.Contacts_SortBy)) items.append(ActionSheetButtonItem(title: self.presentationData.strings.Contacts_SortByName, color: .accent, action: { [weak actionSheet] in diff --git a/submodules/ContactListUI/Sources/ContactsControllerNode.swift b/submodules/ContactListUI/Sources/ContactsControllerNode.swift index ee7fcb6e3f..d994543130 100644 --- a/submodules/ContactListUI/Sources/ContactsControllerNode.swift +++ b/submodules/ContactListUI/Sources/ContactsControllerNode.swift @@ -193,7 +193,7 @@ final class ContactsControllerNode: ASDisplayNode { } let chatController = self.context.sharedContext.makeChatController(context: self.context, chatLocation: .peer(peer.id), subject: nil, botStart: nil, mode: .standard(previewing: true)) chatController.canReadHistory.set(false) - let contextController = ContextController(account: self.context.account, theme: self.presentationData.theme, strings: self.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: contactContextMenuItems(context: self.context, peerId: peer.id, contactsController: contactsController), reactionItems: [], gesture: gesture) + let contextController = ContextController(account: self.context.account, presentationData: self.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: contactContextMenuItems(context: self.context, peerId: peer.id, contactsController: contactsController), reactionItems: [], gesture: gesture) contactsController.presentInGlobalOverlay(contextController) } diff --git a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift index e12b099d7f..c8e3cd9323 100644 --- a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift +++ b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift @@ -435,7 +435,8 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode { let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize) let titleBoldFont = Font.medium(item.presentationData.fontSize.itemListBaseFontSize) let statusFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 13.0 / 17.0)) - let badgeFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 14.0 / 17.0)) + let badgeFont = Font.regular(14.0) + let avatarDiameter = min(40.0, floor(item.presentationData.fontSize.itemListBaseFontSize * 40.0 / 17.0)) if currentItem?.presentationData.theme !== item.presentationData.theme { updatedTheme = item.presentationData.theme @@ -611,7 +612,8 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode { let (statusLayout, statusApply) = makeStatusLayout(TextNodeLayoutArguments(attributedString: statusAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(0.0, params.width - leftInset - rightInset - badgeSize), height: CGFloat.infinity), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let verticalInset: CGFloat = statusAttributedString == nil ? 11.0 : 6.0 + let titleVerticalInset: CGFloat = statusAttributedString == nil ? 13.0 : 6.0 + let verticalInset: CGFloat = statusAttributedString == nil ? 13.0 : 6.0 let statusHeightComponent: CGFloat if statusAttributedString == nil { @@ -624,7 +626,7 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode { let titleFrame: CGRect if statusAttributedString != nil { - titleFrame = CGRect(origin: CGPoint(x: leftInset, y: verticalInset), size: titleLayout.size) + titleFrame = CGRect(origin: CGPoint(x: leftInset, y: titleVerticalInset), size: titleLayout.size) } else { titleFrame = CGRect(origin: CGPoint(x: leftInset, y: floor((nodeLayout.contentSize.height - titleLayout.size.height) / 2.0)), size: titleLayout.size) } @@ -707,7 +709,7 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode { strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor } - transition.updateFrame(node: strongSelf.avatarNode, frame: CGRect(origin: CGPoint(x: revealOffset + leftInset - 50.0, y: floor((nodeLayout.contentSize.height - 40.0) / 2.0)), size: CGSize(width: 40.0, height: 40.0))) + transition.updateFrame(node: strongSelf.avatarNode, frame: CGRect(origin: CGPoint(x: revealOffset + leftInset - 50.0, y: floor((nodeLayout.contentSize.height - avatarDiameter) / 2.0)), size: CGSize(width: avatarDiameter, height: avatarDiameter))) let _ = titleApply() transition.updateFrame(node: strongSelf.titleNode, frame: titleFrame.offsetBy(dx: revealOffset, dy: 0.0)) diff --git a/submodules/ContextUI/Sources/ContextActionNode.swift b/submodules/ContextUI/Sources/ContextActionNode.swift index 470101545a..60d6ec0573 100644 --- a/submodules/ContextUI/Sources/ContextActionNode.swift +++ b/submodules/ContextUI/Sources/ContextActionNode.swift @@ -3,8 +3,6 @@ import AsyncDisplayKit import Display import TelegramPresentationData -private let textFont = Font.regular(17.0) - enum ContextActionSibling { case none case item @@ -23,17 +21,19 @@ final class ContextActionNode: ASDisplayNode { private let iconNode: ASImageNode private let buttonNode: HighlightTrackingButtonNode - init(theme: PresentationTheme, action: ContextMenuActionItem, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) { + init(presentationData: PresentationData, action: ContextMenuActionItem, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) { self.action = action self.getController = getController self.actionSelected = actionSelected + let textFont = Font.regular(presentationData.fontSize.baseDisplaySize) + self.backgroundNode = ASDisplayNode() self.backgroundNode.isAccessibilityElement = false - self.backgroundNode.backgroundColor = theme.contextMenu.itemBackgroundColor + self.backgroundNode.backgroundColor = presentationData.theme.contextMenu.itemBackgroundColor self.highlightedBackgroundNode = ASDisplayNode() self.highlightedBackgroundNode.isAccessibilityElement = false - self.highlightedBackgroundNode.backgroundColor = theme.contextMenu.itemHighlightedBackgroundColor + self.highlightedBackgroundNode.backgroundColor = presentationData.theme.contextMenu.itemHighlightedBackgroundColor self.highlightedBackgroundNode.alpha = 0.0 self.textNode = ImmediateTextNode() @@ -43,9 +43,9 @@ final class ContextActionNode: ASDisplayNode { let textColor: UIColor switch action.textColor { case .primary: - textColor = theme.contextMenu.primaryColor + textColor = presentationData.theme.contextMenu.primaryColor case .destructive: - textColor = theme.contextMenu.destructiveColor + textColor = presentationData.theme.contextMenu.destructiveColor } self.textNode.attributedText = NSAttributedString(string: action.text, font: textFont, textColor: textColor) @@ -62,7 +62,7 @@ final class ContextActionNode: ASDisplayNode { statusNode.isAccessibilityElement = false statusNode.isUserInteractionEnabled = false statusNode.displaysAsynchronously = false - statusNode.attributedText = NSAttributedString(string: value, font: textFont, textColor: theme.contextMenu.secondaryColor) + statusNode.attributedText = NSAttributedString(string: value, font: textFont, textColor: presentationData.theme.contextMenu.secondaryColor) statusNode.maximumNumberOfLines = 1 self.statusNode = statusNode } @@ -72,7 +72,7 @@ final class ContextActionNode: ASDisplayNode { self.iconNode.displaysAsynchronously = false self.iconNode.displayWithoutProcessing = true self.iconNode.isUserInteractionEnabled = false - self.iconNode.image = action.icon(theme) + self.iconNode.image = action.icon(presentationData.theme) self.buttonNode = HighlightTrackingButtonNode() self.buttonNode.isAccessibilityElement = true @@ -149,27 +149,30 @@ final class ContextActionNode: ASDisplayNode { } } - func updateTheme(theme: PresentationTheme) { - self.backgroundNode.backgroundColor = theme.contextMenu.itemBackgroundColor - self.highlightedBackgroundNode.backgroundColor = theme.contextMenu.itemHighlightedBackgroundColor + func updateTheme(presentationData: PresentationData) { + self.backgroundNode.backgroundColor = presentationData.theme.contextMenu.itemBackgroundColor + self.highlightedBackgroundNode.backgroundColor = presentationData.theme.contextMenu.itemHighlightedBackgroundColor let textColor: UIColor switch action.textColor { case .primary: - textColor = theme.contextMenu.primaryColor + textColor = presentationData.theme.contextMenu.primaryColor case .destructive: - textColor = theme.contextMenu.destructiveColor + textColor = presentationData.theme.contextMenu.destructiveColor } + + let textFont = Font.regular(presentationData.fontSize.baseDisplaySize) + self.textNode.attributedText = NSAttributedString(string: self.action.text, font: textFont, textColor: textColor) switch self.action.textLayout { case let .secondLineWithValue(value): - self.statusNode?.attributedText = NSAttributedString(string: value, font: textFont, textColor: theme.contextMenu.secondaryColor) + self.statusNode?.attributedText = NSAttributedString(string: value, font: textFont, textColor: presentationData.theme.contextMenu.secondaryColor) default: break } - self.iconNode.image = self.action.icon(theme) + self.iconNode.image = self.action.icon(presentationData.theme) } @objc private func buttonPressed() { diff --git a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift index 23e68aa31f..ebc6bf1d49 100644 --- a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift +++ b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift @@ -39,7 +39,7 @@ private enum ContextItemNode { } final class ContextActionsContainerNode: ASDisplayNode { - private let theme: PresentationTheme + private let presentationData: PresentationData private var effectView: UIVisualEffectView? private var itemNodes: [ContextItemNode] private let feedbackTap: () -> Void @@ -47,23 +47,23 @@ final class ContextActionsContainerNode: ASDisplayNode { private(set) var gesture: UIGestureRecognizer? private var currentHighlightedActionNode: ContextActionNode? - init(theme: PresentationTheme, items: [ContextMenuItem], getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void, feedbackTap: @escaping () -> Void) { - self.theme = theme + init(presentationData: PresentationData, items: [ContextMenuItem], getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void, feedbackTap: @escaping () -> Void) { + self.presentationData = presentationData self.feedbackTap = feedbackTap var itemNodes: [ContextItemNode] = [] for i in 0 ..< items.count { switch items[i] { case let .action(action): - itemNodes.append(.action(ContextActionNode(theme: theme, action: action, getController: getController, actionSelected: actionSelected))) + itemNodes.append(.action(ContextActionNode(presentationData: presentationData, action: action, getController: getController, actionSelected: actionSelected))) if i != items.count - 1, case .action = items[i + 1] { let separatorNode = ASDisplayNode() - separatorNode.backgroundColor = theme.contextMenu.itemSeparatorColor + separatorNode.backgroundColor = presentationData.theme.contextMenu.itemSeparatorColor itemNodes.append(.itemSeparator(separatorNode)) } case .separator: let separatorNode = ASDisplayNode() - separatorNode.backgroundColor = theme.contextMenu.sectionSeparatorColor + separatorNode.backgroundColor = presentationData.theme.contextMenu.sectionSeparatorColor itemNodes.append(.separator(separatorNode)) } } @@ -75,7 +75,7 @@ final class ContextActionsContainerNode: ASDisplayNode { self.clipsToBounds = true self.cornerRadius = 14.0 - self.backgroundColor = theme.contextMenu.backgroundColor + self.backgroundColor = presentationData.theme.contextMenu.backgroundColor self.itemNodes.forEach({ itemNode in switch itemNode { @@ -133,7 +133,7 @@ final class ContextActionsContainerNode: ASDisplayNode { if self.effectView == nil { let effectView: UIVisualEffectView if #available(iOS 13.0, *) { - if self.theme.overallDarkAppearance { + if self.presentationData.theme.overallDarkAppearance { effectView = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterialDark)) } else { effectView = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterialLight)) @@ -213,19 +213,19 @@ final class ContextActionsContainerNode: ASDisplayNode { return size } - func updateTheme(theme: PresentationTheme) { + func updateTheme(presentationData: PresentationData) { for itemNode in self.itemNodes { switch itemNode { case let .action(action): - action.updateTheme(theme: theme) + action.updateTheme(presentationData: presentationData) case let .separator(separator): - separator.backgroundColor = theme.contextMenu.sectionSeparatorColor + separator.backgroundColor = presentationData.theme.contextMenu.sectionSeparatorColor case let .itemSeparator(itemSeparator): - itemSeparator.backgroundColor = theme.contextMenu.itemSeparatorColor + itemSeparator.backgroundColor = presentationData.theme.contextMenu.itemSeparatorColor } } - self.backgroundColor = theme.contextMenu.backgroundColor + self.backgroundColor = presentationData.theme.contextMenu.backgroundColor } func actionNode(at point: CGPoint) -> ContextActionNode? { diff --git a/submodules/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift index 1b5b1bb37d..7a3ef594cf 100644 --- a/submodules/ContextUI/Sources/ContextController.swift +++ b/submodules/ContextUI/Sources/ContextController.swift @@ -60,8 +60,7 @@ private func convertFrame(_ frame: CGRect, from fromView: UIView, to toView: UIV } private final class ContextControllerNode: ViewControllerTracingNode, UIScrollViewDelegate { - private var theme: PresentationTheme - private var strings: PresentationStrings + private var presentationData: PresentationData private let source: ContextContentSource private var items: Signal<[ContextMenuItem], NoError> private let beginDismiss: (ContextMenuActionResult) -> Void @@ -108,9 +107,8 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi private let itemsDisposable = MetaDisposable() - init(account: Account, controller: ContextController, theme: PresentationTheme, strings: PresentationStrings, 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) { - self.theme = theme - self.strings = strings + 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) { + self.presentationData = presentationData self.source = source self.items = items self.beginDismiss = beginDismiss @@ -126,7 +124,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi self.effectView = UIVisualEffectView() if #available(iOS 9.0, *) { } else { - if theme.rootController.keyboardColor == .dark { + if presentationData.theme.rootController.keyboardColor == .dark { self.effectView.effect = UIBlurEffect(style: .dark) } else { self.effectView.effect = UIBlurEffect(style: .light) @@ -135,7 +133,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi } self.dimNode = ASDisplayNode() - self.dimNode.backgroundColor = theme.contextMenu.dimColor + self.dimNode.backgroundColor = presentationData.theme.contextMenu.dimColor self.dimNode.alpha = 0.0 self.withoutBlurDimNode = ASDisplayNode() @@ -159,7 +157,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi var feedbackTap: (() -> Void)? - self.actionsContainerNode = ContextActionsContainerNode(theme: theme, items: [], getController: { [weak controller] in + self.actionsContainerNode = ContextActionsContainerNode(presentationData: presentationData, items: [], getController: { [weak controller] in return controller }, actionSelected: { result in beginDismiss(result) @@ -168,7 +166,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi }) if !reactionItems.isEmpty { - let reactionContextNode = ReactionContextNode(account: account, theme: theme, items: reactionItems) + let reactionContextNode = ReactionContextNode(account: account, theme: presentationData.theme, items: reactionItems) self.reactionContextNode = reactionContextNode } else { self.reactionContextNode = nil @@ -966,7 +964,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi self.currentItems = items let previousActionsContainerNode = self.actionsContainerNode - self.actionsContainerNode = ContextActionsContainerNode(theme: self.theme, items: items, getController: { [weak self] in + self.actionsContainerNode = ContextActionsContainerNode(presentationData: self.presentationData, items: items, getController: { [weak self] in return self?.getController() }, actionSelected: { [weak self] result in self?.beginDismiss(result) @@ -988,11 +986,11 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi } } - func updateTheme(theme: PresentationTheme) { - self.theme = theme + func updateTheme(presentationData: PresentationData) { + self.presentationData = presentationData - self.dimNode.backgroundColor = theme.contextMenu.dimColor - self.actionsContainerNode.updateTheme(theme: theme) + self.dimNode.backgroundColor = presentationData.theme.contextMenu.dimColor + self.actionsContainerNode.updateTheme(presentationData: presentationData) if let validLayout = self.validLayout { self.updateLayout(layout: validLayout, transition: .immediate, previousActionsContainerNode: nil) @@ -1364,8 +1362,7 @@ public enum ContextContentSource { public final class ContextController: ViewController, StandalonePresentableController { private let account: Account - private var theme: PresentationTheme - private var strings: PresentationStrings + private var presentationData: PresentationData private let source: ContextContentSource private var items: Signal<[ContextMenuItem], NoError> private var reactionItems: [ReactionContextItem] @@ -1387,10 +1384,9 @@ public final class ContextController: ViewController, StandalonePresentableContr public var reactionSelected: ((String) -> Void)? - public init(account: Account, theme: PresentationTheme, strings: PresentationStrings, 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) { self.account = account - self.theme = theme - self.strings = strings + self.presentationData = presentationData self.source = source self.items = items self.reactionItems = reactionItems @@ -1407,7 +1403,7 @@ public final class ContextController: ViewController, StandalonePresentableContr } override public func loadDisplayNode() { - self.displayNode = ContextControllerNode(account: self.account, controller: self, theme: self.theme, strings: self.strings, source: self.source, items: self.items, reactionItems: self.reactionItems, beginDismiss: { [weak self] result in + self.displayNode = ContextControllerNode(account: self.account, controller: self, presentationData: self.presentationData, source: self.source, items: self.items, reactionItems: self.reactionItems, beginDismiss: { [weak self] result in self?.dismiss(result: result, completion: nil) }, recognizer: self.recognizer, gesture: self.gesture, reactionSelected: { [weak self] value in guard let strongSelf = self else { @@ -1464,10 +1460,10 @@ public final class ContextController: ViewController, StandalonePresentableContr } } - public func updateTheme(theme: PresentationTheme) { - self.theme = theme + public func updateTheme(presentationData: PresentationData) { + self.presentationData = presentationData if self.isNodeLoaded { - self.controllerNode.updateTheme(theme: theme) + self.controllerNode.updateTheme(presentationData: presentationData) } } diff --git a/submodules/DateSelectionUI/Sources/DateSelectionActionSheetController.swift b/submodules/DateSelectionUI/Sources/DateSelectionActionSheetController.swift index b11e3572ca..ee5ee5f509 100644 --- a/submodules/DateSelectionUI/Sources/DateSelectionActionSheetController.swift +++ b/submodules/DateSelectionUI/Sources/DateSelectionActionSheetController.swift @@ -20,11 +20,11 @@ public final class DateSelectionActionSheetController: ActionSheetController { let theme = presentationData.theme let strings = presentationData.strings - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self.presentationDisposable = context.sharedContext.presentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) diff --git a/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift b/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift index bbaefbcb19..0501a4e5bd 100644 --- a/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift +++ b/submodules/DeleteChatPeerActionSheetItem/Sources/DeleteChatPeerActionSheetItem.swift @@ -56,6 +56,8 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode { self.theme = theme self.strings = strings + let peerFont = Font.regular(floor(theme.baseFontSize * 14.0 / 17.0)) + self.avatarNode = AvatarNode(font: avatarFont) self.avatarNode.isAccessibilityElement = false @@ -88,9 +90,9 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode { case .clearCache, .clearCacheSuggestion: switch action { case .clearCache: - attributedText = NSAttributedString(string: strings.ClearCache_Description, font: Font.regular(14.0), textColor: theme.primaryTextColor) + attributedText = NSAttributedString(string: strings.ClearCache_Description, font: peerFont, textColor: theme.primaryTextColor) case .clearCacheSuggestion: - attributedText = NSAttributedString(string: strings.ClearCache_FreeSpaceDescription, font: Font.regular(14.0), textColor: theme.primaryTextColor) + attributedText = NSAttributedString(string: strings.ClearCache_FreeSpaceDescription, font: peerFont, textColor: theme.primaryTextColor) default: break } @@ -115,9 +117,9 @@ private final class DeleteChatPeerActionSheetItemNode: ActionSheetItemNode { break } if let text = text { - var formattedAttributedText = NSMutableAttributedString(attributedString: NSAttributedString(string: text.0, font: Font.regular(14.0), textColor: theme.primaryTextColor)) + var formattedAttributedText = NSMutableAttributedString(attributedString: NSAttributedString(string: text.0, font: peerFont, textColor: theme.primaryTextColor)) for (_, range) in text.1 { - formattedAttributedText.addAttribute(.font, value: Font.semibold(14.0), range: range) + formattedAttributedText.addAttribute(.font, value: peerFont, range: range) } attributedText = formattedAttributedText } diff --git a/submodules/DeviceAccess/Sources/DeviceAccess.swift b/submodules/DeviceAccess/Sources/DeviceAccess.swift index 07ead01aa2..9c5cb76da8 100644 --- a/submodules/DeviceAccess/Sources/DeviceAccess.swift +++ b/submodules/DeviceAccess/Sources/DeviceAccess.swift @@ -244,7 +244,7 @@ public final class DeviceAccess { } } - public static func authorizeAccess(to subject: DeviceAccessSubject, registerForNotifications: ((@escaping (Bool) -> Void) -> Void)? = nil, requestSiriAuthorization: ((@escaping (Bool) -> Void) -> Void)? = nil, presentationData: PresentationData? = nil, present: @escaping (ViewController, Any?) -> Void = { _, _ in }, openSettings: @escaping () -> Void = { }, displayNotificationFromBackground: @escaping (String) -> Void = { _ in }, _ completion: @escaping (Bool) -> Void = { _ in }) { + public static func authorizeAccess(to subject: DeviceAccessSubject, registerForNotifications: ((@escaping (Bool) -> Void) -> Void)? = nil, requestSiriAuthorization: ((@escaping (Bool) -> Void) -> Void)? = nil, locationManager: CLLocationManager? = nil, presentationData: PresentationData? = nil, present: @escaping (ViewController, Any?) -> Void = { _, _ in }, openSettings: @escaping () -> Void = { }, displayNotificationFromBackground: @escaping (String) -> Void = { _ in }, _ completion: @escaping (Bool) -> Void = { _ in }) { switch subject { case .camera: let status = PGCamera.cameraAuthorizationStatus() @@ -382,7 +382,14 @@ public final class DeviceAccess { })]), nil) } case .notDetermined: - completion(true) + switch locationSubject { + case .send: + locationManager?.requestWhenInUseAuthorization() + case .live: + locationManager?.requestAlwaysAuthorization() + default: + break + } @unknown default: fatalError() } diff --git a/submodules/Display/Display/ActionSheetButtonItem.swift b/submodules/Display/Display/ActionSheetButtonItem.swift index d5e66cb69e..89abbaf404 100644 --- a/submodules/Display/Display/ActionSheetButtonItem.swift +++ b/submodules/Display/Display/ActionSheetButtonItem.swift @@ -47,8 +47,8 @@ public class ActionSheetButtonItem: ActionSheetItem { public class ActionSheetButtonNode: ActionSheetItemNode { private let theme: ActionSheetControllerTheme - public static let defaultFont: UIFont = Font.regular(20.0) - public static let boldFont: UIFont = Font.medium(20.0) + private let defaultFont: UIFont + private let boldFont: UIFont private var item: ActionSheetButtonItem? @@ -59,6 +59,9 @@ public class ActionSheetButtonNode: ActionSheetItemNode { override public init(theme: ActionSheetControllerTheme) { self.theme = theme + self.defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + self.boldFont = Font.medium(floor(theme.baseFontSize * 20.0 / 17.0)) + self.button = HighlightTrackingButton() self.button.isAccessibilityElement = false @@ -113,9 +116,9 @@ public class ActionSheetButtonNode: ActionSheetItemNode { } switch item.font { case .default: - textFont = ActionSheetButtonNode.defaultFont + textFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) case .bold: - textFont = ActionSheetButtonNode.boldFont + textFont = Font.medium(floor(theme.baseFontSize * 20.0 / 17.0)) } self.label.attributedText = NSAttributedString(string: item.title, font: textFont, textColor: textColor) self.label.isAccessibilityElement = false diff --git a/submodules/Display/Display/ActionSheetCheckboxItem.swift b/submodules/Display/Display/ActionSheetCheckboxItem.swift index 7c4f7acfdc..a24220e064 100644 --- a/submodules/Display/Display/ActionSheetCheckboxItem.swift +++ b/submodules/Display/Display/ActionSheetCheckboxItem.swift @@ -39,7 +39,7 @@ public class ActionSheetCheckboxItem: ActionSheetItem { } public class ActionSheetCheckboxItemNode: ActionSheetItemNode { - public static let defaultFont: UIFont = Font.regular(20.0) + private let defaultFont: UIFont private let theme: ActionSheetControllerTheme @@ -54,6 +54,7 @@ public class ActionSheetCheckboxItemNode: ActionSheetItemNode { override public init(theme: ActionSheetControllerTheme) { self.theme = theme + self.defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) self.button = HighlightTrackingButton() self.button.isAccessibilityElement = false @@ -118,8 +119,10 @@ public class ActionSheetCheckboxItemNode: ActionSheetItemNode { func setItem(_ item: ActionSheetCheckboxItem) { self.item = item - self.titleNode.attributedText = NSAttributedString(string: item.title, font: ActionSheetCheckboxItemNode.defaultFont, textColor: self.theme.primaryTextColor) - self.labelNode.attributedText = NSAttributedString(string: item.label, font: ActionSheetCheckboxItemNode.defaultFont, textColor: self.theme.secondaryTextColor) + let defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + + self.titleNode.attributedText = NSAttributedString(string: item.title, font: defaultFont, textColor: self.theme.primaryTextColor) + self.labelNode.attributedText = NSAttributedString(string: item.label, font: defaultFont, textColor: self.theme.secondaryTextColor) self.checkNode.isHidden = !item.value self.accessibilityArea.accessibilityLabel = item.title diff --git a/submodules/Display/Display/ActionSheetSwitchItem.swift b/submodules/Display/Display/ActionSheetSwitchItem.swift index 01eb3678de..7dddc07701 100644 --- a/submodules/Display/Display/ActionSheetSwitchItem.swift +++ b/submodules/Display/Display/ActionSheetSwitchItem.swift @@ -42,6 +42,7 @@ public class ActionSheetSwitchNode: ActionSheetItemNode { override public init(theme: ActionSheetControllerTheme) { self.theme = theme + let defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) self.button = HighlightTrackingButton() self.button.isAccessibilityElement = false @@ -85,7 +86,9 @@ public class ActionSheetSwitchNode: ActionSheetItemNode { func setItem(_ item: ActionSheetSwitchItem) { self.item = item - self.label.attributedText = NSAttributedString(string: item.title, font: ActionSheetButtonNode.defaultFont, textColor: self.theme.primaryTextColor) + let defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + + self.label.attributedText = NSAttributedString(string: item.title, font: defaultFont, textColor: self.theme.primaryTextColor) self.label.isAccessibilityElement = false self.switchNode.isOn = item.isOn diff --git a/submodules/Display/Display/ActionSheetTextItem.swift b/submodules/Display/Display/ActionSheetTextItem.swift index 5102185f61..7b65015f8d 100644 --- a/submodules/Display/Display/ActionSheetTextItem.swift +++ b/submodules/Display/Display/ActionSheetTextItem.swift @@ -26,7 +26,7 @@ public class ActionSheetTextItem: ActionSheetItem { } public class ActionSheetTextNode: ActionSheetItemNode { - public static let defaultFont: UIFont = Font.regular(13.0) + private let defaultFont: UIFont private let theme: ActionSheetControllerTheme @@ -38,6 +38,7 @@ public class ActionSheetTextNode: ActionSheetItemNode { override public init(theme: ActionSheetControllerTheme) { self.theme = theme + self.defaultFont = Font.regular(floor(theme.baseFontSize * 13.0 / 17.0)) self.label = ASTextNode() self.label.isUserInteractionEnabled = false @@ -60,7 +61,9 @@ public class ActionSheetTextNode: ActionSheetItemNode { func setItem(_ item: ActionSheetTextItem) { self.item = item - self.label.attributedText = NSAttributedString(string: item.title, font: ActionSheetTextNode.defaultFont, textColor: self.theme.secondaryTextColor, paragraphAlignment: .center) + let defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + + self.label.attributedText = NSAttributedString(string: item.title, font: defaultFont, textColor: self.theme.secondaryTextColor, paragraphAlignment: .center) self.accessibilityArea.accessibilityLabel = item.title self.setNeedsLayout() diff --git a/submodules/Display/Display/ActionSheetTheme.swift b/submodules/Display/Display/ActionSheetTheme.swift index 1911cb8b3d..89ef25d5f6 100644 --- a/submodules/Display/Display/ActionSheetTheme.swift +++ b/submodules/Display/Display/ActionSheetTheme.swift @@ -21,8 +21,9 @@ public final class ActionSheetControllerTheme: Equatable { public let switchFrameColor: UIColor public let switchContentColor: UIColor public let switchHandleColor: UIColor + public let baseFontSize: CGFloat - public init(dimColor: UIColor, backgroundType: ActionSheetControllerThemeBackgroundType, itemBackgroundColor: UIColor, itemHighlightedBackgroundColor: UIColor, standardActionTextColor: UIColor, destructiveActionTextColor: UIColor, disabledActionTextColor: UIColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, controlAccentColor: UIColor, controlColor: UIColor, switchFrameColor: UIColor, switchContentColor: UIColor, switchHandleColor: UIColor) { + public init(dimColor: UIColor, backgroundType: ActionSheetControllerThemeBackgroundType, itemBackgroundColor: UIColor, itemHighlightedBackgroundColor: UIColor, standardActionTextColor: UIColor, destructiveActionTextColor: UIColor, disabledActionTextColor: UIColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, controlAccentColor: UIColor, controlColor: UIColor, switchFrameColor: UIColor, switchContentColor: UIColor, switchHandleColor: UIColor, baseFontSize: CGFloat) { self.dimColor = dimColor self.backgroundType = backgroundType self.itemBackgroundColor = itemBackgroundColor @@ -37,6 +38,7 @@ public final class ActionSheetControllerTheme: Equatable { self.switchFrameColor = switchFrameColor self.switchContentColor = switchContentColor self.switchHandleColor = switchHandleColor + self.baseFontSize = min(26.0, baseFontSize) } public static func ==(lhs: ActionSheetControllerTheme, rhs: ActionSheetControllerTheme) -> Bool { @@ -82,6 +84,9 @@ public final class ActionSheetControllerTheme: Equatable { if lhs.switchHandleColor != rhs.switchHandleColor { return false } + if lhs.baseFontSize != rhs.baseFontSize { + return false + } return true } } diff --git a/submodules/Display/Display/ImmediateTextNode.swift b/submodules/Display/Display/ImmediateTextNode.swift index 1493c5ff8b..c8c70cc94f 100644 --- a/submodules/Display/Display/ImmediateTextNode.swift +++ b/submodules/Display/Display/ImmediateTextNode.swift @@ -14,6 +14,7 @@ public class ImmediateTextNode: TextNode { public var lineSpacing: CGFloat = 0.0 public var insets: UIEdgeInsets = UIEdgeInsets() public var textShadowColor: UIColor? + public var textStroke: (UIColor, CGFloat)? private var tapRecognizer: TapLongTapOrDoubleTapGestureRecognizer? private var linkHighlightingNode: LinkHighlightingNode? @@ -35,7 +36,7 @@ public class ImmediateTextNode: TextNode { public func updateLayout(_ constrainedSize: CGSize) -> CGSize { let makeLayout = TextNode.asyncLayout(self) - let (layout, apply) = makeLayout(TextNodeLayoutArguments(attributedString: self.attributedText, backgroundColor: nil, maximumNumberOfLines: self.maximumNumberOfLines, truncationType: self.truncationType, constrainedSize: constrainedSize, alignment: self.textAlignment, lineSpacing: self.lineSpacing, cutout: nil, insets: self.insets, textShadowColor: self.textShadowColor)) + let (layout, apply) = makeLayout(TextNodeLayoutArguments(attributedString: self.attributedText, backgroundColor: nil, maximumNumberOfLines: self.maximumNumberOfLines, truncationType: self.truncationType, constrainedSize: constrainedSize, alignment: self.textAlignment, lineSpacing: self.lineSpacing, cutout: nil, insets: self.insets, textShadowColor: self.textShadowColor, textStroke: self.textStroke)) let _ = apply() if layout.numberOfLines > 1 { self.trailingLineWidth = layout.trailingLineWidth diff --git a/submodules/Display/Display/ListView.swift b/submodules/Display/Display/ListView.swift index f730752bf7..eca0ee0c07 100644 --- a/submodules/Display/Display/ListView.swift +++ b/submodules/Display/Display/ListView.swift @@ -2413,7 +2413,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture //print("replay after \(self.itemNodes.map({"\($0.index) \(unsafeAddressOf($0))"}))") } - if let scrollToItem = scrollToItem, !self.areAllItemsOnScreen() { + if let scrollToItem = scrollToItem, !self.areAllItemsOnScreen() || updateSizeAndInsets == nil { self.stopScrolling() for itemNode in self.itemNodes { diff --git a/submodules/Display/Display/TextNode.swift b/submodules/Display/Display/TextNode.swift index 3edfa6c4b3..f5a4c9f75f 100644 --- a/submodules/Display/Display/TextNode.swift +++ b/submodules/Display/Display/TextNode.swift @@ -95,8 +95,9 @@ public final class TextNodeLayoutArguments { public let insets: UIEdgeInsets public let lineColor: UIColor? public let textShadowColor: UIColor? + public let textStroke: (UIColor, CGFloat)? - public init(attributedString: NSAttributedString?, backgroundColor: UIColor? = nil, minimumNumberOfLines: Int = 0, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, constrainedSize: CGSize, alignment: NSTextAlignment = .natural, lineSpacing: CGFloat = 0.12, cutout: TextNodeCutout? = nil, insets: UIEdgeInsets = UIEdgeInsets(), lineColor: UIColor? = nil, textShadowColor: UIColor? = nil) { + public init(attributedString: NSAttributedString?, backgroundColor: UIColor? = nil, minimumNumberOfLines: Int = 0, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, constrainedSize: CGSize, alignment: NSTextAlignment = .natural, lineSpacing: CGFloat = 0.12, cutout: TextNodeCutout? = nil, insets: UIEdgeInsets = UIEdgeInsets(), lineColor: UIColor? = nil, textShadowColor: UIColor? = nil, textStroke: (UIColor, CGFloat)? = nil) { self.attributedString = attributedString self.backgroundColor = backgroundColor self.minimumNumberOfLines = minimumNumberOfLines @@ -109,6 +110,7 @@ public final class TextNodeLayoutArguments { self.insets = insets self.lineColor = lineColor self.textShadowColor = textShadowColor + self.textStroke = textStroke } } @@ -130,9 +132,10 @@ public final class TextNodeLayout: NSObject { fileprivate let blockQuotes: [TextNodeBlockQuote] fileprivate let lineColor: UIColor? fileprivate let textShadowColor: UIColor? + fileprivate let textStroke: (UIColor, CGFloat)? public let hasRTL: Bool - fileprivate init(attributedString: NSAttributedString?, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, constrainedSize: CGSize, alignment: NSTextAlignment, lineSpacing: CGFloat, cutout: TextNodeCutout?, insets: UIEdgeInsets, size: CGSize, rawTextSize: CGSize, truncated: Bool, firstLineOffset: CGFloat, lines: [TextNodeLine], blockQuotes: [TextNodeBlockQuote], backgroundColor: UIColor?, lineColor: UIColor?, textShadowColor: UIColor?) { + fileprivate init(attributedString: NSAttributedString?, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, constrainedSize: CGSize, alignment: NSTextAlignment, lineSpacing: CGFloat, cutout: TextNodeCutout?, insets: UIEdgeInsets, size: CGSize, rawTextSize: CGSize, truncated: Bool, firstLineOffset: CGFloat, lines: [TextNodeLine], blockQuotes: [TextNodeBlockQuote], backgroundColor: UIColor?, lineColor: UIColor?, textShadowColor: UIColor?, textStroke: (UIColor, CGFloat)?) { self.attributedString = attributedString self.maximumNumberOfLines = maximumNumberOfLines self.truncationType = truncationType @@ -150,6 +153,7 @@ public final class TextNodeLayout: NSObject { self.backgroundColor = backgroundColor self.lineColor = lineColor self.textShadowColor = textShadowColor + self.textStroke = textStroke var hasRTL = false for line in lines { if line.isRTL { @@ -780,7 +784,7 @@ public class TextNode: ASDisplayNode { } } - private class func calculateLayout(attributedString: NSAttributedString?, minimumNumberOfLines: Int, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, backgroundColor: UIColor?, constrainedSize: CGSize, alignment: NSTextAlignment, lineSpacingFactor: CGFloat, cutout: TextNodeCutout?, insets: UIEdgeInsets, lineColor: UIColor?, textShadowColor: UIColor?) -> TextNodeLayout { + private class func calculateLayout(attributedString: NSAttributedString?, minimumNumberOfLines: Int, maximumNumberOfLines: Int, truncationType: CTLineTruncationType, backgroundColor: UIColor?, constrainedSize: CGSize, alignment: NSTextAlignment, lineSpacingFactor: CGFloat, cutout: TextNodeCutout?, insets: UIEdgeInsets, lineColor: UIColor?, textShadowColor: UIColor?, textStroke: (UIColor, CGFloat)?) -> TextNodeLayout { if let attributedString = attributedString { let stringLength = attributedString.length @@ -806,7 +810,7 @@ public class TextNode: ASDisplayNode { var maybeTypesetter: CTTypesetter? maybeTypesetter = CTTypesetterCreateWithAttributedString(attributedString as CFAttributedString) if maybeTypesetter == nil { - return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(), rawTextSize: CGSize(), truncated: false, firstLineOffset: 0.0, lines: [], blockQuotes: [], backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor) + return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(), rawTextSize: CGSize(), truncated: false, firstLineOffset: 0.0, lines: [], blockQuotes: [], backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke) } let typesetter = maybeTypesetter! @@ -1010,9 +1014,9 @@ public class TextNode: ASDisplayNode { } } - return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(width: ceil(layoutSize.width) + insets.left + insets.right, height: ceil(layoutSize.height) + insets.top + insets.bottom), rawTextSize: CGSize(width: ceil(rawLayoutSize.width) + insets.left + insets.right, height: ceil(rawLayoutSize.height) + insets.top + insets.bottom), truncated: truncated, firstLineOffset: firstLineOffset, lines: lines, blockQuotes: blockQuotes, backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor) + return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(width: ceil(layoutSize.width) + insets.left + insets.right, height: ceil(layoutSize.height) + insets.top + insets.bottom), rawTextSize: CGSize(width: ceil(rawLayoutSize.width) + insets.left + insets.right, height: ceil(rawLayoutSize.height) + insets.top + insets.bottom), truncated: truncated, firstLineOffset: firstLineOffset, lines: lines, blockQuotes: blockQuotes, backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke) } else { - return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(), rawTextSize: CGSize(), truncated: false, firstLineOffset: 0.0, lines: [], blockQuotes: [], backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor) + return TextNodeLayout(attributedString: attributedString, maximumNumberOfLines: maximumNumberOfLines, truncationType: truncationType, constrainedSize: constrainedSize, alignment: alignment, lineSpacing: lineSpacingFactor, cutout: cutout, insets: insets, size: CGSize(), rawTextSize: CGSize(), truncated: false, firstLineOffset: 0.0, lines: [], blockQuotes: [], backgroundColor: backgroundColor, lineColor: lineColor, textShadowColor: textShadowColor, textStroke: textStroke) } } @@ -1050,6 +1054,14 @@ public class TextNode: ASDisplayNode { context.setShadow(offset: CGSize(width: 0.0, height: 1.0), blur: 0.0, color: textShadowColor.cgColor) } +// if let (textStrokeColor, textStrokeWidth) = layout.textStroke { +// context.setBlendMode(.normal) +// context.setLineCap(.round) +// context.setLineJoin(.round) +// context.setStrokeColor(textStrokeColor.cgColor) +// context.setLineWidth(textStrokeWidth) +// } + let textMatrix = context.textMatrix let textPosition = context.textPosition context.textMatrix = CGAffineTransform(scaleX: 1.0, y: -1.0) @@ -1156,11 +1168,11 @@ public class TextNode: ASDisplayNode { if stringMatch { layout = existingLayout } else { - layout = TextNode.calculateLayout(attributedString: arguments.attributedString, minimumNumberOfLines: arguments.minimumNumberOfLines, maximumNumberOfLines: arguments.maximumNumberOfLines, truncationType: arguments.truncationType, backgroundColor: arguments.backgroundColor, constrainedSize: arguments.constrainedSize, alignment: arguments.alignment, lineSpacingFactor: arguments.lineSpacing, cutout: arguments.cutout, insets: arguments.insets, lineColor: arguments.lineColor, textShadowColor: arguments.textShadowColor) + layout = TextNode.calculateLayout(attributedString: arguments.attributedString, minimumNumberOfLines: arguments.minimumNumberOfLines, maximumNumberOfLines: arguments.maximumNumberOfLines, truncationType: arguments.truncationType, backgroundColor: arguments.backgroundColor, constrainedSize: arguments.constrainedSize, alignment: arguments.alignment, lineSpacingFactor: arguments.lineSpacing, cutout: arguments.cutout, insets: arguments.insets, lineColor: arguments.lineColor, textShadowColor: arguments.textShadowColor, textStroke: arguments.textStroke) updated = true } } else { - layout = TextNode.calculateLayout(attributedString: arguments.attributedString, minimumNumberOfLines: arguments.minimumNumberOfLines, maximumNumberOfLines: arguments.maximumNumberOfLines, truncationType: arguments.truncationType, backgroundColor: arguments.backgroundColor, constrainedSize: arguments.constrainedSize, alignment: arguments.alignment, lineSpacingFactor: arguments.lineSpacing, cutout: arguments.cutout, insets: arguments.insets, lineColor: arguments.lineColor, textShadowColor: arguments.textShadowColor) + layout = TextNode.calculateLayout(attributedString: arguments.attributedString, minimumNumberOfLines: arguments.minimumNumberOfLines, maximumNumberOfLines: arguments.maximumNumberOfLines, truncationType: arguments.truncationType, backgroundColor: arguments.backgroundColor, constrainedSize: arguments.constrainedSize, alignment: arguments.alignment, lineSpacingFactor: arguments.lineSpacing, cutout: arguments.cutout, insets: arguments.insets, lineColor: arguments.lineColor, textShadowColor: arguments.textShadowColor, textStroke: arguments.textStroke) updated = true } diff --git a/submodules/Display/Display/TooltipController.swift b/submodules/Display/Display/TooltipController.swift index 2b440b21b1..f1c103fbcb 100644 --- a/submodules/Display/Display/TooltipController.swift +++ b/submodules/Display/Display/TooltipController.swift @@ -62,6 +62,7 @@ open class TooltipController: ViewController, StandalonePresentableController { } public private(set) var content: TooltipControllerContent + private let baseFontSize: CGFloat open func updateContent(_ content: TooltipControllerContent, animated: Bool, extendTimer: Bool, arrowOnBottom: Bool = true) { if self.content != content { @@ -89,8 +90,9 @@ open class TooltipController: ViewController, StandalonePresentableController { public var dismissed: ((Bool) -> Void)? - public init(content: TooltipControllerContent, timeout: Double = 2.0, dismissByTapOutside: Bool = false, dismissByTapOutsideSource: Bool = false, dismissImmediatelyOnLayoutUpdate: Bool = false, arrowOnBottom: Bool = true) { + public init(content: TooltipControllerContent, baseFontSize: CGFloat, timeout: Double = 2.0, dismissByTapOutside: Bool = false, dismissByTapOutsideSource: Bool = false, dismissImmediatelyOnLayoutUpdate: Bool = false, arrowOnBottom: Bool = true) { self.content = content + self.baseFontSize = baseFontSize self.timeout = timeout self.dismissByTapOutside = dismissByTapOutside self.dismissByTapOutsideSource = dismissByTapOutsideSource @@ -111,7 +113,7 @@ open class TooltipController: ViewController, StandalonePresentableController { } override open func loadDisplayNode() { - self.displayNode = TooltipControllerNode(content: self.content, dismiss: { [weak self] tappedInside in + self.displayNode = TooltipControllerNode(content: self.content, baseFontSize: self.baseFontSize, dismiss: { [weak self] tappedInside in self?.dismiss(tappedInside: tappedInside) }, dismissByTapOutside: self.dismissByTapOutside, dismissByTapOutsideSource: self.dismissByTapOutsideSource) self.controllerNode.arrowOnBottom = self.initialArrowOnBottom diff --git a/submodules/Display/Display/TooltipControllerNode.swift b/submodules/Display/Display/TooltipControllerNode.swift index 3b39885dc0..62b790ca8f 100644 --- a/submodules/Display/Display/TooltipControllerNode.swift +++ b/submodules/Display/Display/TooltipControllerNode.swift @@ -3,6 +3,8 @@ import UIKit import AsyncDisplayKit final class TooltipControllerNode: ASDisplayNode { + private let baseFontSize: CGFloat + private let dismiss: (Bool) -> Void private var validLayout: ContainerViewLayout? @@ -19,7 +21,9 @@ final class TooltipControllerNode: ASDisplayNode { private var dismissedByTouchOutside = false private var dismissByTapOutsideSource = false - init(content: TooltipControllerContent, dismiss: @escaping (Bool) -> Void, dismissByTapOutside: Bool, dismissByTapOutsideSource: Bool) { + init(content: TooltipControllerContent, baseFontSize: CGFloat, dismiss: @escaping (Bool) -> Void, dismissByTapOutside: Bool, dismissByTapOutsideSource: Bool) { + self.baseFontSize = baseFontSize + self.dismissByTapOutside = dismissByTapOutside self.dismissByTapOutsideSource = dismissByTapOutsideSource @@ -33,7 +37,7 @@ final class TooltipControllerNode: ASDisplayNode { if case let .attributedText(text) = content { self.textNode.attributedText = text } else { - self.textNode.attributedText = NSAttributedString(string: content.text, font: Font.regular(14.0), textColor: .white, paragraphAlignment: .center) + self.textNode.attributedText = NSAttributedString(string: content.text, font: Font.regular(floor(baseFontSize * 14.0 / 17.0)), textColor: .white, paragraphAlignment: .center) } self.textNode.isUserInteractionEnabled = false self.textNode.displaysAsynchronously = false @@ -58,7 +62,7 @@ final class TooltipControllerNode: ASDisplayNode { }) self.textNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.12) } - self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(14.0), textColor: .white, paragraphAlignment: .center) + self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(floor(self.baseFontSize * 14.0 / 17.0)), textColor: .white, paragraphAlignment: .center) if let layout = self.validLayout { self.containerLayoutUpdated(layout, transition: transition) } diff --git a/submodules/Display/Display/ViewController.swift b/submodules/Display/Display/ViewController.swift index a350b1e101..454f764476 100644 --- a/submodules/Display/Display/ViewController.swift +++ b/submodules/Display/Display/ViewController.swift @@ -529,7 +529,11 @@ public enum ViewControllerNavigationPresentation { } open func dismiss(completion: (() -> Void)? = nil) { - (self.navigationController as? NavigationController)?.filterController(self, animated: true) + if let navigationController = self.navigationController as? NavigationController { + navigationController.filterController(self, animated: true) + } else { + self.presentingViewController?.dismiss(animated: false, completion: nil) + } } @available(iOSApplicationExtension 9.0, iOS 9.0, *) diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Display/WindowContent.swift index 2a23c98239..dbea7fd16f 100644 --- a/submodules/Display/Display/WindowContent.swift +++ b/submodules/Display/Display/WindowContent.swift @@ -272,6 +272,8 @@ public class Window1 { public var previewThemeAccentColor: UIColor = .blue public var previewThemeDarkBlur: Bool = false + private var shouldNotAnimateLikelyKeyboardAutocorrectionSwitch: Bool = false + public private(set) var forceInCallStatusBarText: String? = nil public var inCallNavigate: (() -> Void)? { didSet { @@ -522,7 +524,15 @@ public class Window1 { transitionCurve = .easeInOut } - strongSelf.updateLayout { $0.update(inputHeight: keyboardHeight.isLessThanOrEqualTo(0.0) ? nil : keyboardHeight, transition: .animated(duration: duration, curve: transitionCurve), overrideTransition: false) } + var transition: ContainedViewLayoutTransition = .animated(duration: duration, curve: transitionCurve) + + if strongSelf.shouldNotAnimateLikelyKeyboardAutocorrectionSwitch, let inputHeight = strongSelf.windowLayout.inputHeight { + if abs(inputHeight - keyboardHeight) <= 44.1 { + transition = .immediate + } + } + + strongSelf.updateLayout { $0.update(inputHeight: keyboardHeight.isLessThanOrEqualTo(0.0) ? nil : keyboardHeight, transition: transition, overrideTransition: false) } } }) @@ -1203,4 +1213,11 @@ public class Window1 { } } } + + public func doNotAnimateLikelyKeyboardAutocorrectionSwitch() { + self.shouldNotAnimateLikelyKeyboardAutocorrectionSwitch = true + DispatchQueue.main.async { + self.shouldNotAnimateLikelyKeyboardAutocorrectionSwitch = false + } + } } diff --git a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift index 6e5b4944a9..4c69e53910 100644 --- a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift +++ b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift @@ -106,6 +106,7 @@ class CaptionScrollWrapperNode: ASDisplayNode { final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScrollViewDelegate { private let context: AccountContext + private var presentationData: PresentationData private var theme: PresentationTheme private var strings: PresentationStrings private var nameOrder: PresentationPersonNameOrder @@ -243,6 +244,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll init(context: AccountContext, presentationData: PresentationData) { self.context = context + self.presentationData = presentationData self.theme = presentationData.theme self.strings = presentationData.strings self.nameOrder = presentationData.nameDisplayOrder @@ -757,7 +759,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll } } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) let items: [ActionSheetItem] = [ ActionSheetButtonItem(title: singleText, color: .destructive, action: { [weak actionSheet] in actionSheet?.dismissAnimated() @@ -787,7 +789,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll private func commitDeleteMessages(_ messages: [Message], ask: Bool) { self.messageContextDisposable.set((self.context.sharedContext.chatAvailableMessageActions(postbox: self.context.account.postbox, accountPeerId: self.context.account.peerId, messageIds: Set(messages.map { $0.id })) |> deliverOnMainQueue).start(next: { [weak self] actions in if let strongSelf = self, let controllerInteration = strongSelf.controllerInteraction, !actions.options.isEmpty { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] var personalPeerName: String? var isChannel = false @@ -947,7 +949,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll } } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) let items: [ActionSheetItem] = [ ActionSheetButtonItem(title: singleText, color: .accent, action: { [weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/GalleryUI/Sources/GalleryController.swift b/submodules/GalleryUI/Sources/GalleryController.swift index 9a0907491a..24ac0a6c2d 100644 --- a/submodules/GalleryUI/Sources/GalleryController.swift +++ b/submodules/GalleryUI/Sources/GalleryController.swift @@ -609,7 +609,7 @@ public class GalleryController: ViewController, StandalonePresentableController } else if canOpenIn { openText = strongSelf.presentationData.strings.Conversation_FileOpenIn } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: cleanUrl)) @@ -652,7 +652,7 @@ public class GalleryController: ViewController, StandalonePresentableController ])]) strongSelf.present(actionSheet, in: .window(.root)) case let .peerMention(peerId, mention): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] if !mention.isEmpty { items.append(ActionSheetTextItem(title: mention)) @@ -677,7 +677,7 @@ public class GalleryController: ViewController, StandalonePresentableController ])]) strongSelf.present(actionSheet, in: .window(.root)) case let .textMention(mention): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: mention), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in @@ -698,7 +698,7 @@ public class GalleryController: ViewController, StandalonePresentableController ])]) strongSelf.present(actionSheet, in: .window(.root)) case let .botCommand(command): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: command)) items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogCopy, color: .accent, action: { [weak actionSheet] in @@ -712,7 +712,7 @@ public class GalleryController: ViewController, StandalonePresentableController ])]) strongSelf.present(actionSheet, in: .window(.root)) case let .hashtag(peerName, hashtag): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: hashtag), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in @@ -734,7 +734,7 @@ public class GalleryController: ViewController, StandalonePresentableController ]) strongSelf.present(actionSheet, in: .window(.root)) case let .timecode(timecode, text): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: text), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in diff --git a/submodules/Geocoding/Sources/Geocoding.swift b/submodules/Geocoding/Sources/Geocoding.swift index 967fe6169a..495f6fc63d 100644 --- a/submodules/Geocoding/Sources/Geocoding.swift +++ b/submodules/Geocoding/Sources/Geocoding.swift @@ -2,6 +2,19 @@ import Foundation import CoreLocation import SwiftSignalKit +public func geocodeLocation(address: String) -> Signal<[CLPlacemark]?, NoError> { + return Signal { subscriber in + let geocoder = CLGeocoder() + geocoder.geocodeAddressString(address) { (placemarks, _) in + subscriber.putNext(placemarks) + subscriber.putCompletion() + } + return ActionDisposable { + geocoder.cancelGeocode() + } + } +} + public func geocodeLocation(dictionary: [String: String]) -> Signal<(Double, Double)?, NoError> { return Signal { subscriber in let geocoder = CLGeocoder() diff --git a/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift b/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift index 8b5da25843..5015a0b383 100644 --- a/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift +++ b/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift @@ -260,7 +260,7 @@ public class InstantPageGalleryController: ViewController, StandalonePresentable if let strongSelf = self { let canOpenIn = availableOpenInOptions(context: context, item: .url(url: url.url)).count > 1 let openText = canOpenIn ? strongSelf.presentationData.strings.Conversation_FileOpenIn : strongSelf.presentationData.strings.Conversation_LinkDialogOpen - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: url.url), ActionSheetButtonItem(title: openText, color: .accent, action: { [weak actionSheet] in diff --git a/submodules/InstantPageUI/Sources/InstantPageTheme.swift b/submodules/InstantPageUI/Sources/InstantPageTheme.swift index 495378975b..61352e34d6 100644 --- a/submodules/InstantPageUI/Sources/InstantPageTheme.swift +++ b/submodules/InstantPageUI/Sources/InstantPageTheme.swift @@ -323,7 +323,7 @@ func instantPageThemeForType(_ type: InstantPageThemeType, settings: InstantPage extension ActionSheetControllerTheme { convenience init(instantPageTheme: InstantPageTheme) { - self.init(dimColor: UIColor(white: 0.0, alpha: 0.4), backgroundType: instantPageTheme.type != .dark ? .light : .dark, itemBackgroundColor: instantPageTheme.overlayPanelColor, itemHighlightedBackgroundColor: instantPageTheme.panelHighlightedBackgroundColor, standardActionTextColor: instantPageTheme.panelAccentColor, destructiveActionTextColor: instantPageTheme.panelAccentColor, disabledActionTextColor: instantPageTheme.panelAccentColor, primaryTextColor: instantPageTheme.textCategories.paragraph.color, secondaryTextColor: instantPageTheme.textCategories.caption.color, controlAccentColor: instantPageTheme.panelAccentColor, controlColor: instantPageTheme.tableBorderColor, switchFrameColor: .white, switchContentColor: .white, switchHandleColor: .white) + self.init(dimColor: UIColor(white: 0.0, alpha: 0.4), backgroundType: instantPageTheme.type != .dark ? .light : .dark, itemBackgroundColor: instantPageTheme.overlayPanelColor, itemHighlightedBackgroundColor: instantPageTheme.panelHighlightedBackgroundColor, standardActionTextColor: instantPageTheme.panelAccentColor, destructiveActionTextColor: instantPageTheme.panelAccentColor, disabledActionTextColor: instantPageTheme.panelAccentColor, primaryTextColor: instantPageTheme.textCategories.paragraph.color, secondaryTextColor: instantPageTheme.textCategories.caption.color, controlAccentColor: instantPageTheme.panelAccentColor, controlColor: instantPageTheme.tableBorderColor, switchFrameColor: .white, switchContentColor: .white, switchHandleColor: .white, baseFontSize: 17.0) } } diff --git a/submodules/ItemListUI/Sources/ItemListItem.swift b/submodules/ItemListUI/Sources/ItemListItem.swift index d9f8746046..0054416f1b 100644 --- a/submodules/ItemListUI/Sources/ItemListItem.swift +++ b/submodules/ItemListUI/Sources/ItemListItem.swift @@ -178,22 +178,7 @@ public final class ItemListPresentationData: Equatable { public extension PresentationFontSize { var itemListBaseHeaderFontSize: CGFloat { - switch self { - case .extraSmall: - return 13.0 - case .small: - return 14.0 - case .medium: - return 15.0 - case .regular: - return 16.0 - case .large: - return 18.0 - case .extraLarge: - return 22.0 - case .extraLargeX2: - return 25.0 - } + return floor(self.itemListBaseFontSize * 13.0 / 17.0) } var itemListBaseFontSize: CGFloat { diff --git a/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift b/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift index 2db5ae0434..007a4cd826 100644 --- a/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift +++ b/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift @@ -14,24 +14,46 @@ public final class ItemListVenueItem: ListViewItem, ItemListItem { let presentationData: ItemListPresentationData let account: Account let venue: TelegramMediaMap - - public let sectionId: ItemListSectionId + let title: String? + let subtitle: String? let style: ItemListStyle let action: (() -> Void)? + let infoAction: (() -> Void)? - public init(presentationData: ItemListPresentationData, account: Account, venue: TelegramMediaMap, sectionId: ItemListSectionId, style: ItemListStyle, action: (() -> Void)?) { + public let sectionId: ItemListSectionId + let header: ListViewItemHeader? + + public init(presentationData: ItemListPresentationData, account: Account, venue: TelegramMediaMap, title: String? = nil, subtitle: String? = nil, sectionId: ItemListSectionId = 0, style: ItemListStyle, action: (() -> Void)?, infoAction: (() -> Void)? = nil, header: ListViewItemHeader? = nil) { self.presentationData = presentationData self.account = account self.venue = venue + self.title = title + self.subtitle = subtitle self.sectionId = sectionId self.style = style self.action = action + self.infoAction = infoAction + self.header = header } public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { async { + var firstWithHeader = false + var last = false + if self.style == .plain { + if previousItem == nil { + firstWithHeader = true + } else if let previousItem = previousItem as? ItemListVenueItem, self.header != nil && previousItem.header?.id != self.header?.id { + firstWithHeader = true + } + if nextItem == nil { + last = true + } else if let nextItem = nextItem as? ItemListVenueItem, self.header != nil && nextItem.header?.id != self.header?.id { + last = true + } + } let node = ItemListVenueItemNode() - let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) + let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem), firstWithHeader, last) node.contentSize = layout.contentSize node.insets = layout.insets @@ -55,7 +77,21 @@ public final class ItemListVenueItem: ListViewItem, ItemListItem { } async { - let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) + var firstWithHeader = false + var last = false + if self.style == .plain { + if previousItem == nil { + firstWithHeader = true + } else if let previousItem = previousItem as? ItemListVenueItem, self.header != nil && previousItem.header?.id != self.header?.id { + firstWithHeader = true + } + if nextItem == nil { + last = true + } else if let nextItem = nextItem as? ItemListVenueItem, self.header != nil && nextItem.header?.id != self.header?.id { + last = true + } + } + let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem), firstWithHeader, last) Queue.mainQueue().async { completion(layout, { _ in apply() @@ -84,8 +120,10 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { private let iconNode: TransformImageNode private let titleNode: TextNode private let addressNode: TextNode + private let infoButton: HighlightableButtonNode - private var layoutParams: (ItemListVenueItem, ListViewItemLayoutParams, ItemListNeighbors)? + private var item: ItemListVenueItem? + private var layoutParams: (ItemListVenueItem, ListViewItemLayoutParams, ItemListNeighbors, Bool, Bool)? public var tag: ItemListItemTag? @@ -119,6 +157,8 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { self.addressNode.isUserInteractionEnabled = false self.addressNode.contentMode = .left self.addressNode.contentsScale = UIScreen.main.scale + + self.infoButton = HighlightableButtonNode() self.highlightedBackgroundNode = ASDisplayNode() self.highlightedBackgroundNode.isLayerBacked = true @@ -130,16 +170,19 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { self.addSubnode(self.iconNode) self.addSubnode(self.titleNode) self.addSubnode(self.addressNode) + self.addSubnode(self.infoButton) + + self.infoButton.addTarget(self, action: #selector(self.infoPressed), forControlEvents: .touchUpInside) } - public func asyncLayout() -> (_ item: ItemListVenueItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + public func asyncLayout() -> (_ item: ItemListVenueItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors, _ firstWithHeader: Bool, _ last: Bool) -> (ListViewItemNodeLayout, () -> Void) { let makeTitleLayout = TextNode.asyncLayout(self.titleNode) let makeAddressLayout = TextNode.asyncLayout(self.addressNode) let iconLayout = self.iconNode.asyncLayout() let currentItem = self.layoutParams?.0 - return { item, params, neighbors in + return { item, params, neighbors, firstWithHeader, last in var updatedTheme: PresentationTheme? var updatedVenueType: String? @@ -155,11 +198,29 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { updatedVenueType = venueType } - let titleAttributedString = NSAttributedString(string: item.venue.venue?.title ?? "", font: titleFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor) - let addressAttributedString = NSAttributedString(string: item.venue.venue?.address ?? "", font: addressFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor) + let title: String + if let venueTitle = item.venue.venue?.title { + title = venueTitle + } else if let customTitle = item.title { + title = customTitle + } else { + title = "" + } + + let subtitle: String + if let address = item.venue.venue?.address { + subtitle = address + } else if let customSubtitle = item.subtitle { + subtitle = customSubtitle + } else { + subtitle = "" + } + + let titleAttributedString = NSAttributedString(string: title, font: titleFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor) + let addressAttributedString = NSAttributedString(string: subtitle, font: addressFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor) let leftInset: CGFloat = 65.0 + params.leftInset - let rightInset: CGFloat = 16.0 + params.rightInset + let rightInset: CGFloat = 16.0 + params.rightInset + (item.infoAction != nil ? 48.0 : 0.0) let verticalInset: CGFloat = addressAttributedString.string.isEmpty ? 14.0 : 8.0 let iconSize: CGFloat = 40.0 @@ -179,6 +240,7 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { itemBackgroundColor = item.presentationData.theme.list.plainBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemPlainSeparatorColor insets = itemListNeighborsPlainInsets(neighbors) + insets.top = firstWithHeader ? 29.0 : 0.0 insets.bottom = 0.0 case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor @@ -193,7 +255,8 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { return (layout, { [weak self] in if let strongSelf = self { - strongSelf.layoutParams = (item, params, neighbors) + strongSelf.item = item + strongSelf.layoutParams = (item, params, neighbors, firstWithHeader, last) strongSelf.accessibilityLabel = titleAttributedString.string strongSelf.accessibilityValue = addressAttributedString.string @@ -203,6 +266,7 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { strongSelf.bottomStripeNode.backgroundColor = itemSeparatorColor strongSelf.backgroundNode.backgroundColor = itemBackgroundColor strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor + strongSelf.infoButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Location/InfoIcon"), color: item.presentationData.theme.list.itemAccentColor), for: .normal) } let transition = ContainedViewLayoutTransition.immediate @@ -239,7 +303,7 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { stripeInset = leftInset } strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: stripeInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - stripeInset, height: separatorHeight)) - strongSelf.bottomStripeNode.isHidden = false + strongSelf.bottomStripeNode.isHidden = last case .blocks: if strongSelf.backgroundNode.supernode == nil { strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0) @@ -287,6 +351,9 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { transition.updateFrame(node: strongSelf.iconNode, frame: CGRect(origin: CGPoint(x: params.leftInset + 15.0, y: floorToScreenPixels((layout.contentSize.height - iconSize) / 2.0)), size: CGSize(width: iconSize, height: iconSize))) + transition.updateFrame(node: strongSelf.infoButton, frame: CGRect(x: layout.contentSize.width - params.rightInset - 60.0, y: 0.0, width: 60.0, height: layout.contentSize.height)) + strongSelf.infoButton.isHidden = item.infoAction == nil + strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: contentSize.height + UIScreenPixel + UIScreenPixel)) } }) @@ -338,4 +405,12 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { override public func animateRemoved(_ currentTimestamp: Double, duration: Double) { self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) } + + @objc private func infoPressed() { + self.item?.infoAction?() + } + + override public func header() -> ListViewItemHeader? { + return self.item?.header + } } diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentCarouselItemView.m b/submodules/LegacyComponents/LegacyComponents/TGAttachmentCarouselItemView.m index 17318f32fd..ed98907ad2 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGAttachmentCarouselItemView.m +++ b/submodules/LegacyComponents/LegacyComponents/TGAttachmentCarouselItemView.m @@ -257,7 +257,7 @@ const NSUInteger TGAttachmentDisplayedAssetLimit = 500; if (_cameraView) [_collectionView addSubview:_cameraView]; - _sendMediaItemView = [[TGMenuSheetButtonItemView alloc] initWithTitle:nil type:TGMenuSheetButtonTypeSend action:^ + _sendMediaItemView = [[TGMenuSheetButtonItemView alloc] initWithTitle:nil type:TGMenuSheetButtonTypeSend fontSize:20.0 action:^ { __strong TGAttachmentCarouselItemView *strongSelf = weakSelf; if (strongSelf != nil && strongSelf.sendPressed != nil) @@ -272,7 +272,7 @@ const NSUInteger TGAttachmentDisplayedAssetLimit = 500; if (!_document) { - _sendFileItemView = [[TGMenuSheetButtonItemView alloc] initWithTitle:nil type:TGMenuSheetButtonTypeDefault action:^ + _sendFileItemView = [[TGMenuSheetButtonItemView alloc] initWithTitle:nil type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGAttachmentCarouselItemView *strongSelf = weakSelf; if (strongSelf != nil && strongSelf.sendPressed != nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraController.m b/submodules/LegacyComponents/LegacyComponents/TGCameraController.m index 8bb1df16ee..33ae3c1bfa 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGCameraController.m +++ b/submodules/LegacyComponents/LegacyComponents/TGCameraController.m @@ -1050,7 +1050,7 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus NSArray *items = @ [ - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Camera.Discard") type:TGMenuSheetButtonTypeDefault action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Camera.Discard") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -1063,7 +1063,7 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus [strongController dismissAnimated:true manual:false completion:nil]; [strongSelf beginTransitionOutWithVelocity:0.0f]; }], - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController != nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardMenu.m b/submodules/LegacyComponents/LegacyComponents/TGClipboardMenu.m index e61ce11057..7a3b0c3169 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGClipboardMenu.m +++ b/submodules/LegacyComponents/LegacyComponents/TGClipboardMenu.m @@ -64,7 +64,7 @@ sendTitle = [NSString stringWithFormat:format, [NSString stringWithFormat:@"%ld", photosCount]]; } - TGMenuSheetButtonItemView *sendItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:sendTitle type:TGMenuSheetButtonTypeSend action:^ + TGMenuSheetButtonItemView *sendItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:sendTitle type:TGMenuSheetButtonTypeSend fontSize:20.0 action:^ { __strong TGClipboardPreviewItemView *strongPreviewItem = weakPreviewItem; completed(strongPreviewItem.selectionContext, strongPreviewItem.editingContext, nil); @@ -90,7 +90,7 @@ [strongPreviewItem setCollapsed:count == 0 animated:true]; }; - TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; [strongController dismissAnimated:true]; diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationInfoCell.m b/submodules/LegacyComponents/LegacyComponents/TGLocationInfoCell.m index 218039c7f3..46064ac1da 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationInfoCell.m +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationInfoCell.m @@ -167,12 +167,14 @@ const CGFloat TGLocationInfoCellHeight = 134.0f; _titleLabel.text = location.venue.title.length > 0 ? location.venue.title : TGLocalized(@"Map.Location"); + UIColor *pinColor = _pallete != nil ? _pallete.iconColor : [UIColor whiteColor]; if (color != nil) { [_circleView setImage:TGTintedImage([TGLocationVenueCell circleImage], color)]; + pinColor = [UIColor whiteColor]; } if (location.venue.type.length > 0 && [location.venue.provider isEqualToString:@"foursquare"]) - [_iconView loadUri:[NSString stringWithFormat:@"location-venue-icon://type=%@&width=%d&height=%d&color=%d", location.venue.type, 48, 48, TGColorHexCode(_pallete != nil ? _pallete.iconColor : [UIColor whiteColor])] withOptions:nil]; + [_iconView loadUri:[NSString stringWithFormat:@"location-venue-icon://type=%@&width=%d&height=%d&color=%d", location.venue.type, 48, 48, TGColorHexCode(pinColor)] withOptions:nil]; SSignal *addressSignal = [SSignal single:@""]; if (location.venue.address.length > 0) diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationLiveSessionItemView.m b/submodules/LegacyComponents/LegacyComponents/TGLocationLiveSessionItemView.m index 4e4bb3530c..98d3bfc810 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationLiveSessionItemView.m +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationLiveSessionItemView.m @@ -23,7 +23,7 @@ { bool isUser = [peer isKindOfClass:[TGUser class]]; NSString *title = isUser ? ((TGUser *)peer).displayName : ((TGConversation *)peer).chatTitle; - self = [super initWithTitle:@"" type:TGMenuSheetButtonTypeDefault action:action]; + self = [super initWithTitle:@"" type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:action]; if (self != nil) { _label = [[UILabel alloc] init]; diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMapViewController.m b/submodules/LegacyComponents/LegacyComponents/TGLocationMapViewController.m index 6703d330d7..3a02f3c329 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationMapViewController.m +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationMapViewController.m @@ -491,7 +491,7 @@ const CGFloat TGLocationMapInset = 100.0f; [itemViews addObject:titleItem]; __weak TGMenuSheetController *weakController = controller; - TGMenuSheetButtonItemView *for15MinutesItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.LiveLocationFor15Minutes") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *for15MinutesItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.LiveLocationFor15Minutes") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGLocationMapViewController *strongSelf = weakSelf; if (strongSelf == nil) @@ -508,7 +508,7 @@ const CGFloat TGLocationMapInset = 100.0f; }]; [itemViews addObject:for15MinutesItem]; - TGMenuSheetButtonItemView *for1HourItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.LiveLocationFor1Hour") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *for1HourItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.LiveLocationFor1Hour") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGLocationMapViewController *strongSelf = weakSelf; if (strongSelf == nil) @@ -525,7 +525,7 @@ const CGFloat TGLocationMapInset = 100.0f; }]; [itemViews addObject:for1HourItem]; - TGMenuSheetButtonItemView *for8HoursItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.LiveLocationFor8Hours") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *for8HoursItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.LiveLocationFor8Hours") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGLocationMapViewController *strongSelf = weakSelf; if (strongSelf == nil) @@ -542,7 +542,7 @@ const CGFloat TGLocationMapInset = 100.0f; }]; [itemViews addObject:for8HoursItem]; - TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m b/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m index d39094dc72..b8e2439dd0 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m @@ -266,14 +266,16 @@ NSString *const TGLocationPinAnnotationKind = @"TGLocationPinAnnotation"; _iconView.hidden = false; UIColor *color = _pallete != nil ? _pallete.locationColor : UIColorRGB(0x008df2); + UIColor *pinColor = _pallete != nil ? _pallete.iconColor : [UIColor whiteColor]; if (locationAnnotation.color != nil) { color = locationAnnotation.color; + pinColor = [UIColor whiteColor]; } _backgroundView.image = TGTintedImage(TGComponentsImageNamed(@"LocationPinBackground"), color); if (location.venue.type.length > 0) { - [_iconView loadUri:[NSString stringWithFormat:@"location-venue-icon://type=%@&width=%d&height=%d&color=%d", location.venue.type, 64, 64, TGColorHexCode(_pallete != nil ? _pallete.iconColor : [UIColor whiteColor])] withOptions:nil]; + [_iconView loadUri:[NSString stringWithFormat:@"location-venue-icon://type=%@&width=%d&height=%d&color=%d", location.venue.type, 64, 64, TGColorHexCode(pinColor)] withOptions:nil]; } else { diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m b/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m index 67ba7e72b3..97489ab445 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m +++ b/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m @@ -742,7 +742,7 @@ NSMutableArray *itemViews = [[NSMutableArray alloc] init]; __weak TGMenuSheetController *weakController = controller; - TGMenuSheetButtonItemView *openItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.OpenInMaps") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *openItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.OpenInMaps") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGLocationViewController *strongSelf = weakSelf; if (strongSelf == nil) @@ -757,7 +757,7 @@ }]; [itemViews addObject:openItem]; - TGMenuSheetButtonItemView *shareItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Conversation.ContextMenuShare") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *shareItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Conversation.ContextMenuShare") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -770,7 +770,7 @@ }]; [itemViews addObject:shareItem]; - TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -870,7 +870,7 @@ __weak TGMenuSheetController *weakController = controller; NSArray *items = @ [ - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.GetDirections") type:TGMenuSheetButtonTypeDefault action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Map.GetDirections") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -879,7 +879,7 @@ [strongController dismissAnimated:true]; block(); }], - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController != nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAvatarMenuMixin.m b/submodules/LegacyComponents/LegacyComponents/TGMediaAvatarMenuMixin.m index b43bcd9353..ed292c996e 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMediaAvatarMenuMixin.m +++ b/submodules/LegacyComponents/LegacyComponents/TGMediaAvatarMenuMixin.m @@ -128,7 +128,7 @@ }; [itemViews addObject:carouselItem]; - TGMenuSheetButtonItemView *galleryItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.ChoosePhoto") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *galleryItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.ChoosePhoto") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf; if (strongSelf == nil) @@ -145,7 +145,7 @@ if (_hasSearchButton) { - TGMenuSheetButtonItemView *viewItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"AttachmentMenu.WebSearch") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *viewItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"AttachmentMenu.WebSearch") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf; if (strongSelf == nil) @@ -164,7 +164,7 @@ if (_hasViewButton) { - TGMenuSheetButtonItemView *viewItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Settings.ViewPhoto") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *viewItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Settings.ViewPhoto") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf; if (strongSelf == nil) @@ -182,7 +182,7 @@ if (_hasDeleteButton) { - TGMenuSheetButtonItemView *deleteItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"GroupInfo.SetGroupPhotoDelete") type:TGMenuSheetButtonTypeDestructive action:^ + TGMenuSheetButtonItemView *deleteItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"GroupInfo.SetGroupPhotoDelete") type:TGMenuSheetButtonTypeDestructive fontSize:20.0 action:^ { __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf; if (strongSelf == nil) @@ -198,7 +198,7 @@ [itemViews addObject:deleteItem]; } - TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf; if (strongSelf == nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryInterfaceView.m b/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryInterfaceView.m index c94f055775..7bcdea25b5 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryInterfaceView.m +++ b/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryInterfaceView.m @@ -609,7 +609,7 @@ NSArray *items = @ [ - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Camera.Discard") type:TGMenuSheetButtonTypeDefault action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Camera.Discard") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -624,7 +624,7 @@ [strongController dismissAnimated:true manual:false completion:nil]; }], - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController != nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.h b/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.h index 610e8925cd..730f304e2f 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.h +++ b/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.h @@ -21,7 +21,7 @@ typedef enum @property (nonatomic, copy) void (^action)(void); @property (nonatomic, assign) bool thickDivider; -- (instancetype)initWithTitle:(NSString *)title type:(TGMenuSheetButtonType)type action:(void (^)(void))action; +- (instancetype)initWithTitle:(NSString *)title type:(TGMenuSheetButtonType)type fontSize:(CGFloat)fontSize action:(void (^)(void))action; @property (nonatomic, assign) bool collapsed; - (void)setCollapsed:(bool)collapsed animated:(bool)animated; diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.m b/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.m index e6c781d84a..bdd068021c 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.m +++ b/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.m @@ -16,6 +16,7 @@ const CGFloat TGMenuSheetButtonItemViewHeight = 57.0f; bool _dark; bool _requiresDivider; UIView *_customDivider; + CGFloat _fontSize; TGMenuSheetPallete *_pallete; } @@ -23,12 +24,13 @@ const CGFloat TGMenuSheetButtonItemViewHeight = 57.0f; @implementation TGMenuSheetButtonItemView -- (instancetype)initWithTitle:(NSString *)title type:(TGMenuSheetButtonType)type action:(void (^)(void))action +- (instancetype)initWithTitle:(NSString *)title type:(TGMenuSheetButtonType)type fontSize:(CGFloat)fontSize action:(void (^)(void))action { self = [super initWithType:(type == TGMenuSheetButtonTypeCancel) ? TGMenuSheetItemTypeFooter : TGMenuSheetItemTypeDefault]; if (self != nil) { self.action = action; + _fontSize = fontSize; _buttonType = type; _requiresDivider = true; @@ -115,7 +117,7 @@ const CGFloat TGMenuSheetButtonItemViewHeight = 57.0f; - (void)_updateForType:(TGMenuSheetButtonType)type { - _button.titleLabel.font = (type == TGMenuSheetButtonTypeCancel || type == TGMenuSheetButtonTypeSend) ? TGMediumSystemFontOfSize(20) : TGSystemFontOfSize(20); + _button.titleLabel.font = (type == TGMenuSheetButtonTypeCancel || type == TGMenuSheetButtonTypeSend) ? TGMediumSystemFontOfSize(_fontSize) : TGSystemFontOfSize(_fontSize); UIColor *accentColor = _dark ? UIColorRGB(0x4fbcff) : TGAccentColor(); if (_pallete != nil) accentColor = _pallete.accentColor; diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m b/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m index cfe5081397..fe894de053 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m +++ b/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m @@ -84,7 +84,7 @@ }; [itemViews addObject:carouselItem]; - TGMenuSheetButtonItemView *galleryItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.ChoosePhoto") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *galleryItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.ChoosePhoto") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -101,7 +101,7 @@ if (iosMajorVersion() >= 8 && intent != TGPassportAttachIntentSelfie) { - TGMenuSheetButtonItemView *icloudItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Conversation.FileICloudDrive") type:TGMenuSheetButtonTypeDefault action:^ + TGMenuSheetButtonItemView *icloudItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Conversation.FileICloudDrive") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -124,7 +124,7 @@ } carouselItem.remainingHeight = TGMenuSheetButtonItemViewHeight * (itemViews.count - 1); - TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + TGMenuSheetButtonItemView *cancelItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropController.m b/submodules/LegacyComponents/LegacyComponents/TGPhotoCropController.m index 1f2dbdfd46..7e3847d2b7 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropController.m +++ b/submodules/LegacyComponents/LegacyComponents/TGPhotoCropController.m @@ -625,8 +625,8 @@ NSString * const TGPhotoCropOriginalAspectRatio = @"original"; }; NSMutableArray *items = [[NSMutableArray alloc] init]; - [items addObject:[[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"PhotoEditor.CropAspectRatioOriginal") type:TGMenuSheetButtonTypeDefault action:^{ action(TGPhotoCropOriginalAspectRatio); }]]; - [items addObject:[[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"PhotoEditor.CropAspectRatioSquare") type:TGMenuSheetButtonTypeDefault action:^{ action(@"1.0"); }]]; + [items addObject:[[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"PhotoEditor.CropAspectRatioOriginal") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^{ action(TGPhotoCropOriginalAspectRatio); }]]; + [items addObject:[[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"PhotoEditor.CropAspectRatioSquare") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^{ action(@"1.0"); }]]; CGSize croppedImageSize = _cropView.cropRect.size; if (_cropView.cropOrientation == UIImageOrientationLeft || _cropView.cropOrientation == UIImageOrientationRight) @@ -666,10 +666,10 @@ NSString * const TGPhotoCropOriginalAspectRatio = @"original"; ratio = heightComponent / widthComponent; - [items addObject:[[TGMenuSheetButtonItemView alloc] initWithTitle:[NSString stringWithFormat:@"%d:%d", (int)widthComponent, (int)heightComponent] type:TGMenuSheetButtonTypeDefault action:^{ action([NSString stringWithFormat:@"%f", ratio]); }]]; + [items addObject:[[TGMenuSheetButtonItemView alloc] initWithTitle:[NSString stringWithFormat:@"%d:%d", (int)widthComponent, (int)heightComponent] type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^{ action([NSString stringWithFormat:@"%f", ratio]); }]]; } - [items addObject:[[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + [items addObject:[[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController != nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorController.m b/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorController.m index ecab32e66d..0233810df4 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorController.m +++ b/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorController.m @@ -1341,7 +1341,7 @@ NSArray *items = @ [ - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"PhotoEditor.DiscardChanges") type:TGMenuSheetButtonTypeDefault action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"PhotoEditor.DiscardChanges") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -1352,7 +1352,7 @@ dismiss(); }]; }], - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController != nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintController.m b/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintController.m index 664256614b..e8a25a309f 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintController.m +++ b/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintController.m @@ -550,7 +550,7 @@ const CGFloat TGPhotoPaintStickerKeyboardSize = 260.0f; __weak TGPhotoPaintController *weakSelf = self; NSArray *items = @ [ - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Paint.ClearConfirm") type:TGMenuSheetButtonTypeDestructive action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Paint.ClearConfirm") type:TGMenuSheetButtonTypeDestructive fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController == nil) @@ -570,7 +570,7 @@ const CGFloat TGPhotoPaintStickerKeyboardSize = 260.0f; [strongController dismissAnimated:true manual:false completion:nil]; }], - [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel action:^ + [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Cancel") type:TGMenuSheetButtonTypeCancel fontSize:20.0 action:^ { __strong TGMenuSheetController *strongController = weakController; if (strongController != nil) diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerMenu.m b/submodules/LegacyComponents/LegacyComponents/TGSecretTimerMenu.m index b14fcf5dce..1398251a35 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerMenu.m +++ b/submodules/LegacyComponents/LegacyComponents/TGSecretTimerMenu.m @@ -37,7 +37,7 @@ __weak TGMenuSheetController *weakController = controller; __weak TGSecretTimerPickerItemView *weakTimerItem = timerItem; - TGMenuSheetButtonItemView *doneItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Done") type:TGMenuSheetButtonTypeSend action:^ + TGMenuSheetButtonItemView *doneItem = [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Common.Done") type:TGMenuSheetButtonTypeSend fontSize:20.0 action:^ { __strong TGSecretTimerPickerItemView *strongTimerItem = weakTimerItem; if (strongTimerItem != nil) diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift index b4056dd51d..6b8cf2e9af 100644 --- a/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift +++ b/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift @@ -22,6 +22,8 @@ public struct LegacyAttachmentMenuMediaEditing: OptionSet { } public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaOptions: LegacyAttachmentMenuMediaEditing?, saveEditedPhotos: Bool, allowGrouping: Bool, hasSchedule: Bool, canSendPolls: Bool, presentationData: PresentationData, parentController: LegacyController, recentlyUsedInlineBots: [Peer], initialCaption: String, openGallery: @escaping () -> Void, openCamera: @escaping (TGAttachmentCameraView?, TGMenuSheetController?) -> Void, openFileGallery: @escaping () -> Void, openWebSearch: @escaping () -> Void, openMap: @escaping () -> Void, openContacts: @escaping () -> Void, openPoll: @escaping () -> Void, presentSelectionLimitExceeded: @escaping () -> Void, presentCantSendMultipleFiles: @escaping () -> Void, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32) -> Void, selectRecentlyUsedInlineBot: @escaping (Peer) -> Void) -> TGMenuSheetController { + let actionSheetTheme = ActionSheetControllerTheme(presentationData: presentationData) + let isSecretChat = peer.id.namespace == Namespaces.Peer.SecretChat let controller = TGMenuSheetController(context: parentController.context, dark: false)! @@ -99,7 +101,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO carouselItem.editingContext.setInitialCaption(initialCaption, entities: []) itemViews.append(carouselItem) - let galleryItem = TGMenuSheetButtonItemView(title: editing ? presentationData.strings.Conversation_EditingMessageMediaChange : presentationData.strings.AttachmentMenu_PhotoOrVideo, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let galleryItem = TGMenuSheetButtonItemView(title: editing ? presentationData.strings.Conversation_EditingMessageMediaChange : presentationData.strings.AttachmentMenu_PhotoOrVideo, type: TGMenuSheetButtonTypeDefault, fontSize: actionSheetTheme.baseFontSize, action: { [weak controller] in controller?.dismiss(animated: true) openGallery() })! @@ -117,7 +119,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO } if !editing { - let fileItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_File, type: TGMenuSheetButtonTypeDefault, action: {[weak controller] in + let fileItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_File, type: TGMenuSheetButtonTypeDefault, fontSize: actionSheetTheme.baseFontSize, action: {[weak controller] in controller?.dismiss(animated: true) openFileGallery() })! @@ -126,7 +128,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO } if canEditCurrent { - let fileItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_File, type: TGMenuSheetButtonTypeDefault, action: {[weak controller] in + let fileItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_File, type: TGMenuSheetButtonTypeDefault, fontSize: actionSheetTheme.baseFontSize, action: {[weak controller] in controller?.dismiss(animated: true) openFileGallery() })! @@ -134,21 +136,21 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO } if editMediaOptions == nil { - let locationItem = TGMenuSheetButtonItemView(title: presentationData.strings.Conversation_Location, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let locationItem = TGMenuSheetButtonItemView(title: presentationData.strings.Conversation_Location, type: TGMenuSheetButtonTypeDefault, fontSize: actionSheetTheme.baseFontSize, action: { [weak controller] in controller?.dismiss(animated: true) openMap() })! itemViews.append(locationItem) if (peer is TelegramGroup || peer is TelegramChannel) && canSendMessagesToPeer(peer) && canSendPolls { - let pollItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_Poll, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let pollItem = TGMenuSheetButtonItemView(title: presentationData.strings.AttachmentMenu_Poll, type: TGMenuSheetButtonTypeDefault, fontSize: actionSheetTheme.baseFontSize, action: { [weak controller] in controller?.dismiss(animated: true) openPoll() })! itemViews.append(pollItem) } - let contactItem = TGMenuSheetButtonItemView(title: presentationData.strings.Conversation_Contact, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let contactItem = TGMenuSheetButtonItemView(title: presentationData.strings.Conversation_Contact, type: TGMenuSheetButtonTypeDefault, fontSize: actionSheetTheme.baseFontSize, action: { [weak controller] in controller?.dismiss(animated: true) openContacts() })! @@ -162,7 +164,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO let peer = recentlyUsedInlineBots[i] let addressName = peer.addressName if let addressName = addressName { - let botItem = TGMenuSheetButtonItemView(title: "@" + addressName, type: TGMenuSheetButtonTypeDefault, action: { [weak controller] in + let botItem = TGMenuSheetButtonItemView(title: "@" + addressName, type: TGMenuSheetButtonTypeDefault, fontSize: actionSheetTheme.baseFontSize, action: { [weak controller] in controller?.dismiss(animated: true) selectRecentlyUsedInlineBot(peer) @@ -175,7 +177,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, editMediaO carouselItemView?.remainingHeight = TGMenuSheetButtonItemViewHeight * CGFloat(itemViews.count - 1) - let cancelItem = TGMenuSheetButtonItemView(title: presentationData.strings.Common_Cancel, type: TGMenuSheetButtonTypeCancel, action: { [weak controller] in + let cancelItem = TGMenuSheetButtonItemView(title: presentationData.strings.Common_Cancel, type: TGMenuSheetButtonTypeCancel, fontSize: actionSheetTheme.baseFontSize, action: { [weak controller] in controller?.dismiss(animated: true) })! itemViews.append(cancelItem) diff --git a/submodules/LocationResources/Sources/VenueIconResources.swift b/submodules/LocationResources/Sources/VenueIconResources.swift index 7498a16921..c0cf9db6cb 100644 --- a/submodules/LocationResources/Sources/VenueIconResources.swift +++ b/submodules/LocationResources/Sources/VenueIconResources.swift @@ -134,9 +134,14 @@ private let venueColors: [String: UIColor] = [ "parks_outdoors": UIColor(rgb: 0x6cc039), "shops": UIColor(rgb: 0xffb300), "travel": UIColor(rgb: 0x1c9fff), + "work": UIColor(rgb: 0xad7854), + "home": UIColor(rgb: 0x00aeef) ] public func venueIconColor(type: String) -> UIColor { + if type.isEmpty { + return UIColor(rgb: 0x008df2) + } if let color = venueColors[type] { return color } @@ -150,7 +155,8 @@ public func venueIconColor(type: String) -> UIColor { } public func venueIcon(postbox: Postbox, type: String, background: Bool) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { - let data: Signal = type.isEmpty ? .single(nil) : venueIconData(postbox: postbox, resource: VenueIconResource(type: type)) + let isBuiltinIcon = ["", "home", "work"].contains(type) + let data: Signal = isBuiltinIcon ? .single(nil) : venueIconData(postbox: postbox, resource: VenueIconResource(type: type)) return data |> map { data in return { arguments in let context = DrawingContext(size: arguments.drawingSize, clear: true) @@ -172,8 +178,21 @@ public func venueIcon(postbox: Postbox, type: String, background: Bool) -> Signa let boundsSize = CGSize(width: arguments.drawingRect.size.width - 4.0 * 2.0, height: arguments.drawingRect.size.height - 4.0 * 2.0) let fittedSize = image.size.aspectFitted(boundsSize) c.draw(cgImage, in: CGRect(origin: CGPoint(x: floor((arguments.drawingRect.width - fittedSize.width) / 2.0), y: floor((arguments.drawingRect.height - fittedSize.height) / 2.0)), size: fittedSize)) - } else if type.isEmpty, let pinImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/LocationPinForeground"), color: foregroundColor), let cgImage = pinImage.cgImage { - c.draw(cgImage, in: CGRect(origin: CGPoint(x: floor((arguments.drawingRect.width - pinImage.size.width) / 2.0), y: floor((arguments.drawingRect.height - pinImage.size.height) / 2.0)), size: pinImage.size)) + } else if isBuiltinIcon { + let image: UIImage? + switch type { + case "": + image = UIImage(bundleImageName: "Chat/Message/LocationPinForeground") + case "home": + image = UIImage(bundleImageName: "Location/HomeIcon") + case "work": + image = UIImage(bundleImageName: "Location/WorkIcon") + default: + image = nil + } + if let image = image, let pinImage = generateTintedImage(image: image, color: foregroundColor), let cgImage = pinImage.cgImage { + c.draw(cgImage, in: CGRect(origin: CGPoint(x: floor((arguments.drawingRect.width - pinImage.size.width) / 2.0), y: floor((arguments.drawingRect.height - pinImage.size.height) / 2.0)), size: pinImage.size)) + } } } diff --git a/submodules/LocationUI/BUCK b/submodules/LocationUI/BUCK index 4f6104431d..ea4a20134e 100644 --- a/submodules/LocationUI/BUCK +++ b/submodules/LocationUI/BUCK @@ -29,6 +29,9 @@ static_library( "//submodules/MergeLists:MergeLists", "//submodules/TelegramUIPreferences:TelegramUIPreferences", "//submodules/SearchBarNode:SearchBarNode", + "//submodules/PresentationDataUtils:PresentationDataUtils", + "//submodules/DeviceAccess:DeviceAccess", + "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/LocationUI/Sources/LocationAnnotation.swift b/submodules/LocationUI/Sources/LocationAnnotation.swift index 81e26de4b8..d58b2b30f6 100644 --- a/submodules/LocationUI/Sources/LocationAnnotation.swift +++ b/submodules/LocationUI/Sources/LocationAnnotation.swift @@ -80,6 +80,7 @@ class LocationPinAnnotationView: MKAnnotationView { let smallIconNode: TransformImageNode let dotNode: ASImageNode var avatarNode: AvatarNode? + var labelNode: ImmediateTextNode? var appeared = false var animating = false @@ -226,6 +227,29 @@ class LocationPinAnnotationView: MKAnnotationView { self.dotNode.alpha = 1.0 self.dotNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + + + if let annotation = self.annotation as? LocationPinAnnotation, let venue = annotation.location?.venue { + let labelNode = ImmediateTextNode() + labelNode.displaysAsynchronously = false + labelNode.isUserInteractionEnabled = false + labelNode.attributedText = NSAttributedString(string: venue.title, font: Font.medium(10), textColor: .black) + labelNode.maximumNumberOfLines = 2 + labelNode.textAlignment = .center + labelNode.truncationType = .end + labelNode.textStroke = (UIColor.white, 1.0) + self.labelNode = labelNode + self.addSubnode(labelNode) + + let size = labelNode.updateLayout(CGSize(width: 120.0, height: CGFloat.greatestFiniteMagnitude)) + labelNode.bounds = CGRect(origin: CGPoint(), size: size) + labelNode.position = CGPoint(x: 0.0, y: 10.0) + + labelNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3) + } else { + self.labelNode?.removeFromSupernode() + self.labelNode = nil + } } else { let avatarSnapshot = self.avatarNode?.view.snapshotContentTree() if let avatarSnapshot = avatarSnapshot, let avatarNode = self.avatarNode { @@ -268,6 +292,13 @@ class LocationPinAnnotationView: MKAnnotationView { let previousAlpha = self.dotNode.alpha self.dotNode.alpha = 0.0 self.dotNode.layer.animateAlpha(from: previousAlpha, to: 0.0, duration: 0.2) + + if let labelNode = self.labelNode { + self.labelNode = nil + labelNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { _ in + labelNode.removeFromSupernode() + }) + } } } else { self.smallNode.isHidden = selected @@ -279,50 +310,13 @@ class LocationPinAnnotationView: MKAnnotationView { } } - override func layoutSubviews() { - super.layoutSubviews() - - guard !self.animating else { - return - } - - self.dotNode.position = CGPoint() - self.smallNode.position = CGPoint() - self.shadowNode.position = CGPoint(x: UIScreenPixel, y: -36.0) - self.backgroundNode.position = CGPoint(x: self.shadowNode.frame.width / 2.0, y: self.shadowNode.frame.height / 2.0) - self.iconNode.position = CGPoint(x: self.shadowNode.frame.width / 2.0, y: self.shadowNode.frame.height / 2.0 - 5.0) - - let smallIconLayout = self.smallIconNode.asyncLayout() - let smallIconApply = smallIconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: self.smallIconNode.bounds.size, boundingSize: self.smallIconNode.bounds.size, intrinsicInsets: UIEdgeInsets())) - smallIconApply() - - let iconLayout = self.iconNode.asyncLayout() - let iconApply = iconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: self.iconNode.bounds.size, boundingSize: self.iconNode.bounds.size, intrinsicInsets: UIEdgeInsets())) - iconApply() - - if let avatarNode = self.avatarNode { - avatarNode.position = self.isSelected ? CGPoint(x: UIScreenPixel, y: -41.0) : CGPoint() - avatarNode.transform = self.isSelected ? CATransform3DIdentity : CATransform3DMakeScale(0.64, 0.64, 1.0) - avatarNode.view.superview?.bringSubviewToFront(avatarNode.view) - } - - if !self.appeared { - self.appeared = true - - self.smallNode.transform = CATransform3DMakeScale(0.1, 0.1, 1.0) - UIView.animate(withDuration: 0.55, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0.5, options: [], animations: { - self.smallNode.transform = CATransform3DIdentity - }) { _ in - } - } - } - func setPeer(account: Account, theme: PresentationTheme, peer: Peer) { let avatarNode: AvatarNode if let currentAvatarNode = self.avatarNode { avatarNode = currentAvatarNode } else { avatarNode = AvatarNode(font: avatarPlaceholderFont(size: 24.0)) + avatarNode.isLayerBacked = false avatarNode.bounds = CGRect(origin: CGPoint(), size: CGSize(width: 55.0, height: 55.0)) avatarNode.position = CGPoint() self.avatarNode = avatarNode @@ -332,19 +326,23 @@ class LocationPinAnnotationView: MKAnnotationView { avatarNode.setPeer(account: account, theme: theme, peer: peer) } - private var raised = false + var isRaised = false func setRaised(_ raised: Bool, animated: Bool, completion: @escaping () -> Void = {}) { - guard raised != self.raised else { + guard raised != self.isRaised else { return } - self.raised = raised + self.isRaised = raised self.shadowNode.layer.removeAllAnimations() if animated { + self.animating = true + if raised { let previousPosition = self.shadowNode.position - self.shadowNode.layer.animatePosition(from: previousPosition, to: CGPoint(x: UIScreenPixel, y: -66.0), duration: 0.2, delay: 0.0, timingFunction: kCAMediaTimingFunctionSpring) { finished in + self.shadowNode.position = CGPoint(x: UIScreenPixel, y: -66.0) + self.shadowNode.layer.animatePosition(from: previousPosition, to: self.shadowNode.position, duration: 0.2, delay: 0.0, timingFunction: kCAMediaTimingFunctionSpring) { finished in + self.animating = false if finished { completion() } @@ -353,6 +351,7 @@ class LocationPinAnnotationView: MKAnnotationView { UIView.animate(withDuration: 0.2, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0.0, options: [.allowAnimatedContent], animations: { self.shadowNode.position = CGPoint(x: UIScreenPixel, y: -36.0) }) { finished in + self.animating = false if finished { completion() } @@ -396,7 +395,6 @@ class LocationPinAnnotationView: MKAnnotationView { self.addSubnode(avatarNode) } self.animating = false - self.setNeedsLayout() } } @@ -405,4 +403,42 @@ class LocationPinAnnotationView: MKAnnotationView { self.dotNode.isHidden = !custom } + + override func layoutSubviews() { + super.layoutSubviews() + + guard !self.animating else { + return + } + + self.dotNode.position = CGPoint() + self.smallNode.position = CGPoint() + self.shadowNode.position = CGPoint(x: UIScreenPixel, y: self.isRaised ? -66.0 : -36.0) + self.backgroundNode.position = CGPoint(x: self.shadowNode.frame.width / 2.0, y: self.shadowNode.frame.height / 2.0) + self.iconNode.position = CGPoint(x: self.shadowNode.frame.width / 2.0, y: self.shadowNode.frame.height / 2.0 - 5.0) + + let smallIconLayout = self.smallIconNode.asyncLayout() + let smallIconApply = smallIconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: self.smallIconNode.bounds.size, boundingSize: self.smallIconNode.bounds.size, intrinsicInsets: UIEdgeInsets())) + smallIconApply() + + let iconLayout = self.iconNode.asyncLayout() + let iconApply = iconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: self.iconNode.bounds.size, boundingSize: self.iconNode.bounds.size, intrinsicInsets: UIEdgeInsets())) + iconApply() + + if let avatarNode = self.avatarNode { + avatarNode.position = self.isSelected ? CGPoint(x: UIScreenPixel, y: -41.0) : CGPoint() + avatarNode.transform = self.isSelected ? CATransform3DIdentity : CATransform3DMakeScale(0.64, 0.64, 1.0) + avatarNode.view.superview?.bringSubviewToFront(avatarNode.view) + } + + if !self.appeared { + self.appeared = true + + self.smallNode.transform = CATransform3DMakeScale(0.1, 0.1, 1.0) + UIView.animate(withDuration: 0.55, delay: 0.0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0.5, options: [], animations: { + self.smallNode.transform = CATransform3DIdentity + }) { _ in + } + } + } } diff --git a/submodules/LocationUI/Sources/LocationMapHeaderNode.swift b/submodules/LocationUI/Sources/LocationMapHeaderNode.swift index f2a24e718b..03853820d5 100644 --- a/submodules/LocationUI/Sources/LocationMapHeaderNode.swift +++ b/submodules/LocationUI/Sources/LocationMapHeaderNode.swift @@ -100,19 +100,21 @@ final class LocationMapHeaderNode: ASDisplayNode { self.shadowNode.image = generateShadowImage(theme: presentationData.theme, highlighted: false) } - func updateLayout(layout: ContainerViewLayout, navigationBarHeight: CGFloat, padding: CGFloat, size: CGSize, transition: ContainedViewLayoutTransition) { - transition.updateFrame(node: self.mapNode, frame: CGRect(x: 0.0, y: floorToScreenPixels((size.height - layout.size.height + navigationBarHeight) / 2.0), width: size.width, height: layout.size.height)) + func updateLayout(layout: ContainerViewLayout, navigationBarHeight: CGFloat, topPadding: CGFloat, offset: CGFloat, size: CGSize, transition: ContainedViewLayoutTransition) { + let mapHeight: CGFloat = floor(layout.size.height * 1.5) + let mapFrame = CGRect(x: 0.0, y: floorToScreenPixels((size.height - mapHeight + navigationBarHeight) / 2.0) + offset, width: size.width, height: mapHeight) + transition.updateFrame(node: self.mapNode, frame: mapFrame) + self.mapNode.updateLayout(size: mapFrame.size) transition.updateFrame(node: self.shadowNode, frame: CGRect(x: 0.0, y: size.height - 14.0, width: size.width, height: 14.0)) let inset: CGFloat = 6.0 - transition.updateFrame(node: self.optionsBackgroundNode, frame: CGRect(x: size.width - inset - panelSize.width - panelInset * 2.0, y: navigationBarHeight + padding + inset, width: panelSize.width + panelInset * 2.0, height: panelSize.height + panelInset * 2.0)) - + transition.updateFrame(node: self.optionsBackgroundNode, frame: CGRect(x: size.width - inset - panelSize.width - panelInset * 2.0, y: navigationBarHeight + topPadding + inset, width: panelSize.width + panelInset * 2.0, height: panelSize.height + panelInset * 2.0)) transition.updateFrame(node: self.infoButtonNode, frame: CGRect(x: panelInset, y: panelInset, width: panelSize.width, height: panelSize.height / 2.0)) transition.updateFrame(node: self.locationButtonNode, frame: CGRect(x: panelInset, y: panelInset + panelSize.height / 2.0, width: panelSize.width, height: panelSize.height / 2.0)) let alphaTransition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut) - let optionsAlpha: CGFloat = size.height > 124.0 + navigationBarHeight ? 1.0 : 0.0 + let optionsAlpha: CGFloat = size.height > 160.0 + navigationBarHeight ? 1.0 : 0.0 alphaTransition.updateAlpha(node: self.optionsBackgroundNode, alpha: optionsAlpha) } diff --git a/submodules/LocationUI/Sources/LocationMapNode.swift b/submodules/LocationUI/Sources/LocationMapNode.swift index 47f392b511..de65a36477 100644 --- a/submodules/LocationUI/Sources/LocationMapNode.swift +++ b/submodules/LocationUI/Sources/LocationMapNode.swift @@ -39,10 +39,13 @@ final class LocationMapNode: ASDisplayNode, MKMapViewDelegate { private let pickerAnnotationContainerView: PickerAnnotationContainerView private weak var userLocationAnnotationView: MKAnnotationView? + private let pinDisposable = MetaDisposable() + private var mapView: MKMapView? { return self.view as? MKMapView } + var returnedToUserLocation = true var ignoreRegionChanges = false var isDragging = false var beganInteractiveDragging: (() -> Void)? @@ -101,6 +104,11 @@ final class LocationMapNode: ASDisplayNode, MKMapViewDelegate { self.mapView?.setVisibleMapRect(mapRect, edgePadding: UIEdgeInsets(top: offset.y, left: offset.x, bottom: 0.0, right: 0.0), animated: animated) } self.ignoreRegionChanges = false + + if isUserLocation && !self.returnedToUserLocation { + self.returnedToUserLocation = true + self.pickerAnnotationView?.setRaised(true, animated: true) + } } func mapView(_ mapView: MKMapView, regionWillChangeAnimated animated: Bool) { @@ -111,13 +119,18 @@ final class LocationMapNode: ASDisplayNode, MKMapViewDelegate { for gestureRecognizer in gestureRecognizers { if gestureRecognizer.state == .began || gestureRecognizer.state == .ended { self.isDragging = true + self.returnedToUserLocation = false self.beganInteractiveDragging?() if self.hasPickerAnnotation { self.customUserLocationAnnotationView?.isHidden = true self.pickerAnnotationContainerView.isHidden = false - self.pickerAnnotationView?.setCustom(true, animated: true) + if let pickerAnnotationView = self.pickerAnnotationView, !pickerAnnotationView.isRaised { + pickerAnnotationView.setCustom(true, animated: true) + pickerAnnotationView.setRaised(true, animated: true) + } self.resetAnnotationSelection() + self.resetScheduledPin() } break } @@ -125,9 +138,18 @@ final class LocationMapNode: ASDisplayNode, MKMapViewDelegate { } func mapView(_ mapView: MKMapView, regionDidChangeAnimated animated: Bool) { - if self.isDragging, let coordinate = self.mapCenterCoordinate { + let wasDragging = self.isDragging + if self.isDragging { self.isDragging = false - self.endedInteractiveDragging?(coordinate) + if let coordinate = self.mapCenterCoordinate { + self.endedInteractiveDragging?(coordinate) + } + } + + if let pickerAnnotationView = self.pickerAnnotationView { + if pickerAnnotationView.isRaised && (wasDragging || self.returnedToUserLocation) { + self.schedulePin(wasDragging: wasDragging) + } } } @@ -293,12 +315,41 @@ final class LocationMapNode: ASDisplayNode, MKMapViewDelegate { } } - override func layout() { - super.layout() - - self.pickerAnnotationContainerView.frame = CGRect(x: 0.0, y: floorToScreenPixels((self.frame.size.height - self.frame.size.width) / 2.0), width: self.frame.size.width, height: self.frame.size.width) + private func schedulePin(wasDragging: Bool) { + let timeout: Double = wasDragging ? 0.38 : 0.05 + + let signal: Signal = .complete() + |> delay(timeout, queue: Queue.mainQueue()) + self.pinDisposable.set(signal.start(completed: { [weak self] in + guard let strongSelf = self, let pickerAnnotationView = strongSelf.pickerAnnotationView else { + return + } + + pickerAnnotationView.setRaised(false, animated: true) { [weak self] in + guard let strongSelf = self else { + return + } + + if strongSelf.returnedToUserLocation { + strongSelf.pickerAnnotationContainerView.isHidden = true + strongSelf.customUserLocationAnnotationView?.isHidden = false + } + } + + if strongSelf.returnedToUserLocation { + pickerAnnotationView.setCustom(false, animated: true) + } + })) + } + + private func resetScheduledPin() { + self.pinDisposable.set(nil) + } + + func updateLayout(size: CGSize) { + self.pickerAnnotationContainerView.frame = CGRect(x: 0.0, y: floorToScreenPixels((size.height - size.width) / 2.0), width: size.width, height: size.width) if let pickerAnnotationView = self.pickerAnnotationView { - pickerAnnotationView.center = CGPoint(x: self.pickerAnnotationContainerView.frame.width / 2.0, y: self.pickerAnnotationContainerView.frame.height / 2.0 + 16.0) + pickerAnnotationView.center = CGPoint(x: self.pickerAnnotationContainerView.frame.width / 2.0, y: self.pickerAnnotationContainerView.frame.height / 2.0) } } } diff --git a/submodules/LocationUI/Sources/LocationPickerController.swift b/submodules/LocationUI/Sources/LocationPickerController.swift index 23111614a7..69704211cb 100644 --- a/submodules/LocationUI/Sources/LocationPickerController.swift +++ b/submodules/LocationUI/Sources/LocationPickerController.swift @@ -10,6 +10,8 @@ import TelegramPresentationData import AccountContext import AppBundle import CoreLocation +import PresentationDataUtils +import DeviceAccess public enum LocationPickerMode { case share(peer: Peer?, selfPeer: Peer?, hasLiveLocation: Bool) @@ -23,24 +25,28 @@ class LocationPickerInteraction { let toggleMapModeSelection: () -> Void let updateMapMode: (LocationMapMode) -> Void let goToUserLocation: () -> Void + let goToCoordinate: (CLLocationCoordinate2D) -> Void let openSearch: () -> Void let updateSearchQuery: (String) -> Void let dismissSearch: () -> Void let dismissInput: () -> Void let updateSendActionHighlight: (Bool) -> Void + let openHomeWorkInfo: () -> Void - init(sendLocation: @escaping (CLLocationCoordinate2D) -> Void, sendLiveLocation: @escaping (CLLocationCoordinate2D) -> Void, sendVenue: @escaping (TelegramMediaMap) -> Void, toggleMapModeSelection: @escaping () -> Void, updateMapMode: @escaping (LocationMapMode) -> Void, goToUserLocation: @escaping () -> Void, openSearch: @escaping () -> Void, updateSearchQuery: @escaping (String) -> Void, dismissSearch: @escaping () -> Void, dismissInput: @escaping () -> Void, updateSendActionHighlight: @escaping (Bool) -> Void) { + init(sendLocation: @escaping (CLLocationCoordinate2D) -> Void, sendLiveLocation: @escaping (CLLocationCoordinate2D) -> Void, sendVenue: @escaping (TelegramMediaMap) -> Void, toggleMapModeSelection: @escaping () -> Void, updateMapMode: @escaping (LocationMapMode) -> Void, goToUserLocation: @escaping () -> Void, goToCoordinate: @escaping (CLLocationCoordinate2D) -> Void, openSearch: @escaping () -> Void, updateSearchQuery: @escaping (String) -> Void, dismissSearch: @escaping () -> Void, dismissInput: @escaping () -> Void, updateSendActionHighlight: @escaping (Bool) -> Void, openHomeWorkInfo: @escaping () -> Void) { self.sendLocation = sendLocation self.sendLiveLocation = sendLiveLocation self.sendVenue = sendVenue self.toggleMapModeSelection = toggleMapModeSelection self.updateMapMode = updateMapMode self.goToUserLocation = goToUserLocation + self.goToCoordinate = goToCoordinate self.openSearch = openSearch self.updateSearchQuery = updateSearchQuery self.dismissSearch = dismissSearch self.dismissInput = dismissInput self.updateSendActionHighlight = updateSendActionHighlight + self.openHomeWorkInfo = openHomeWorkInfo } } @@ -56,6 +62,10 @@ public final class LocationPickerController: ViewController { private var presentationDataDisposable: Disposable? private var searchNavigationContentNode: LocationSearchNavigationContentNode? + private var isSearchingDisposable = MetaDisposable() + + private let locationManager = CLLocationManager() + private var permissionDisposable: Disposable? private var interaction: LocationPickerInteraction? @@ -88,6 +98,29 @@ public final class LocationPickerController: ViewController { strongSelf.controllerNode.updatePresentationData(presentationData) }) + self.permissionDisposable = (DeviceAccess.authorizationStatus(subject: .location(.send)) + |> deliverOnMainQueue).start(next: { [weak self] next in + guard let strongSelf = self else { + return + } + switch next { + case .notDetermined: + DeviceAccess.authorizeAccess(to: .location(.send), locationManager: strongSelf.locationManager, presentationData: strongSelf.presentationData, present: { c, a in + strongSelf.present(c, in: .window(.root), with: a) + }, openSettings: { + strongSelf.context.sharedContext.applicationBindings.openSettings() + }) + case .denied: + strongSelf.controllerNode.updateState { state in + var state = state + state.forceSelection = true + return state + } + default: + break + } + }) + let locationWithTimeout: (CLLocationCoordinate2D, Int32?) -> TelegramMediaMap = { coordinate, timeout in return TelegramMediaMap(latitude: coordinate.latitude, longitude: coordinate.longitude, geoPlace: nil, venue: nil, liveBroadcastingTimeout: timeout) } @@ -102,7 +135,7 @@ public final class LocationPickerController: ViewController { guard let strongSelf = self else { return } - let controller = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let controller = ActionSheetController(presentationData: strongSelf.presentationData) var title = strongSelf.presentationData.strings.Map_LiveLocationGroupDescription if case let .share(peer, _, _) = strongSelf.mode, let receiver = peer { title = strongSelf.presentationData.strings.Map_LiveLocationPrivateDescription(receiver.compactDisplayTitle).0 @@ -143,7 +176,12 @@ public final class LocationPickerController: ViewController { guard let strongSelf = self else { return } - completion(venue, nil) + let venueType = venue.venue?.type ?? "" + if ["home", "work"].contains(venueType) { + completion(TelegramMediaMap(latitude: venue.latitude, longitude: venue.longitude, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil), nil) + } else { + completion(venue, nil) + } strongSelf.dismiss() }, toggleMapModeSelection: { [weak self] in guard let strongSelf = self else { @@ -174,6 +212,16 @@ public final class LocationPickerController: ViewController { state.selectedLocation = .none return state } + }, goToCoordinate: { [weak self] coordinate in + guard let strongSelf = self else { + return + } + strongSelf.controllerNode.updateState { state in + var state = state + state.displayingMapModeOptions = false + state.selectedLocation = .location(coordinate, nil) + return state + } }, openSearch: { [weak self] in guard let strongSelf = self, let interaction = strongSelf.interaction, let navigationBar = strongSelf.navigationBar else { return @@ -186,8 +234,15 @@ public final class LocationPickerController: ViewController { let contentNode = LocationSearchNavigationContentNode(presentationData: strongSelf.presentationData, interaction: interaction) strongSelf.searchNavigationContentNode = contentNode navigationBar.setContentNode(contentNode, animated: true) - strongSelf.controllerNode.activateSearch(navigationBar: navigationBar) + let isSearching = strongSelf.controllerNode.activateSearch(navigationBar: navigationBar) contentNode.activate() + + strongSelf.isSearchingDisposable.set((isSearching + |> deliverOnMainQueue).start(next: { [weak self] value in + if let strongSelf = self, let searchNavigationContentNode = strongSelf.searchNavigationContentNode { + searchNavigationContentNode.updateActivity(value) + } + })) }, updateSearchQuery: { [weak self] query in guard let strongSelf = self else { return @@ -197,6 +252,7 @@ public final class LocationPickerController: ViewController { guard let strongSelf = self, let navigationBar = strongSelf.navigationBar else { return } + strongSelf.isSearchingDisposable.set(nil) strongSelf.searchNavigationContentNode?.deactivate() strongSelf.searchNavigationContentNode = nil navigationBar.setContentNode(nil, animated: true) @@ -211,6 +267,13 @@ public final class LocationPickerController: ViewController { return } strongSelf.controllerNode.updateSendActionHighlight(highlighted) + }, openHomeWorkInfo: { [weak self] in + guard let strongSelf = self else { + return + } + + let controller = textAlertController(context: strongSelf.context, title: strongSelf.presentationData.strings.Map_HomeAndWorkTitle, text: strongSelf.presentationData.strings.Map_HomeAndWorkInfo, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]) + strongSelf.present(controller, in: .window(.root)) }) self.scrollToTop = { [weak self] in @@ -218,8 +281,6 @@ public final class LocationPickerController: ViewController { strongSelf.controllerNode.scrollToTop() } } - - self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) } required public init(coder aDecoder: NSCoder) { @@ -228,6 +289,8 @@ public final class LocationPickerController: ViewController { deinit { self.presentationDataDisposable?.dispose() + self.permissionDisposable?.dispose() + self.isSearchingDisposable.dispose() } override public func loadDisplayNode() { diff --git a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift index b175992a04..b575b2ac90 100644 --- a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift +++ b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift @@ -151,9 +151,12 @@ private enum LocationPickerEntry: Comparable, Identifiable { case let .header(theme, title): return LocationSectionHeaderItem(presentationData: ItemListPresentationData(presentationData), title: title) case let .venue(theme, venue, _): - return ItemListVenueItem(presentationData: ItemListPresentationData(presentationData), account: account, venue: venue, sectionId: 0, style: .plain, action: { + let venueType = venue.venue?.type ?? "" + return ItemListVenueItem(presentationData: ItemListPresentationData(presentationData), account: account, venue: venue, style: .plain, action: { interaction?.sendVenue(venue) - }) + }, infoAction: ["home", "work"].contains(venueType) ? { + interaction?.openHomeWorkInfo() + } : nil) case let .attribution(theme): return LocationAttributionItem(presentationData: ItemListPresentationData(presentationData)) } @@ -220,11 +223,13 @@ struct LocationPickerState { var mapMode: LocationMapMode var displayingMapModeOptions: Bool var selectedLocation: LocationPickerLocation + var forceSelection: Bool init() { self.mapMode = .map self.displayingMapModeOptions = false self.selectedLocation = .none + self.forceSelection = false } } @@ -415,10 +420,23 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { strongSelf.headerNode.mapNode.resetAnnotationSelection() case .selecting: strongSelf.headerNode.mapNode.resetAnnotationSelection() + case let .location(coordinate, _): + var updateMap = false + switch previousState.selectedLocation { + case .none, .venue: + updateMap = true + case let .location(previousCoordinate, address): + if previousCoordinate != coordinate { + updateMap = true + } + default: + break + } + if updateMap { + strongSelf.headerNode.mapNode.setMapCenter(coordinate: coordinate, isUserLocation: false, animated: true) + } case let .venue(venue): strongSelf.headerNode.mapNode.setMapCenter(coordinate: venue.coordinate, animated: true) - default: - break } let annotations: [LocationPinAnnotation] @@ -482,7 +500,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { strongSelf.listOffset = max(0.0, offset) let headerFrame = CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: max(0.0, offset + overlap))) listTransition.updateFrame(node: strongSelf.headerNode, frame: headerFrame) - strongSelf.headerNode.updateLayout(layout: layout, navigationBarHeight: navigationBarHeight, padding: strongSelf.state.displayingMapModeOptions ? 38.0 : 0.0, size: headerFrame.size, transition: listTransition) + strongSelf.headerNode.updateLayout(layout: layout, navigationBarHeight: navigationBarHeight, topPadding: strongSelf.state.displayingMapModeOptions ? 38.0 : 0.0, offset: 0.0, size: headerFrame.size, transition: listTransition) strongSelf.layoutActivityIndicator(transition: listTransition) } @@ -590,9 +608,9 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { }) } - func activateSearch(navigationBar: NavigationBar) { + func activateSearch(navigationBar: NavigationBar) -> Signal { guard let (layout, navigationBarHeight) = self.validLayout, self.searchContainerNode == nil, let coordinate = self.headerNode.mapNode.mapCenterCoordinate else { - return + return .complete() } let searchContainerNode = LocationSearchContainerNode(context: self.context, coordinate: coordinate, interaction: self.interaction) @@ -602,6 +620,8 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { searchContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3) self.containerLayoutUpdated(layout, navigationHeight: navigationBarHeight, transition: .immediate) + + return searchContainerNode.isSearching } func deactivateSearch() { @@ -643,10 +663,8 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { let isFirstLayout = self.validLayout == nil self.validLayout = (layout, navigationHeight) + let isPickingLocation = self.state.selectedLocation.isCustom || self.state.forceSelection let optionsHeight: CGFloat = 38.0 - - let pickingCustomLocation = self.state.selectedLocation.isCustom - var actionHeight: CGFloat? self.listNode.forEachItemNode { itemNode in if let itemNode = itemNode as? LocationActionListItemNode { @@ -659,7 +677,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { let topInset: CGFloat = floor((layout.size.height - navigationHeight) / 2.0 + navigationHeight) let overlap: CGFloat = 6.0 let headerHeight: CGFloat - if pickingCustomLocation, let actionHeight = actionHeight { + if isPickingLocation, let actionHeight = actionHeight { self.listOffset = topInset headerHeight = layout.size.height - actionHeight - layout.intrinsicInsets.bottom + overlap - 2.0 } else if let listOffset = self.listOffset { @@ -669,26 +687,29 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { } let headerFrame = CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: headerHeight)) transition.updateFrame(node: self.headerNode, frame: headerFrame) - self.headerNode.updateLayout(layout: layout, navigationBarHeight: navigationHeight, padding: self.state.displayingMapModeOptions ? optionsHeight : 0.0, size: headerFrame.size, transition: transition) + + self.headerNode.updateLayout(layout: layout, navigationBarHeight: navigationHeight, topPadding: self.state.displayingMapModeOptions ? optionsHeight : 0.0, offset: 0.0, size: headerFrame.size, transition: transition) let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition) let scrollToItem: ListViewScrollToItem? - if pickingCustomLocation { + if isPickingLocation { scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: curve, directionHint: .Up) } else { scrollToItem = nil } - self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: scrollToItem, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: layout.size, insets: UIEdgeInsets(top: topInset, left: 0.0, bottom: layout.intrinsicInsets.bottom, right: 0.0), headerInsets: UIEdgeInsets(top: navigationHeight, left: 0.0, bottom: layout.intrinsicInsets.bottom, right: 0.0), scrollIndicatorInsets: UIEdgeInsets(top: topInset + 3.0, left: 0.0, bottom: layout.intrinsicInsets.bottom, right: 0.0), duration: duration, curve: curve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) - self.listNode.scrollEnabled = !pickingCustomLocation + + let insets = UIEdgeInsets(top: topInset, left: layout.safeInsets.left, bottom: layout.intrinsicInsets.bottom, right: layout.safeInsets.right) + self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: scrollToItem, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: layout.size, insets: insets, headerInsets: UIEdgeInsets(top: navigationHeight, left: 0.0, bottom: layout.intrinsicInsets.bottom, right: 0.0), scrollIndicatorInsets: UIEdgeInsets(top: topInset + 3.0, left: 0.0, bottom: layout.intrinsicInsets.bottom, right: 0.0), duration: duration, curve: curve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + self.listNode.scrollEnabled = !isPickingLocation var listFrame: CGRect = CGRect(origin: CGPoint(), size: layout.size) - if pickingCustomLocation { + if isPickingLocation { listFrame.origin.y = headerHeight - topInset - overlap } transition.updateFrame(node: self.listNode, frame: listFrame) - transition.updateAlpha(node: self.shadeNode, alpha: pickingCustomLocation ? 1.0 : 0.0) + transition.updateAlpha(node: self.shadeNode, alpha: isPickingLocation ? 1.0 : 0.0) transition.updateFrame(node: self.shadeNode, frame: CGRect(x: 0.0, y: listFrame.minY + topInset + (actionHeight ?? 0.0) - 3.0, width: layout.size.width, height: 10000.0)) - self.shadeNode.isUserInteractionEnabled = pickingCustomLocation + self.shadeNode.isUserInteractionEnabled = isPickingLocation self.innerShadeNode.frame = CGRect(x: 0.0, y: 4.0, width: layout.size.width, height: 10000.0) self.innerShadeNode.alpha = layout.intrinsicInsets.bottom > 0.0 ? 1.0 : 0.0 diff --git a/submodules/LocationUI/Sources/LocationSearchContainerNode.swift b/submodules/LocationUI/Sources/LocationSearchContainerNode.swift index 18699b114b..3293d7628a 100644 --- a/submodules/LocationUI/Sources/LocationSearchContainerNode.swift +++ b/submodules/LocationUI/Sources/LocationSearchContainerNode.swift @@ -13,14 +13,18 @@ import AccountContext import ItemListVenueItem import ItemListUI import MapKit +import Geocoding +import ChatListSearchItemHeader private struct LocationSearchEntry: Identifiable, Comparable { let index: Int let theme: PresentationTheme - let venue: TelegramMediaMap - + let location: TelegramMediaMap + let title: String? + let distance: Double + var stableId: String { - return self.venue.venue?.id ?? "" + return self.location.venue?.id ?? "" } static func ==(lhs: LocationSearchEntry, rhs: LocationSearchEntry) -> Bool { @@ -30,7 +34,13 @@ private struct LocationSearchEntry: Identifiable, Comparable { if lhs.theme !== rhs.theme { return false } - if lhs.venue.venue?.id != rhs.venue.venue?.id { + if lhs.location.venue?.id != rhs.location.venue?.id { + return false + } + if lhs.title != rhs.title { + return false + } + if lhs.distance != rhs.distance { return false } return true @@ -41,10 +51,19 @@ private struct LocationSearchEntry: Identifiable, Comparable { } func item(account: Account, presentationData: PresentationData, sendVenue: @escaping (TelegramMediaMap) -> Void) -> ListViewItem { - let venue = self.venue - return ItemListVenueItem(presentationData: ItemListPresentationData(presentationData), account: account, venue: self.venue, sectionId: 0, style: .plain, action: { + let venue = self.location + let header: ChatListSearchItemHeader + let subtitle: String? + if let _ = venue.venue { + header = ChatListSearchItemHeader(type: .nearbyVenues, theme: presentationData.theme, strings: presentationData.strings) + subtitle = nil + } else { + header = ChatListSearchItemHeader(type: .mapAddress, theme: presentationData.theme, strings: presentationData.strings) + subtitle = presentationData.strings.Map_DistanceAway(stringForDistance(strings: presentationData.strings, distance: self.distance)).0 + } + return ItemListVenueItem(presentationData: ItemListPresentationData(presentationData), account: account, venue: self.location, title: self.title, subtitle: subtitle, style: .plain, action: { sendVenue(venue) - }) + }, header: header) } } @@ -81,10 +100,17 @@ final class LocationSearchContainerNode: ASDisplayNode { private var containerViewLayout: (ContainerViewLayout, CGFloat)? private var enqueuedTransitions: [LocationSearchContainerTransition] = [] + private let _isSearching = ValuePromise(false, ignoreRepeated: true) + var isSearching: Signal { + return self._isSearching.get() + } + public init(context: AccountContext, coordinate: CLLocationCoordinate2D, interaction: LocationPickerInteraction) { self.context = context self.interaction = interaction + let currentLocation = CLLocation(latitude: coordinate.latitude, longitude: coordinate.longitude) + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } self.themeAndStringsPromise = Promise((self.presentationData.theme, self.presentationData.strings)) @@ -107,6 +133,7 @@ final class LocationSearchContainerNode: ASDisplayNode { let themeAndStringsPromise = self.themeAndStringsPromise + let isSearching = self._isSearching let searchItems = self.searchQuery.get() |> mapToSignal { query -> Signal in if let query = query, !query.isEmpty { @@ -119,19 +146,43 @@ final class LocationSearchContainerNode: ASDisplayNode { |> mapToSignal { query -> Signal<[LocationSearchEntry]?, NoError> in if let query = query, !query.isEmpty { let foundVenues = nearbyVenues(account: context.account, latitude: coordinate.latitude, longitude: coordinate.longitude, query: query) - return combineLatest(foundVenues, themeAndStringsPromise.get()) + |> afterCompleted { + isSearching.set(false) + } + let foundPlacemarks = geocodeLocation(address: query) + return combineLatest(foundVenues, foundPlacemarks, themeAndStringsPromise.get()) |> delay(0.1, queue: Queue.concurrentDefaultQueue()) - |> map { venues, themeAndStrings -> [LocationSearchEntry] in + |> beforeStarted { + isSearching.set(true) + } + |> map { venues, placemarks, themeAndStrings -> [LocationSearchEntry] in var entries: [LocationSearchEntry] = [] var index: Int = 0 + + if let placemarks = placemarks { + for placemark in placemarks { + guard let placemarkLocation = placemark.location else { + continue + } + let location = TelegramMediaMap(latitude: placemarkLocation.coordinate.latitude, longitude: placemarkLocation.coordinate.longitude, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil) + + entries.append(LocationSearchEntry(index: index, theme: themeAndStrings.0, location: location, title: placemark.name ?? "Name", distance: placemarkLocation.distance(from: currentLocation))) + + index += 1 + } + } + for venue in venues { - entries.append(LocationSearchEntry(index: index, theme: themeAndStrings.0, venue: venue)) + entries.append(LocationSearchEntry(index: index, theme: themeAndStrings.0, location: venue, title: nil, distance: 0.0)) index += 1 } return entries } } else { return .single(nil) + |> afterCompleted { + isSearching.set(true) + } } } @@ -141,7 +192,12 @@ final class LocationSearchContainerNode: ASDisplayNode { if let strongSelf = self { let previousItems = previousSearchItems.swap(items ?? []) let transition = locationSearchContainerPreparedTransition(from: previousItems, to: items ?? [], isSearching: items != nil, account: context.account, presentationData: strongSelf.presentationData, sendVenue: { venue in self?.listNode.clearHighlightAnimated(true) - self?.interaction.sendVenue(venue) + if let _ = venue.venue { + self?.interaction.sendVenue(venue) + } else { + self?.interaction.goToCoordinate(venue.coordinate) + self?.interaction.dismissSearch() + } }) strongSelf.enqueueTransition(transition) } diff --git a/submodules/LocationUI/Sources/LocationSearchNavigationContentNode.swift b/submodules/LocationUI/Sources/LocationSearchNavigationContentNode.swift index 4f97b5586d..56db5556a5 100644 --- a/submodules/LocationUI/Sources/LocationSearchNavigationContentNode.swift +++ b/submodules/LocationUI/Sources/LocationSearchNavigationContentNode.swift @@ -54,6 +54,10 @@ final class LocationSearchNavigationContentNode: NavigationBarContentNode { self.searchBar.deactivate(clear: false) } + func updateActivity(_ activity: Bool) { + self.searchBar.activity = activity + } + func updatePresentationData(_ presentationData: PresentationData) { self.presentationData = presentationData self.searchBar.updateThemeAndStrings(theme: SearchBarNodeTheme(theme: presentationData.theme, hasSeparator: false), strings: presentationData.strings) diff --git a/submodules/MtProtoKit/MTProtoKit/MTContext.h b/submodules/MtProtoKit/MTProtoKit/MTContext.h index 57c6474d9e..c4cff82ef3 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTContext.h +++ b/submodules/MtProtoKit/MTProtoKit/MTContext.h @@ -22,7 +22,7 @@ - (void)contextDatacenterAddressSetUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId addressSet:(MTDatacenterAddressSet *)addressSet; - (void)contextDatacenterAuthInfoUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId authInfo:(MTDatacenterAuthInfo *)authInfo; - (void)contextDatacenterAuthTokenUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId authToken:(id)authToken; -- (void)contextDatacenterTransportSchemesUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId; +- (void)contextDatacenterTransportSchemesUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId shouldReset:(bool)shouldReset; - (void)contextIsPasswordRequiredUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId; - (void)contextDatacenterPublicKeysUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId publicKeys:(NSArray *)publicKeys; - (MTSignal *)fetchContextDatacenterPublicKeys:(MTContext *)context datacenterId:(NSInteger)datacenterId; diff --git a/submodules/MtProtoKit/MTProtoKit/MTContext.m b/submodules/MtProtoKit/MTProtoKit/MTContext.m index 357148b856..e38d403363 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTContext.m +++ b/submodules/MtProtoKit/MTProtoKit/MTContext.m @@ -491,10 +491,11 @@ static int32_t fixedTimeDifferenceValue = 0; [listener contextDatacenterAddressSetUpdated:self datacenterId:datacenterId addressSet:addressSet]; } - if (previousAddressSetWasEmpty || updateSchemes || true) { + if (true) { + bool shouldReset = previousAddressSetWasEmpty || updateSchemes; for (id listener in currentListeners) { - if ([listener respondsToSelector:@selector(contextDatacenterTransportSchemesUpdated:datacenterId:)]) { - [listener contextDatacenterTransportSchemesUpdated:self datacenterId:datacenterId]; + if ([listener respondsToSelector:@selector(contextDatacenterTransportSchemesUpdated:datacenterId:shouldReset:)]) { + [listener contextDatacenterTransportSchemesUpdated:self datacenterId:datacenterId shouldReset:shouldReset]; } } } else { @@ -664,8 +665,8 @@ static int32_t fixedTimeDifferenceValue = 0; } for (id listener in currentListeners) { - if ([listener respondsToSelector:@selector(contextDatacenterTransportSchemesUpdated:datacenterId:)]) - [listener contextDatacenterTransportSchemesUpdated:self datacenterId:datacenterId]; + if ([listener respondsToSelector:@selector(contextDatacenterTransportSchemesUpdated:datacenterId:shouldReset:)]) + [listener contextDatacenterTransportSchemesUpdated:self datacenterId:datacenterId shouldReset:true]; } } }]; diff --git a/submodules/MtProtoKit/MTProtoKit/MTProto.m b/submodules/MtProtoKit/MTProtoKit/MTProto.m index bba17b43ca..a88d60767f 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTProto.m +++ b/submodules/MtProtoKit/MTProtoKit/MTProto.m @@ -2715,15 +2715,20 @@ static NSString *dumpHexString(NSData *data, int maxLength) { } } -- (void)contextDatacenterTransportSchemesUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId { +- (void)contextDatacenterTransportSchemesUpdated:(MTContext *)context datacenterId:(NSInteger)datacenterId shouldReset:(bool)shouldReset { [[MTProto managerQueue] dispatchOnQueue:^ { if (context == _context && datacenterId == _datacenterId && ![self isStopped]) { + bool resolvedShouldReset = shouldReset; + if (_mtState & MTProtoStateAwaitingDatacenterScheme) { [self setMtState:_mtState & (~MTProtoStateAwaitingDatacenterScheme)]; + resolvedShouldReset = true; } - [self resetTransport]; - [self requestTransportTransaction]; + if (resolvedShouldReset) { + [self resetTransport]; + [self requestTransportTransaction]; + } } }]; } diff --git a/submodules/NotificationMuteSettingsUI/Sources/NotificationMuteSettingsController.swift b/submodules/NotificationMuteSettingsUI/Sources/NotificationMuteSettingsController.swift index 513c4319c9..953e997502 100644 --- a/submodules/NotificationMuteSettingsUI/Sources/NotificationMuteSettingsController.swift +++ b/submodules/NotificationMuteSettingsUI/Sources/NotificationMuteSettingsController.swift @@ -23,7 +23,7 @@ public struct NotificationSoundSettings { } public func notificationMuteSettingsController(presentationData: PresentationData, notificationSettings: MessageNotificationSettings, soundSettings: NotificationSoundSettings?, openSoundSettings: @escaping () -> Void, updateSettings: @escaping (Int32?) -> Void) -> ViewController { - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/OpenInExternalAppUI/Sources/OpenInActionSheetController.swift b/submodules/OpenInExternalAppUI/Sources/OpenInActionSheetController.swift index cbb3711de7..3e84e47d75 100644 --- a/submodules/OpenInExternalAppUI/Sources/OpenInActionSheetController.swift +++ b/submodules/OpenInExternalAppUI/Sources/OpenInActionSheetController.swift @@ -35,11 +35,11 @@ public final class OpenInActionSheetController: ActionSheetController { let theme = presentationData.theme let strings = presentationData.strings - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self.presentationDisposable = context.sharedContext.presentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) @@ -116,9 +116,6 @@ private final class OpenInActionSheetItem: ActionSheetItem { } } -private let titleFont = Font.medium(20.0) -private let textFont = Font.regular(11.0) - private final class OpenInActionSheetItemNode: ActionSheetItemNode { let theme: ActionSheetControllerTheme let strings: PresentationStrings @@ -132,6 +129,9 @@ private final class OpenInActionSheetItemNode: ActionSheetItemNode { self.theme = theme self.strings = strings + let titleFont = Font.medium(floor(theme.baseFontSize * 20.0 / 17.0)) + let textFont = Font.regular(floor(theme.baseFontSize * 11.0 / 17.0)) + self.titleNode = ASTextNode() self.titleNode.isUserInteractionEnabled = false self.titleNode.displaysAsynchronously = true @@ -216,6 +216,7 @@ private final class OpenInAppNode : ASDisplayNode { } func setup(postbox: Postbox, context: AccountContext, theme: ActionSheetControllerTheme, option: OpenInOption, invokeAction: @escaping (OpenInAction) -> Void) { + let textFont = Font.regular(floor(theme.baseFontSize * 11.0 / 17.0)) self.textNode.attributedText = NSAttributedString(string: option.title, font: textFont, textColor: theme.primaryTextColor, paragraphAlignment: .center) let iconSize = CGSize(width: 60.0, height: 60.0) diff --git a/submodules/PasscodeUI/Sources/PasscodeSetupController.swift b/submodules/PasscodeUI/Sources/PasscodeSetupController.swift index b3c400ae9c..33a9f3cb4a 100644 --- a/submodules/PasscodeUI/Sources/PasscodeSetupController.swift +++ b/submodules/PasscodeUI/Sources/PasscodeSetupController.swift @@ -59,7 +59,7 @@ public final class PasscodeSetupController: ViewController { return } - let controller = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let controller = ActionSheetController(presentationData: strongSelf.presentationData) let dismissAction: () -> Void = { [weak controller] in self?.controllerNode.activateInput() controller?.dismissAnimated() diff --git a/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift b/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift index 0c1dc472dd..349dd669a8 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthControllerNode.swift @@ -727,7 +727,7 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode { } if let currentValue = currentValue { - let controller = ActionSheetController(presentationTheme: self.presentationData.theme) + let controller = ActionSheetController(presentationData: self.presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -847,7 +847,7 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode { return } - let controller = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let controller = ActionSheetController(presentationData: strongSelf.presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -916,7 +916,7 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode { ] } - let controller = ActionSheetController(presentationTheme: self.presentationData.theme) + let controller = ActionSheetController(presentationData: self.presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -961,7 +961,7 @@ final class SecureIdAuthControllerNode: ViewControllerTracingNode { } private func deleteAllValues() { - let controller = ActionSheetController(presentationTheme: self.presentationData.theme) + let controller = ActionSheetController(presentationData: self.presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift b/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift index e2b30260c5..e8782a86e6 100644 --- a/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift +++ b/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift @@ -2143,6 +2143,7 @@ final class SecureIdDocumentFormControllerNode: FormControllerNode Void = { [weak controller] in controller?.dismissAnimated() } @@ -2756,7 +2758,7 @@ final class SecureIdDocumentFormControllerNode: FormControllerNode Void = { [weak controller] in controller?.dismissAnimated() } @@ -2816,7 +2818,7 @@ final class SecureIdDocumentFormControllerNode: FormControllerNode Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/PassportUI/Sources/SecureIdDocumentGalleryFooterContentNode.swift b/submodules/PassportUI/Sources/SecureIdDocumentGalleryFooterContentNode.swift index b3959526a6..269c1bdbdc 100644 --- a/submodules/PassportUI/Sources/SecureIdDocumentGalleryFooterContentNode.swift +++ b/submodules/PassportUI/Sources/SecureIdDocumentGalleryFooterContentNode.swift @@ -143,7 +143,7 @@ final class SecureIdDocumentGalleryFooterContentNode: GalleryFooterContentNode { @objc func deleteButtonPressed() { let presentationData = self.context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) let items: [ActionSheetItem] = [ ActionSheetButtonItem(title: presentationData.strings.Common_Delete, color: .destructive, action: { [weak self, weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/PassportUI/Sources/SecureIdDocumentTypeSelectionController.swift b/submodules/PassportUI/Sources/SecureIdDocumentTypeSelectionController.swift index ba7ffea302..08b80c1d04 100644 --- a/submodules/PassportUI/Sources/SecureIdDocumentTypeSelectionController.swift +++ b/submodules/PassportUI/Sources/SecureIdDocumentTypeSelectionController.swift @@ -89,11 +89,11 @@ final class SecureIdDocumentTypeSelectionController: ActionSheetController { self.completion = completion - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self.presentationDisposable = context.sharedContext.presentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) diff --git a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift index c3cb036a8a..444b537c47 100644 --- a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift +++ b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift @@ -505,12 +505,12 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega self.backgroundNode = ASImageNode() self.backgroundNode.displaysAsynchronously = false self.backgroundNode.displayWithoutProcessing = true - self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 20.0, color: theme.actionSheet.inputBackgroundColor) + self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 20.0, color: theme.list.freePlainInputField.backgroundColor) self.inputNode = TextFieldNode() self.inputNode.textField.font = Font.regular(17.0) - self.inputNode.textField.textColor = theme.actionSheet.inputTextColor - self.inputNode.textField.attributedPlaceholder = NSAttributedString(string: placeholder, font: Font.regular(17.0), textColor: theme.actionSheet.inputPlaceholderColor) + self.inputNode.textField.textColor = theme.list.freePlainInputField.primaryColor + self.inputNode.textField.attributedPlaceholder = NSAttributedString(string: placeholder, font: Font.regular(17.0), textColor: theme.list.freePlainInputField.placeholderColor) self.hideButtonNode = HighlightableButtonNode() @@ -548,10 +548,10 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega } self.inputNode.textField.keyboardAppearance = theme.rootController.keyboardColor.keyboardAppearance - self.hideButtonNode.setImage(generateTextHiddenImage(color: theme.actionSheet.inputClearButtonColor, on: false), for: []) + self.hideButtonNode.setImage(generateTextHiddenImage(color: theme.list.freePlainInputField.controlColor, on: false), for: []) self.clearButtonNode = HighlightableButtonNode() - self.clearButtonNode.setImage(generateClearImage(color: theme.actionSheet.inputClearButtonColor), for: []) + self.clearButtonNode.setImage(generateClearImage(color: theme.list.freePlainInputField.controlColor), for: []) self.clearButtonNode.isHidden = true super.init() @@ -1198,11 +1198,27 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS transition.updateFrame(node: self.skipActionButtonNode, frame: buttonFrame) transition.updateFrame(node: self.skipActionTitleNode, frame: CGRect(origin: CGPoint(x: buttonFrame.minX + floor((buttonFrame.width - skipActionSize.width) / 2.0), y: buttonFrame.minY + floor((buttonFrame.height - skipActionSize.height) / 2.0)), size: skipActionSize)) - transition.updateFrame(node: self.changeEmailActionButtonNode, frame: CGRect(origin: CGPoint(x: buttonFrame.minX, y: buttonFrame.minY), size: CGSize(width: floor(buttonFrame.width / 2.0), height: buttonFrame.height))) - transition.updateFrame(node: self.resendCodeActionButtonNode, frame: CGRect(origin: CGPoint(x: buttonFrame.maxX - floor(buttonFrame.width / 2.0), y: buttonFrame.minY), size: CGSize(width: floor(buttonFrame.width / 2.0), height: buttonFrame.height))) + let changeEmailActionFrame: CGRect + let changeEmailActionButtonFrame: CGRect + let resendCodeActionFrame: CGRect + let resendCodeActionButtonFrame: CGRect + if changeEmailActionSize.width + resendCodeActionSize.width > layout.size.width - 24.0 { + changeEmailActionButtonFrame = CGRect(origin: CGPoint(x: buttonFrame.minX, y: buttonFrame.minY), size: CGSize(width: buttonFrame.width, height: buttonFrame.height)) + changeEmailActionFrame = CGRect(origin: CGPoint(x: changeEmailActionButtonFrame.minX + floor((changeEmailActionButtonFrame.width - changeEmailActionSize.width) / 2.0), y: changeEmailActionButtonFrame.minY + floor((changeEmailActionButtonFrame.height - changeEmailActionSize.height) / 2.0)), size: changeEmailActionSize) + resendCodeActionButtonFrame = CGRect(origin: CGPoint(x: buttonFrame.minX, y: buttonFrame.maxY), size: CGSize(width: buttonFrame.width, height: buttonFrame.height)) + resendCodeActionFrame = CGRect(origin: CGPoint(x: resendCodeActionButtonFrame.minX + floor((resendCodeActionButtonFrame.width - resendCodeActionSize.width) / 2.0), y: resendCodeActionButtonFrame.minY + floor((resendCodeActionButtonFrame.height - resendCodeActionSize.height) / 2.0)), size: resendCodeActionSize) + } else { + changeEmailActionButtonFrame = CGRect(origin: CGPoint(x: buttonFrame.minX, y: buttonFrame.minY), size: CGSize(width: floor(buttonFrame.width / 2.0), height: buttonFrame.height)) + changeEmailActionFrame = CGRect(origin: CGPoint(x: changeEmailActionButtonFrame.minX, y: changeEmailActionButtonFrame.minY + floor((changeEmailActionButtonFrame.height - changeEmailActionSize.height) / 2.0)), size: changeEmailActionSize) + resendCodeActionButtonFrame = CGRect(origin: CGPoint(x: buttonFrame.maxX - floor(buttonFrame.width / 2.0), y: buttonFrame.minY), size: CGSize(width: floor(buttonFrame.width / 2.0), height: buttonFrame.height)) + resendCodeActionFrame = CGRect(origin: CGPoint(x: resendCodeActionButtonFrame.maxX - resendCodeActionSize.width, y: resendCodeActionButtonFrame.minY + floor((resendCodeActionButtonFrame.height - resendCodeActionSize.height) / 2.0)), size: resendCodeActionSize) + } - transition.updateFrame(node: self.changeEmailActionTitleNode, frame: CGRect(origin: CGPoint(x: buttonFrame.minX, y: buttonFrame.minY + floor((buttonFrame.height - changeEmailActionSize.height) / 2.0)), size: changeEmailActionSize)) - transition.updateFrame(node: self.resendCodeActionTitleNode, frame: CGRect(origin: CGPoint(x: buttonFrame.maxX - resendCodeActionSize.width, y: buttonFrame.minY + floor((buttonFrame.height - resendCodeActionSize.height) / 2.0)), size: resendCodeActionSize)) + transition.updateFrame(node: self.changeEmailActionButtonNode, frame: changeEmailActionButtonFrame) + transition.updateFrame(node: self.resendCodeActionButtonNode, frame: resendCodeActionButtonFrame) + + transition.updateFrame(node: self.changeEmailActionTitleNode, frame: changeEmailActionFrame) + transition.updateFrame(node: self.resendCodeActionTitleNode, frame: resendCodeActionFrame) transition.animateView { self.scrollNode.view.contentInset = UIEdgeInsets(top: 0.0, left: 0.0, bottom: layout.insets(options: [.input]).bottom, right: 0.0) diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift index a6542e8338..7132c6cfa2 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift @@ -148,7 +148,7 @@ final class AvatarGalleryItemFooterContentNode: GalleryFooterContentNode { @objc private func deleteButtonPressed() { let presentationData = self.context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) let items: [ActionSheetItem] = [ ActionSheetButtonItem(title: presentationData.strings.Common_Delete, color: .destructive, action: { [weak self, weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift index e25514050f..f6de2685fa 100644 --- a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift @@ -868,7 +868,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi } }, dismissAdmin: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetButtonItem(title: presentationData.strings.Channel_Moderator_AccessLevelRevoke, color: .destructive, font: .default, enabled: true, action: { [weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift index cfc11dc4bc..8cdcc8a0d5 100644 --- a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift @@ -461,7 +461,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI }) }, openTimeout: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) let intervals: [Int32] = [ 1 * 60 * 60 * 24, 7 * 60 * 60 * 24, @@ -499,7 +499,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI presentControllerImpl?(actionSheet, nil) }, delete: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetButtonItem(title: presentationData.strings.GroupPermission_Delete, color: .destructive, font: .default, enabled: true, action: { [weak actionSheet] in actionSheet?.dismissAnimated() @@ -703,7 +703,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: presentationData.strings.GroupPermission_ApplyAlertText(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0)) items.append(ActionSheetButtonItem(title: presentationData.strings.GroupPermission_ApplyAlertAction, color: .accent, font: .default, enabled: true, action: { [weak actionSheet] in diff --git a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift index 8420a3edc0..4af27181e4 100644 --- a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift @@ -359,7 +359,7 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId) return } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetItem] = [] if !participant.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder).isEmpty { items.append(ActionSheetTextItem(title: participant.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder))) diff --git a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupActionSheetItem.swift b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupActionSheetItem.swift index 282532c2cd..632fb32ace 100644 --- a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupActionSheetItem.swift +++ b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupActionSheetItem.swift @@ -75,9 +75,13 @@ private final class ChannelDiscussionGroupActionSheetItemNode: ActionSheetItemNo } else { text = strings.Channel_DiscussionGroup_PrivateChannelLink(groupPeer.displayTitle(strings: strings, displayOrder: nameDisplayOrder), channelPeer.displayTitle(strings: strings, displayOrder: nameDisplayOrder)) } - let attributedText = NSMutableAttributedString(attributedString: NSAttributedString(string: text.0, font: Font.regular(14.0), textColor: theme.primaryTextColor)) + + let textFont = Font.regular(floor(theme.baseFontSize * 14.0 / 17.0)) + let boldFont = Font.semibold(floor(theme.baseFontSize * 14.0 / 17.0)) + + let attributedText = NSMutableAttributedString(attributedString: NSAttributedString(string: text.0, font: textFont, textColor: theme.primaryTextColor)) for (_, range) in text.1 { - attributedText.addAttribute(.font, value: Font.semibold(14.0), range: range) + attributedText.addAttribute(.font, value: boldFont, range: range) } self.textNode.attributedText = attributedText diff --git a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift index 208c3b2d51..4903486df0 100644 --- a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift @@ -305,7 +305,7 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ChannelDiscussionGroupActionSheetItem(context: context, channelPeer: channelPeer, groupPeer: groupPeer, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder), ActionSheetButtonItem(title: presentationData.strings.Channel_DiscussionGroup_LinkGroup, color: .accent, action: { [weak actionSheet] in diff --git a/submodules/PeerInfoUI/Sources/ChannelInfoController.swift b/submodules/PeerInfoUI/Sources/ChannelInfoController.swift index 3d2f4770db..c6f54bc7a1 100644 --- a/submodules/PeerInfoUI/Sources/ChannelInfoController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelInfoController.swift @@ -905,7 +905,7 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi return } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -929,7 +929,7 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi return } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift index 3a500896a4..7c8d773521 100644 --- a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift +++ b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift @@ -922,7 +922,7 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId, }) }, revokePrivateLink: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift b/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift index 3c61919f78..1163927d61 100644 --- a/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift +++ b/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift @@ -869,7 +869,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device |> deliverOnMainQueue).start(next: { user in if let user = user, let phone = user.phone, formatPhoneNumber(phone) == formatPhoneNumber(number) { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -992,7 +992,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device inviteAction(subject.contactData.basicData.phoneNumbers[0].value) } else { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -1402,7 +1402,7 @@ private func addContactToExisting(context: AccountContext, parentController: Vie func addContactOptionsController(context: AccountContext, peer: Peer?, contactData: DeviceContactExtendedData) -> ActionSheetController { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/PeerInfoUI/Sources/GroupInfoController.swift b/submodules/PeerInfoUI/Sources/GroupInfoController.swift index 003f1668fe..6c0a565449 100644 --- a/submodules/PeerInfoUI/Sources/GroupInfoController.swift +++ b/submodules/PeerInfoUI/Sources/GroupInfoController.swift @@ -1998,7 +1998,7 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId: let presentationData = context.sharedContext.currentPresentationData.with { $0 } if let channel = peerView.peers[peerView.peerId] as? TelegramChannel, channel.flags.contains(.isCreator), stateValue.with({ $0 }).editingState != nil { - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -2015,7 +2015,7 @@ public func groupInfoController(context: AccountContext, peerId originalPeerId: ]) presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) } else if let peer = peerView.peers[peerView.peerId] { - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift b/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift index 693185f0a9..fcbab9fe62 100644 --- a/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift +++ b/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift @@ -208,7 +208,7 @@ public func groupsInCommonController(context: AccountContext, peerId: PeerId) -> arguments.openPeer(peer.id) })) ] - let contextController = ContextController(account: context.account, theme: presentationData.theme, strings: presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) + let contextController = ContextController(account: context.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) controller.presentInGlobalOverlay(contextController) } return controller diff --git a/submodules/PeerInfoUI/Sources/PeerBanTimeoutController.swift b/submodules/PeerInfoUI/Sources/PeerBanTimeoutController.swift index e0dfa93163..b6a7459613 100644 --- a/submodules/PeerInfoUI/Sources/PeerBanTimeoutController.swift +++ b/submodules/PeerInfoUI/Sources/PeerBanTimeoutController.swift @@ -23,13 +23,13 @@ final class PeerBanTimeoutController: ActionSheetController { let theme = presentationData.theme let strings = presentationData.strings - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self._ready.set(.single(true)) self.presentationDisposable = context.sharedContext.presentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) diff --git a/submodules/PeerInfoUI/Sources/PeerReportController.swift b/submodules/PeerInfoUI/Sources/PeerReportController.swift index e0ce0e9a09..5e057cf581 100644 --- a/submodules/PeerInfoUI/Sources/PeerReportController.swift +++ b/submodules/PeerInfoUI/Sources/PeerReportController.swift @@ -111,7 +111,7 @@ public func presentPeerReportOptions(context: AccountContext, parent: ViewContro public func peerReportOptionsController(context: AccountContext, subject: PeerReportSubject, present: @escaping (ViewController, Any?) -> Void, push: @escaping (ViewController) -> Void, completion: @escaping (Bool) -> Void) -> ViewController { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(theme: ActionSheetControllerTheme(presentationTheme: presentationData.theme)) + let controller = ActionSheetController(theme: ActionSheetControllerTheme(presentationData: presentationData)) let options: [PeerReportOption] = [ .spam, diff --git a/submodules/PeerInfoUI/Sources/UserInfoController.swift b/submodules/PeerInfoUI/Sources/UserInfoController.swift index 564eb79e5e..4295034880 100644 --- a/submodules/PeerInfoUI/Sources/UserInfoController.swift +++ b/submodules/PeerInfoUI/Sources/UserInfoController.swift @@ -990,7 +990,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe } else { if value { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -1046,7 +1046,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe }) }, deleteContact: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -1112,7 +1112,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe |> deliverOnMainQueue).start(next: { peer, _ in if let peer = peer as? TelegramUser, let peerPhoneNumber = peer.phone, formatPhoneNumber(number) == formatPhoneNumber(peerPhoneNumber) { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -1584,7 +1584,7 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe let presentationData = context.sharedContext.currentPresentationData.with { $0 } let text: String = presentationData.strings.UserInfo_TapToCall - let tooltipController = TooltipController(content: .text(text), dismissByTapOutside: true) + let tooltipController = TooltipController(content: .text(text), baseFontSize: presentationData.fontSize.baseDisplaySize, dismissByTapOutside: true) controller.present(tooltipController, in: .window(.root), with: TooltipControllerPresentationArguments(sourceNodeAndRect: { [weak resultItemNode] in if let resultItemNode = resultItemNode { return (resultItemNode, callButtonFrame) diff --git a/submodules/SettingsUI/Sources/Data and Storage/DataAndStorageSettingsController.swift b/submodules/SettingsUI/Sources/Data and Storage/DataAndStorageSettingsController.swift index 43d5c20f3c..d98436d558 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/DataAndStorageSettingsController.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/DataAndStorageSettingsController.swift @@ -468,7 +468,9 @@ private func dataAndStorageControllerEntries(state: DataAndStorageControllerStat entries.append(.useLessVoiceData(presentationData.theme, presentationData.strings.CallSettings_UseLessData, stringForUseLessDataSetting(dataSaving, strings: presentationData.strings))) entries.append(.otherHeader(presentationData.theme, presentationData.strings.ChatSettings_Other)) - entries.append(.shareSheet(presentationData.theme, "Share Sheet")) + if #available(iOSApplicationExtension 13.2, iOS 13.2, *) { + entries.append(.shareSheet(presentationData.theme, presentationData.strings.ChatSettings_IntentsSettings)) + } entries.append(.saveIncomingPhotos(presentationData.theme, presentationData.strings.Settings_SaveIncomingPhotos)) entries.append(.saveEditedPhotos(presentationData.theme, presentationData.strings.Settings_SaveEditedPhotos, data.generatedMediaStoreSettings.storeEditedPhotos)) entries.append(.openLinksIn(presentationData.theme, presentationData.strings.ChatSettings_OpenLinksIn, defaultWebBrowser)) @@ -554,7 +556,7 @@ func dataAndStorageController(context: AccountContext, focusOnItemTag: DataAndSt pushControllerImpl?(autodownloadMediaConnectionTypeController(context: context, connectionType: connectionType)) }, resetAutomaticDownload: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: presentationData.strings.AutoDownloadSettings_ResetHelp), ActionSheetButtonItem(title: presentationData.strings.AutoDownloadSettings_Reset, color: .destructive, action: { [weak actionSheet] in diff --git a/submodules/SettingsUI/Sources/Data and Storage/IntentsSettingsController.swift b/submodules/SettingsUI/Sources/Data and Storage/IntentsSettingsController.swift index 5dab8cc848..a5b7a22b40 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/IntentsSettingsController.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/IntentsSettingsController.swift @@ -150,7 +150,6 @@ private enum IntentsSettingsControllerEntry: ItemListNodeEntry { } else { return false } - case let .suggestHeader(lhsTheme, lhsText): if case let .suggestHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { return true @@ -272,7 +271,7 @@ public func intentsSettingsController(context: AccountContext) -> ViewController let _ = updateIntentsSettingsInteractively(accountManager: context.sharedContext.accountManager, f).start() }, resetAll: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetButtonItem(title: presentationData.strings.IntentsSettings_Reset, color: .destructive, action: { [weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/SettingsUI/Sources/Data and Storage/NetworkUsageStatsController.swift b/submodules/SettingsUI/Sources/Data and Storage/NetworkUsageStatsController.swift index a59748fcf5..87744afa82 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/NetworkUsageStatsController.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/NetworkUsageStatsController.swift @@ -389,7 +389,7 @@ func networkUsageStatsController(context: AccountContext) -> ViewController { let arguments = NetworkUsageStatsControllerArguments(resetStatistics: { [weak stats] section in let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift index 9d36248e23..317eedd81f 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/ProxyListSettingsController.swift @@ -216,7 +216,7 @@ private enum ProxySettingsControllerEntry: ItemListNodeEntry { case let .serversHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) case let .addServer(theme, text, _): - return ProxySettingsActionItem(theme: theme, title: text, icon: .add, sectionId: self.section, editing: false, action: { + return ProxySettingsActionItem(presentationData: presentationData, title: text, icon: .add, sectionId: self.section, editing: false, action: { arguments.addNewServer() }) case let .server(_, theme, strings, settings, active, status, editing, enabled): @@ -230,7 +230,7 @@ private enum ProxySettingsControllerEntry: ItemListNodeEntry { arguments.removeServer(settings) }) case let .shareProxyList(theme, text): - return ProxySettingsActionItem(theme: theme, title: text, sectionId: self.section, editing: false, action: { + return ProxySettingsActionItem(presentationData: presentationData, title: text, sectionId: self.section, editing: false, action: { arguments.shareProxyList() }) case let .useForCalls(theme, text, value): diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift index 0302f15264..d2d60c646e 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift @@ -29,7 +29,7 @@ public final class ProxyServerActionSheetController: ActionSheetController { } public init(presentationData: PresentationData, accountManager: AccountManager, postbox: Postbox, network: Network, server: ProxyServerSettings, updatedPresentationData: Signal?) { - let sheetTheme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + let sheetTheme = ActionSheetControllerTheme(presentationData: presentationData) super.init(theme: sheetTheme) self._ready.set(.single(true)) @@ -63,7 +63,7 @@ public final class ProxyServerActionSheetController: ActionSheetController { if let updatedPresentationData = updatedPresentationData { self.presentationDisposable = updatedPresentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) } @@ -97,8 +97,6 @@ private final class ProxyServerInfoItem: ActionSheetItem { } } -private let textFont = Font.regular(16.0) - private enum ProxyServerInfoStatusType { case generic(String) case failed(String) @@ -107,6 +105,7 @@ private enum ProxyServerInfoStatusType { private final class ProxyServerInfoItemNode: ActionSheetItemNode { private let theme: ActionSheetControllerTheme private let strings: PresentationStrings + private let textFont: UIFont private let network: Network private let server: ProxyServerSettings @@ -122,6 +121,8 @@ private final class ProxyServerInfoItemNode: ActionSheetItemNode { self.network = network self.server = server + self.textFont = Font.regular(floor(theme.baseFontSize * 16.0 / 17.0)) + var fieldNodes: [(ImmediateTextNode, ImmediateTextNode)] = [] let serverTitleNode = ImmediateTextNode() serverTitleNode.isUserInteractionEnabled = false @@ -317,10 +318,12 @@ private final class ProxyServerActionItemNode: ActionSheetItemNode { self.dismiss = dismiss self.present = present + let titleFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + self.titleNode = ImmediateTextNode() self.titleNode.isUserInteractionEnabled = false self.titleNode.displaysAsynchronously = false - self.titleNode.attributedText = NSAttributedString(string: presentationData.strings.SocksProxySetup_ConnectAndSave, font: Font.regular(20.0), textColor: theme.controlAccentColor) + self.titleNode.attributedText = NSAttributedString(string: presentationData.strings.SocksProxySetup_ConnectAndSave, font: titleFont, textColor: theme.controlAccentColor) self.activityIndicator = ActivityIndicator(type: .custom(theme.controlAccentColor, 22.0, 1.5, false)) self.activityIndicator.isHidden = true diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift index abdf20b086..4e695deb2a 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift @@ -13,15 +13,15 @@ enum ProxySettingsActionIcon { } final class ProxySettingsActionItem: ListViewItem, ItemListItem { - let theme: PresentationTheme + let presentationData: ItemListPresentationData let title: String let icon: ProxySettingsActionIcon let editing: Bool let sectionId: ItemListSectionId let action: () -> Void - init(theme: PresentationTheme, title: String, icon: ProxySettingsActionIcon = .none, sectionId: ItemListSectionId, editing: Bool, action: @escaping () -> Void) { - self.theme = theme + init(presentationData: ItemListPresentationData, title: String, icon: ProxySettingsActionIcon = .none, sectionId: ItemListSectionId, editing: Bool, action: @escaping () -> Void) { + self.presentationData = presentationData self.title = title self.icon = icon self.editing = editing @@ -75,8 +75,6 @@ final class ProxySettingsActionItem: ListViewItem, ItemListItem { } } -private let titleFont = Font.regular(17.0) - private final class ProxySettingsActionItemNode: ListViewItemNode { private let backgroundNode: ASDisplayNode private let topStripeNode: ASDisplayNode @@ -130,24 +128,26 @@ private final class ProxySettingsActionItemNode: ListViewItemNode { return { item, params, neighbors in var updatedTheme: PresentationTheme? - if currentItem?.theme !== item.theme { - updatedTheme = item.theme + let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize) + + if currentItem?.presentationData.theme !== item.presentationData.theme { + updatedTheme = item.presentationData.theme } let leftInset: CGFloat = (item.icon != .none ? 50.0 : 16.0) + params.leftInset let editingOffset: CGFloat = (item.editing ? 38.0 : 0.0) - let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: item.theme.list.itemAccentColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - editingOffset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: item.presentationData.theme.list.itemAccentColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - editingOffset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) let separatorHeight = UIScreenPixel let insets = itemListNeighborsGroupedInsets(neighbors) - let contentSize = CGSize(width: params.width, height: 44.0) + let contentSize = CGSize(width: params.width, height: 22.0 + titleLayout.size.height) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size - let icon = item.icon == .add ? PresentationResourcesItemList.plusIconImage(item.theme) : nil + let icon = item.icon == .add ? PresentationResourcesItemList.plusIconImage(item.presentationData.theme) : nil return (layout, { [weak self] animated in if let strongSelf = self { @@ -156,10 +156,10 @@ private final class ProxySettingsActionItemNode: ListViewItemNode { strongSelf.accessibilityLabel = item.title if let _ = updatedTheme { - strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor - strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor - strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor - strongSelf.highlightedBackgroundNode.backgroundColor = item.theme.list.itemHighlightedBackgroundColor + strongSelf.topStripeNode.backgroundColor = item.presentationData.theme.list.itemBlocksSeparatorColor + strongSelf.bottomStripeNode.backgroundColor = item.presentationData.theme.list.itemBlocksSeparatorColor + strongSelf.backgroundNode.backgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor + strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor } let _ = titleApply() @@ -213,7 +213,7 @@ private final class ProxySettingsActionItemNode: ListViewItemNode { strongSelf.bottomStripeNode.isHidden = hasCorners } - strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil + strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.presentationData.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight))) strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0) diff --git a/submodules/SettingsUI/Sources/Data and Storage/ShareProxyServerActionSheetController.swift b/submodules/SettingsUI/Sources/Data and Storage/ShareProxyServerActionSheetController.swift index 6ec8d0002e..889ec22ec2 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/ShareProxyServerActionSheetController.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/ShareProxyServerActionSheetController.swift @@ -22,7 +22,7 @@ public final class ShareProxyServerActionSheetController: ActionSheetController private var isDismissed: Bool = false public init(presentationData: PresentationData, updatedPresentationData: Signal, link: String) { - let sheetTheme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + let sheetTheme = ActionSheetControllerTheme(presentationData: presentationData) super.init(theme: sheetTheme) let presentActivityController: (Any) -> Void = { [weak self] item in @@ -67,7 +67,7 @@ public final class ShareProxyServerActionSheetController: ActionSheetController self.presentationDisposable = updatedPresentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) } @@ -119,13 +119,15 @@ private final class ProxyServerQRCodeItemNode: ActionSheetItemNode { self.link = link self.ready = ready + let textFont = Font.regular(floor(theme.baseFontSize * 13.0 / 17.0)) + self.label = ASTextNode() self.label.isUserInteractionEnabled = false self.label.maximumNumberOfLines = 0 self.label.displaysAsynchronously = false self.label.truncationMode = .byTruncatingTail self.label.isUserInteractionEnabled = false - self.label.attributedText = NSAttributedString(string: strings.SocksProxySetup_ShareQRCodeInfo, font: ActionSheetTextNode.defaultFont, textColor: self.theme.secondaryTextColor, paragraphAlignment: .center) + self.label.attributedText = NSAttributedString(string: strings.SocksProxySetup_ShareQRCodeInfo, font: textFont, textColor: self.theme.secondaryTextColor, paragraphAlignment: .center) self.imageNode = TransformImageNode() self.imageNode.clipsToBounds = true diff --git a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift index bf8d091e9e..45d5d70ac7 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift @@ -402,7 +402,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P |> deliverOnMainQueue).start(next: { [weak statsPromise] result in if let result = result, case let .result(stats) = result { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -624,7 +624,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P } let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/DebugAccountsController.swift b/submodules/SettingsUI/Sources/DebugAccountsController.swift index decc358cc5..ccc2dc17fb 100644 --- a/submodules/SettingsUI/Sources/DebugAccountsController.swift +++ b/submodules/SettingsUI/Sources/DebugAccountsController.swift @@ -113,7 +113,7 @@ public func debugAccountsController(context: AccountContext, accountManager: Acc }).start() }, loginNewAccount: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/DebugController.swift b/submodules/SettingsUI/Sources/DebugController.swift index 8037757205..7ccce12457 100644 --- a/submodules/SettingsUI/Sources/DebugController.swift +++ b/submodules/SettingsUI/Sources/DebugController.swift @@ -155,7 +155,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { let _ = (Logger.shared.collectLogs() |> deliverOnMainQueue).start(next: { logs in let presentationData = arguments.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetButtonItem] = [] @@ -206,7 +206,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { let _ = (Logger.shared.collectLogs() |> deliverOnMainQueue).start(next: { logs in let presentationData = arguments.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetButtonItem] = [] @@ -284,7 +284,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { let _ = (Logger.shared.collectShortLogFiles() |> deliverOnMainQueue).start(next: { logs in let presentationData = arguments.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetButtonItem] = [] @@ -409,7 +409,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { case let .resetData(theme): return ItemListActionItem(presentationData: presentationData, title: "Reset Data", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: { let presentationData = arguments.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: "All data will be lost."), ActionSheetButtonItem(title: "Reset Data", color: .destructive, action: { [weak actionSheet] in @@ -431,7 +431,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { return } let presentationData = arguments.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: "All secret chats will be lost."), ActionSheetButtonItem(title: "Clear Database", color: .destructive, action: { [weak actionSheet] in diff --git a/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift b/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift index 61a80c5d25..f2a2a2cbe7 100644 --- a/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift +++ b/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift @@ -501,7 +501,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode { applyImpl() return } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift index b84a6cd490..ac0592a7eb 100644 --- a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift +++ b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift @@ -923,7 +923,7 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { }) }, removeAll: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: presentationData.strings.Notification_Exceptions_DeleteAllConfirmation), ActionSheetButtonItem(title: presentationData.strings.Notification_Exceptions_DeleteAll, color: .destructive, action: { [weak actionSheet] in diff --git a/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift b/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift index 53d2af6514..3db7091c49 100644 --- a/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift +++ b/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift @@ -927,7 +927,7 @@ public func notificationsAndSoundsController(context: AccountContext, exceptions }).start() }, resetNotifications: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetButtonItem(title: presentationData.strings.Notifications_Reset, color: .destructive, action: { [weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift index 92be569268..2372c84b27 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift @@ -306,7 +306,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController { let arguments = DataPrivacyControllerArguments(account: context.account, clearPaymentInfo: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -453,7 +453,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController { } }, deleteCloudDrafts: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift index 001dcc4335..3d566f2a7e 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift @@ -233,7 +233,7 @@ func passcodeOptionsController(context: AccountContext) -> ViewController { let arguments = PasscodeOptionsControllerArguments(turnPasscodeOff: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetButtonItem(title: presentationData.strings.PasscodeSettings_TurnPasscodeOff, color: .destructive, action: { [weak actionSheet] in actionSheet?.dismissAnimated() @@ -313,7 +313,7 @@ func passcodeOptionsController(context: AccountContext) -> ViewController { }) }, changePasscodeTimeout: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetItem] = [] let setAction: (Int32?) -> Void = { value in let _ = (passcodeOptionsDataPromise.get() diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift index 2b2279a5d1..1e54c07ae4 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift @@ -677,7 +677,7 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting updateAccountTimeoutDisposable.set(signal.start(next: { [weak updateAccountTimeoutDisposable] privacySettingsValue in if let _ = privacySettingsValue { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/RecentSessionsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/RecentSessionsController.swift index 1afaf5085f..2249300de1 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/RecentSessionsController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/RecentSessionsController.swift @@ -467,7 +467,7 @@ public func recentSessionsController(context: AccountContext, activeSessionsCont } }, removeSession: { sessionId in let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -498,7 +498,7 @@ public func recentSessionsController(context: AccountContext, activeSessionsCont presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) }, terminateOtherSessions: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -569,7 +569,7 @@ public func recentSessionsController(context: AccountContext, activeSessionsCont })) }, terminateAllWebSessions: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/SettingsController.swift b/submodules/SettingsUI/Sources/SettingsController.swift index c39ce89aee..a5caf22fd2 100644 --- a/submodules/SettingsUI/Sources/SettingsController.swift +++ b/submodules/SettingsUI/Sources/SettingsController.swift @@ -609,7 +609,7 @@ private struct SettingsState: Equatable { var isSearching: Bool } -private func settingsEntries(account: Account, presentationData: PresentationData, state: SettingsState, view: PeerView, proxySettings: ProxySettings, notifyExceptions: NotificationExceptionsList?, notificationsAuthorizationStatus: AccessType, notificationsWarningSuppressed: Bool, unreadTrendingStickerPacks: Int, archivedPacks: [ArchivedStickerPackItem]?, privacySettings: AccountPrivacySettings?, hasWallet: Bool, hasPassport: Bool, hasWatchApp: Bool, accountsAndPeers: [(Account, Peer, Int32)], inAppNotificationSettings: InAppNotificationSettings, experimentalUISettings: ExperimentalUISettings, displayPhoneNumberConfirmation: Bool, otherSessionCount: Int) -> [SettingsEntry] { +private func settingsEntries(account: Account, presentationData: PresentationData, state: SettingsState, view: PeerView, proxySettings: ProxySettings, notifyExceptions: NotificationExceptionsList?, notificationsAuthorizationStatus: AccessType, notificationsWarningSuppressed: Bool, unreadTrendingStickerPacks: Int, archivedPacks: [ArchivedStickerPackItem]?, privacySettings: AccountPrivacySettings?, hasWallet: Bool, hasPassport: Bool, hasWatchApp: Bool, accountsAndPeers: [(Account, Peer, Int32)], inAppNotificationSettings: InAppNotificationSettings, experimentalUISettings: ExperimentalUISettings, displayPhoneNumberConfirmation: Bool, otherSessionCount: Int, enableQRLogin: Bool) -> [SettingsEntry] { var entries: [SettingsEntry] = [] if let peer = peerViewMainPeer(view) as? TelegramUser { @@ -658,7 +658,9 @@ private func settingsEntries(account: Account, presentationData: PresentationDat entries.append(.savedMessages(presentationData.theme, PresentationResourcesSettings.savedMessages, presentationData.strings.Settings_SavedMessages)) entries.append(.recentCalls(presentationData.theme, PresentationResourcesSettings.recentCalls, presentationData.strings.CallSettings_RecentCalls)) entries.append(.stickers(presentationData.theme, PresentationResourcesSettings.stickers, presentationData.strings.ChatSettings_Stickers, unreadTrendingStickerPacks == 0 ? "" : "\(unreadTrendingStickerPacks)", archivedPacks)) - entries.append(.devices(presentationData.theme, UIImage(bundleImageName: "Settings/MenuIcons/Sessions")?.precomposed(), presentationData.strings.Settings_Devices, otherSessionCount == 0 ? presentationData.strings.Settings_AddDevice : "\(otherSessionCount)")) + if enableQRLogin { + entries.append(.devices(presentationData.theme, UIImage(bundleImageName: "Settings/MenuIcons/Sessions")?.precomposed(), presentationData.strings.Settings_Devices, otherSessionCount == 0 ? presentationData.strings.Settings_AddDevice : "\(otherSessionCount)")) + } let notificationsWarning = shouldDisplayNotificationsPermissionWarning(status: notificationsAuthorizationStatus, suppressed: notificationsWarningSuppressed) entries.append(.notificationsAndSounds(presentationData.theme, PresentationResourcesSettings.notifications, presentationData.strings.Settings_NotificationsAndSounds, notifyExceptions, notificationsWarning)) @@ -1079,7 +1081,7 @@ public func settingsController(context: AccountContext, accountManager: AccountM let presentationData = accountContext.sharedContext.currentPresentationData.with { $0 } - let contextController = ContextController(account: accountContext.account, theme: presentationData.theme, strings: presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: chatListController, sourceNode: node)), items: accountContextMenuItems(context: accountContext, logout: { + let contextController = ContextController(account: accountContext.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatListController, sourceNode: node)), items: accountContextMenuItems(context: accountContext, logout: { removeAccountImpl?(id) }), reactionItems: [], gesture: gesture) presentInGlobalOverlayImpl?(contextController, nil) @@ -1332,7 +1334,22 @@ public func settingsController(context: AccountContext, accountManager: AccountM return context.account.viewTracker.featuredStickerPacks() } - let signal = combineLatest(queue: Queue.mainQueue(), contextValue.get(), updatedPresentationData, statePromise.get(), peerView, combineLatest(queue: Queue.mainQueue(), preferences, notifyExceptions.get(), notificationsAuthorizationStatus.get(), notificationsWarningSuppressed.get(), privacySettings.get(), displayPhoneNumberConfirmation.get()), combineLatest(featuredStickerPacks, archivedPacks.get()), combineLatest(hasWallet, hasPassport.get(), hasWatchApp), accountsAndPeers.get(), activeSessionsContextAndCount.get()) + let enableQRLogin = contextValue.get() + |> mapToSignal { context -> Signal in + return context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration]) + |> map { view -> Bool in + guard let appConfiguration = view.values[PreferencesKeys.appConfiguration] as? AppConfiguration else { + return false + } + guard let data = appConfiguration.data, let enableQR = data["qr_login_camera"] as? Bool, enableQR else { + return false + } + return true + } + |> distinctUntilChanged + } + + let signal = combineLatest(queue: Queue.mainQueue(), contextValue.get(), updatedPresentationData, statePromise.get(), peerView, combineLatest(queue: Queue.mainQueue(), preferences, notifyExceptions.get(), notificationsAuthorizationStatus.get(), notificationsWarningSuppressed.get(), privacySettings.get(), displayPhoneNumberConfirmation.get()), combineLatest(featuredStickerPacks, archivedPacks.get()), combineLatest(hasWallet, hasPassport.get(), hasWatchApp, enableQRLogin), accountsAndPeers.get(), activeSessionsContextAndCount.get()) |> map { context, presentationData, state, view, preferencesAndExceptions, featuredAndArchived, hasWalletPassportAndWatch, accountsAndPeers, activeSessionsContextAndCount -> (ItemListControllerState, (ItemListNodeState, Any)) in let otherSessionCount = activeSessionsContextAndCount.1 @@ -1372,8 +1389,8 @@ public func settingsController(context: AccountContext, accountManager: AccountM pushControllerImpl?(c) }, getNavigationController: getNavigationControllerImpl, exceptionsList: notifyExceptions.get(), archivedStickerPacks: archivedPacks.get(), privacySettings: privacySettings.get(), hasWallet: hasWallet) - let (hasWallet, hasPassport, hasWatchApp) = hasWalletPassportAndWatch - let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: settingsEntries(account: context.account, presentationData: presentationData, state: state, view: view, proxySettings: proxySettings, notifyExceptions: preferencesAndExceptions.1, notificationsAuthorizationStatus: preferencesAndExceptions.2, notificationsWarningSuppressed: preferencesAndExceptions.3, unreadTrendingStickerPacks: unreadTrendingStickerPacks, archivedPacks: featuredAndArchived.1, privacySettings: preferencesAndExceptions.4, hasWallet: hasWallet, hasPassport: hasPassport, hasWatchApp: hasWatchApp, accountsAndPeers: accountsAndPeers.1, inAppNotificationSettings: inAppNotificationSettings, experimentalUISettings: experimentalUISettings, displayPhoneNumberConfirmation: preferencesAndExceptions.5, otherSessionCount: otherSessionCount), style: .blocks, searchItem: searchItem, initialScrollToItem: ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight), animated: false, curve: .Default(duration: 0.0), directionHint: .Up)) + let (hasWallet, hasPassport, hasWatchApp, enableQRLogin) = hasWalletPassportAndWatch + let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: settingsEntries(account: context.account, presentationData: presentationData, state: state, view: view, proxySettings: proxySettings, notifyExceptions: preferencesAndExceptions.1, notificationsAuthorizationStatus: preferencesAndExceptions.2, notificationsWarningSuppressed: preferencesAndExceptions.3, unreadTrendingStickerPacks: unreadTrendingStickerPacks, archivedPacks: featuredAndArchived.1, privacySettings: preferencesAndExceptions.4, hasWallet: hasWallet, hasPassport: hasPassport, hasWatchApp: hasWatchApp, accountsAndPeers: accountsAndPeers.1, inAppNotificationSettings: inAppNotificationSettings, experimentalUISettings: experimentalUISettings, displayPhoneNumberConfirmation: preferencesAndExceptions.5, otherSessionCount: otherSessionCount, enableQRLogin: enableQRLogin), style: .blocks, searchItem: searchItem, initialScrollToItem: ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight), animated: false, curve: .Default(duration: 0.0), directionHint: .Up)) return (controllerState, (listState, arguments)) } @@ -1591,7 +1608,7 @@ public func settingsController(context: AccountContext, accountManager: AccountM |> deliverOnMainQueue |> take(1)).start(next: { context in let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/Stickers/InstalledStickerPacksController.swift b/submodules/SettingsUI/Sources/Stickers/InstalledStickerPacksController.swift index 185820fe53..4a4b0920fd 100644 --- a/submodules/SettingsUI/Sources/Stickers/InstalledStickerPacksController.swift +++ b/submodules/SettingsUI/Sources/Stickers/InstalledStickerPacksController.swift @@ -507,7 +507,7 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta } }, removePack: { archivedItem in let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -559,7 +559,7 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta })) }, openSuggestOptions: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceControllerNode.swift b/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceControllerNode.swift index fa73ee0171..b108e90377 100644 --- a/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceControllerNode.swift +++ b/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceControllerNode.swift @@ -138,7 +138,7 @@ final class TermsOfServiceControllerNode: ViewControllerTracingNode { return } let theme: PresentationTheme = strongSelf.presentationData.theme - let actionSheet = ActionSheetController(presentationTheme: theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: strongSelf.presentationData.strings.Login_TermsOfService_ProceedBot(mention).0), ActionSheetButtonItem(title: strongSelf.presentationData.strings.PrivacyPolicy_Accept, color: .accent, action: { [weak actionSheet] in @@ -170,7 +170,7 @@ final class TermsOfServiceControllerNode: ViewControllerTracingNode { } if let url = attributes[NSAttributedString.Key(rawValue: TelegramTextAttributes.URL)] as? String { let theme: PresentationTheme = strongSelf.presentationData.theme - let actionSheet = ActionSheetController(presentationTheme: theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: url), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightTimeSelectionActionSheet.swift b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightTimeSelectionActionSheet.swift index 0b98f3a872..7bdbbc2c7f 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightTimeSelectionActionSheet.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightTimeSelectionActionSheet.swift @@ -22,11 +22,11 @@ final class ThemeAutoNightTimeSelectionActionSheet: ActionSheetController { let theme = presentationData.theme let strings = presentationData.strings - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self.presentationDisposable = context.sharedContext.presentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridController.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridController.swift index 5faf6e41b0..d852bad83e 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeGridController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeGridController.swift @@ -167,7 +167,7 @@ final class ThemeGridController: ViewController { } }, deleteWallpapers: { [weak self] wallpapers, completed in if let strongSelf = self { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Wallpaper_DeleteConfirmation(Int32(wallpapers.count)), color: .destructive, action: { [weak self, weak actionSheet] in @@ -220,7 +220,7 @@ final class ThemeGridController: ViewController { } }, resetWallpapers: { [weak self] in if let strongSelf = self { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) let items: [ActionSheetItem] = [ ActionSheetButtonItem(title: strongSelf.presentationData.strings.Wallpaper_ResetWallpapersConfirmation, color: .destructive, action: { [weak self, weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift index 33e4c5df05..0cb29fb975 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift @@ -568,7 +568,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The }))) items.append(.action(ContextMenuActionItem(text: presentationData.strings.Appearance_RemoveTheme, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor) }, action: { c, f in c.dismiss(completion: { - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetButtonItem(title: presentationData.strings.Appearance_RemoveThemeConfirmation, color: .destructive, action: { [weak actionSheet] in actionSheet?.dismissAnimated() @@ -599,7 +599,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The }))) } - let contextController = ContextController(account: context.account, theme: presentationData.theme, strings: presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: themeController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) + let contextController = ContextController(account: context.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: themeController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) presentInGlobalOverlayImpl?(contextController, nil) }) }) @@ -716,7 +716,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The } moreImpl = { let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetButtonItem(title: presentationData.strings.Appearance_CreateTheme, color: .accent, action: { [weak actionSheet] in actionSheet?.dismissAnimated() diff --git a/submodules/ShareController/Sources/ShareController.swift b/submodules/ShareController/Sources/ShareController.swift index a0ad6eb665..9f872fef59 100644 --- a/submodules/ShareController/Sources/ShareController.swift +++ b/submodules/ShareController/Sources/ShareController.swift @@ -680,7 +680,7 @@ public final class ShareController: ViewController { strongSelf.controllerNode.animateOut(shared: false, completion: {}) let presentationData = strongSelf.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) controller.dismissed = { [weak self] cancelled in if cancelled { self?.controllerNode.animateIn() diff --git a/submodules/TelegramBaseController/Sources/LocationBroadcastActionSheetItem.swift b/submodules/TelegramBaseController/Sources/LocationBroadcastActionSheetItem.swift index b39b7b96c8..68f5d39929 100644 --- a/submodules/TelegramBaseController/Sources/LocationBroadcastActionSheetItem.swift +++ b/submodules/TelegramBaseController/Sources/LocationBroadcastActionSheetItem.swift @@ -50,7 +50,7 @@ private let avatarFont = avatarPlaceholderFont(size: 15.0) public class LocationBroadcastActionSheetItemNode: ActionSheetItemNode { private let theme: ActionSheetControllerTheme - public static let defaultFont: UIFont = Font.regular(20.0) + private let defaultFont: UIFont private var item: LocationBroadcastActionSheetItem? @@ -61,6 +61,7 @@ public class LocationBroadcastActionSheetItemNode: ActionSheetItemNode { override public init(theme: ActionSheetControllerTheme) { self.theme = theme + self.defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) self.button = HighlightTrackingButton() @@ -99,8 +100,10 @@ public class LocationBroadcastActionSheetItemNode: ActionSheetItemNode { func setItem(_ item: LocationBroadcastActionSheetItem) { self.item = item + let defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + let textColor: UIColor = self.theme.primaryTextColor - self.label.attributedText = NSAttributedString(string: item.title, font: ActionSheetButtonNode.defaultFont, textColor: textColor) + self.label.attributedText = NSAttributedString(string: item.title, font: defaultFont, textColor: textColor) self.avatarNode.setPeer(account: item.context.account, theme: (item.context.sharedContext.currentPresentationData.with { $0 }).theme, peer: item.peer) diff --git a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift index b09f37ef9a..6bd0c6ca87 100644 --- a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift +++ b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift @@ -309,7 +309,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { presentLiveLocationController(context: strongSelf.context, peerId: messages[0].id.peerId, controller: strongSelf) } else { let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -375,7 +375,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { closePeerId = peerId } let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } diff --git a/submodules/TelegramCallsUI/Sources/CallController.swift b/submodules/TelegramCallsUI/Sources/CallController.swift index 9d9d6c0f32..3644129160 100644 --- a/submodules/TelegramCallsUI/Sources/CallController.swift +++ b/submodules/TelegramCallsUI/Sources/CallController.swift @@ -132,7 +132,7 @@ public final class CallController: ViewController { } } } else { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] for output in availableOutputs { let title: String diff --git a/submodules/TelegramCallsUI/Sources/CallRouteActionSheetItem.swift b/submodules/TelegramCallsUI/Sources/CallRouteActionSheetItem.swift index 173e147897..708287c54d 100644 --- a/submodules/TelegramCallsUI/Sources/CallRouteActionSheetItem.swift +++ b/submodules/TelegramCallsUI/Sources/CallRouteActionSheetItem.swift @@ -35,7 +35,7 @@ public class CallRouteActionSheetItem: ActionSheetItem { public class CallRouteActionSheetItemNode: ActionSheetItemNode { private let theme: ActionSheetControllerTheme - public static let defaultFont: UIFont = Font.regular(20.0) + private let defaultFont: UIFont private var item: CallRouteActionSheetItem? @@ -48,6 +48,7 @@ public class CallRouteActionSheetItemNode: ActionSheetItemNode { override public init(theme: ActionSheetControllerTheme) { self.theme = theme + self.defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) self.button = HighlightTrackingButton() self.button.isAccessibilityElement = false @@ -115,7 +116,9 @@ public class CallRouteActionSheetItemNode: ActionSheetItemNode { func setItem(_ item: CallRouteActionSheetItem) { self.item = item - self.label.attributedText = NSAttributedString(string: item.title, font: ActionSheetButtonNode.defaultFont, textColor: self.theme.standardActionTextColor) + let defaultFont = Font.regular(floor(theme.baseFontSize * 20.0 / 17.0)) + + self.label.attributedText = NSAttributedString(string: item.title, font: defaultFont, textColor: self.theme.standardActionTextColor) if let icon = item.icon { self.iconNode.image = generateTintedImage(image: icon, color: self.theme.standardActionTextColor) } else { diff --git a/submodules/TelegramCore/Sources/Network.swift b/submodules/TelegramCore/Sources/Network.swift index 3d74acad6e..24b84d3fff 100644 --- a/submodules/TelegramCore/Sources/Network.swift +++ b/submodules/TelegramCore/Sources/Network.swift @@ -514,7 +514,7 @@ func initializedNetwork(arguments: NetworkInitializationArguments, supplementary context.setDiscoverBackupAddressListSignal(MTBackupAddressSignals.fetchBackupIps(testingEnvironment, currentContext: context, additionalSource: wrappedAdditionalSource, phoneNumber: phoneNumber)) #if DEBUG - let _ = MTBackupAddressSignals.fetchBackupIps(testingEnvironment, currentContext: context, additionalSource: wrappedAdditionalSource, phoneNumber: phoneNumber).start(next: nil) + //let _ = MTBackupAddressSignals.fetchBackupIps(testingEnvironment, currentContext: context, additionalSource: wrappedAdditionalSource, phoneNumber: phoneNumber).start(next: nil) #endif let mtProto = MTProto(context: context, datacenterId: datacenterId, usageCalculationInfo: usageCalculationInfo(basePath: basePath, category: nil), requiredAuthToken: nil, authTokenMasterDatacenterId: 0)! diff --git a/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift b/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift index 8a0ca4388d..c701dcfbac 100644 --- a/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift +++ b/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift @@ -38,7 +38,7 @@ public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper i } case let .color(color): backgroundImage = generateImage(CGSize(width: 1.0, height: 1.0), rotatedContext: { size, context in - context.setFillColor(UIColor(rgb: UInt32(bitPattern: color)).cgColor) + context.setFillColor(UIColor(rgb: UInt32(bitPattern: color)).withAlphaComponent(1.0).cgColor) context.fill(CGRect(origin: CGPoint(), size: size)) }) case let .gradient(topColor, bottomColor): diff --git a/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift b/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift index db0fadc18b..6680a8a2f6 100644 --- a/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift +++ b/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift @@ -31,7 +31,7 @@ public func messageBubbleImage(incoming: Bool, fillColor: UIColor, strokeColor: let corner: CGFloat = 7.0 let knockout = knockoutValue && !mask - let inset: CGFloat = extendedEdges ? 0.0 : 1.0 + let inset: CGFloat = (extendedEdges && !mask) ? 1.0 : 0.0 return generateImage(CGSize(width: 42.0 + inset * 2.0, height: diameter + inset * 2.0), contextGenerator: { rawSize, context in var drawWithClearColor = false @@ -48,26 +48,27 @@ public func messageBubbleImage(incoming: Bool, fillColor: UIColor, strokeColor: context.clear(CGRect(origin: CGPoint(), size: rawSize)) } - let size = CGSize(width: rawSize.width - inset * 2.0, height: rawSize.height - inset * 2.0) - context.translateBy(x: inset, y: inset) - let additionalOffset: CGFloat switch neighbors { - case .none, .bottom: - additionalOffset = 0.0 - case .both, .side, .top: - additionalOffset = 6.0 + case .none, .bottom: + additionalOffset = 0.0 + case .both, .side, .top: + additionalOffset = 6.0 } - context.translateBy(x: size.width / 2.0, y: size.height / 2.0) + context.translateBy(x: rawSize.width / 2.0, y: rawSize.height / 2.0) context.scaleBy(x: incoming ? 1.0 : -1.0, y: -1.0) - context.translateBy(x: -size.width / 2.0 + 0.5 + additionalOffset, y: -size.height / 2.0 + 0.5) + context.translateBy(x: -rawSize.width / 2.0 + 0.5 + additionalOffset, y: -rawSize.height / 2.0 + 0.5) + + let size = CGSize(width: rawSize.width - inset * 2.0, height: rawSize.height - inset * 2.0) + context.translateBy(x: inset, y: inset) let lineWidth: CGFloat = 1.0 if drawWithClearColor { context.setBlendMode(.copy) context.setFillColor(UIColor.clear.cgColor) + context.setStrokeColor(UIColor.clear.cgColor) } else { context.setFillColor(fillColor.cgColor) context.setLineWidth(lineWidth) diff --git a/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift b/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift index c167866c53..4466262fd5 100644 --- a/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift +++ b/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift @@ -68,15 +68,22 @@ public extension NavigationBarPresentationData { } public extension ActionSheetControllerTheme { - convenience init(presentationTheme: PresentationTheme) { + convenience init(presentationData: PresentationData) { + let presentationTheme = presentationData.theme + let actionSheet = presentationTheme.actionSheet - self.init(dimColor: actionSheet.dimColor, backgroundType: actionSheet.backgroundType == .light ? .light : .dark, itemBackgroundColor: actionSheet.itemBackgroundColor, itemHighlightedBackgroundColor: actionSheet.itemHighlightedBackgroundColor, standardActionTextColor: actionSheet.standardActionTextColor, destructiveActionTextColor: actionSheet.destructiveActionTextColor, disabledActionTextColor: actionSheet.disabledActionTextColor, primaryTextColor: actionSheet.primaryTextColor, secondaryTextColor: actionSheet.secondaryTextColor, controlAccentColor: actionSheet.controlAccentColor, controlColor: presentationTheme.list.disclosureArrowColor, switchFrameColor: presentationTheme.list.itemSwitchColors.frameColor, switchContentColor: presentationTheme.list.itemSwitchColors.contentColor, switchHandleColor: presentationTheme.list.itemSwitchColors.handleColor) + self.init(dimColor: actionSheet.dimColor, backgroundType: actionSheet.backgroundType == .light ? .light : .dark, itemBackgroundColor: actionSheet.itemBackgroundColor, itemHighlightedBackgroundColor: actionSheet.itemHighlightedBackgroundColor, standardActionTextColor: actionSheet.standardActionTextColor, destructiveActionTextColor: actionSheet.destructiveActionTextColor, disabledActionTextColor: actionSheet.disabledActionTextColor, primaryTextColor: actionSheet.primaryTextColor, secondaryTextColor: actionSheet.secondaryTextColor, controlAccentColor: actionSheet.controlAccentColor, controlColor: presentationTheme.list.disclosureArrowColor, switchFrameColor: presentationTheme.list.itemSwitchColors.frameColor, switchContentColor: presentationTheme.list.itemSwitchColors.contentColor, switchHandleColor: presentationTheme.list.itemSwitchColors.handleColor, baseFontSize: presentationData.fontSize.baseDisplaySize) + } + + convenience init(presentationTheme: PresentationTheme, fontSize: PresentationFontSize) { + let actionSheet = presentationTheme.actionSheet + self.init(dimColor: actionSheet.dimColor, backgroundType: actionSheet.backgroundType == .light ? .light : .dark, itemBackgroundColor: actionSheet.itemBackgroundColor, itemHighlightedBackgroundColor: actionSheet.itemHighlightedBackgroundColor, standardActionTextColor: actionSheet.standardActionTextColor, destructiveActionTextColor: actionSheet.destructiveActionTextColor, disabledActionTextColor: actionSheet.disabledActionTextColor, primaryTextColor: actionSheet.primaryTextColor, secondaryTextColor: actionSheet.secondaryTextColor, controlAccentColor: actionSheet.controlAccentColor, controlColor: presentationTheme.list.disclosureArrowColor, switchFrameColor: presentationTheme.list.itemSwitchColors.frameColor, switchContentColor: presentationTheme.list.itemSwitchColors.contentColor, switchHandleColor: presentationTheme.list.itemSwitchColors.handleColor, baseFontSize: fontSize.baseDisplaySize) } } public extension ActionSheetController { - convenience init(presentationTheme: PresentationTheme) { - self.init(theme: ActionSheetControllerTheme(presentationTheme: presentationTheme)) + convenience init(presentationData: PresentationData) { + self.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) } } diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift index 2956b21cde..13a4268b03 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift @@ -187,6 +187,13 @@ private func makeDarkPresentationTheme(accentColor: UIColor, bubbleColors: (UICo primaryColor: .white, controlColor: UIColor(rgb: 0x4d4d4d) ), + freePlainInputField: PresentationInputFieldTheme( + backgroundColor: UIColor(rgb: 0xffffff, alpha: 0.5), + strokeColor: UIColor(rgb: 0xffffff, alpha: 0.5), + placeholderColor: UIColor(rgb: 0x4d4d4d), + primaryColor: .white, + controlColor: UIColor(rgb: 0x4d4d4d) + ), mediaPlaceholderColor: UIColor(rgb: 0x1c1c1d), scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.3), pageIndicatorInactiveColor: UIColor(white: 1.0, alpha: 0.3), diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift index 1580481a0d..3372ca4474 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift @@ -183,6 +183,13 @@ private func makeDarkPresentationTheme(accentColor: UIColor, bubbleColors: (UICo primaryColor: .white, controlColor: UIColor(rgb: 0x4d4d4d) ), + freePlainInputField: PresentationInputFieldTheme( + backgroundColor: mainSecondaryTextColor.withAlphaComponent(0.5), + strokeColor: mainSecondaryTextColor.withAlphaComponent(0.5), + placeholderColor: UIColor(rgb: 0x4d4d4d), + primaryColor: .white, + controlColor: UIColor(rgb: 0x4d4d4d) + ), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.585, brightness: 0.23), scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.3), pageIndicatorInactiveColor: mainSecondaryTextColor.withAlphaComponent(0.4), diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index e33750ebe6..9533ee145d 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -170,6 +170,13 @@ private func makeDefaultDayPresentationTheme(accentColor: UIColor, bubbleColors: primaryColor: .black, controlColor: UIColor(rgb: 0x96979d) ), + freePlainInputField: PresentationInputFieldTheme( + backgroundColor: UIColor(rgb: 0xe9e9e9), + strokeColor: UIColor(rgb: 0xe9e9e9), + placeholderColor: UIColor(rgb: 0x8E8D92), + primaryColor: .black, + controlColor: UIColor(rgb: 0xBCBCC0) + ), mediaPlaceholderColor: UIColor(rgb: 0xe4e4e4), scrollIndicatorColor: UIColor(white: 0.0, alpha: 0.3), pageIndicatorInactiveColor: UIColor(rgb: 0xe3e3e7), diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index 13d02ead42..8a11f0e92d 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -592,4578 +592,4585 @@ public final class PresentationStrings: Equatable { public var PasscodeSettings_6DigitCode: String { return self._s[373]! } public var Settings_LogoutConfirmationText: String { return self._s[374]! } public var Passport_Identity_TypePassport: String { return self._s[376]! } + public var Map_Work: String { return self._s[379]! } public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[379]!, self._r[379]!, [_1, _2]) + return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_1, _2]) } - public var SocksProxySetup_SaveProxy: String { return self._s[380]! } - public var AccessDenied_SaveMedia: String { return self._s[381]! } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[383]! } - public var Settings_Title: String { return self._s[385]! } - public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[386]! } - public var Contacts_InviteSearchLabel: String { return self._s[388]! } - public var ConvertToSupergroup_Title: String { return self._s[389]! } + public var SocksProxySetup_SaveProxy: String { return self._s[381]! } + public var AccessDenied_SaveMedia: String { return self._s[382]! } + public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[384]! } + public var Settings_Title: String { return self._s[386]! } + public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[387]! } + public var Contacts_InviteSearchLabel: String { return self._s[389]! } + public var ConvertToSupergroup_Title: String { return self._s[390]! } public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[390]!, self._r[390]!, [_0]) + return formatWithArgumentRanges(self._s[391]!, self._r[391]!, [_0]) } - public var TwoFactorSetup_Hint_Text: String { return self._s[391]! } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[392]! } + public var TwoFactorSetup_Hint_Text: String { return self._s[392]! } + public var InfoPlist_NSSiriUsageDescription: String { return self._s[393]! } public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[393]!, self._r[393]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[394]!, self._r[394]!, [_1, _2, _3]) } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[394]! } - public var UserInfo_BotHelp: String { return self._s[395]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[396]! } - public var Checkout_Name: String { return self._s[397]! } - public var AutoDownloadSettings_DataUsage: String { return self._s[398]! } - public var Channel_BanUser_BlockFor: String { return self._s[399]! } - public var Checkout_ShippingAddress: String { return self._s[400]! } - public var AutoDownloadSettings_MaxVideoSize: String { return self._s[401]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[402]! } - public var Privacy_Forwards: String { return self._s[403]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[404]! } - public var Appearance_ThemeCarouselNewNight: String { return self._s[405]! } + public var ChatSettings_AutomaticPhotoDownload: String { return self._s[395]! } + public var UserInfo_BotHelp: String { return self._s[396]! } + public var PrivacySettings_LastSeenEverybody: String { return self._s[397]! } + public var Checkout_Name: String { return self._s[398]! } + public var AutoDownloadSettings_DataUsage: String { return self._s[399]! } + public var Channel_BanUser_BlockFor: String { return self._s[400]! } + public var Checkout_ShippingAddress: String { return self._s[401]! } + public var AutoDownloadSettings_MaxVideoSize: String { return self._s[402]! } + public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[403]! } + public var Privacy_Forwards: String { return self._s[404]! } + public var Channel_BanUser_PermissionSendPolls: String { return self._s[405]! } + public var Appearance_ThemeCarouselNewNight: String { return self._s[406]! } public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[408]!, self._r[408]!, [_0]) + return formatWithArgumentRanges(self._s[409]!, self._r[409]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[409]! } - public var Group_OwnershipTransfer_Title: String { return self._s[410]! } - public var VoiceOver_Chat_OpenHint: String { return self._s[411]! } - public var Group_LeaveGroup: String { return self._s[412]! } - public var Settings_UsernameEmpty: String { return self._s[413]! } + public var Contacts_SortedByName: String { return self._s[410]! } + public var Group_OwnershipTransfer_Title: String { return self._s[411]! } + public var VoiceOver_Chat_OpenHint: String { return self._s[412]! } + public var Group_LeaveGroup: String { return self._s[413]! } + public var Settings_UsernameEmpty: String { return self._s[414]! } public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[414]!, self._r[414]!, [_0]) + return formatWithArgumentRanges(self._s[415]!, self._r[415]!, [_0]) } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[415]!, self._r[415]!, [_1]) + return formatWithArgumentRanges(self._s[416]!, self._r[416]!, [_1]) } public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[416]!, self._r[416]!, [_1, _2]) + return formatWithArgumentRanges(self._s[417]!, self._r[417]!, [_1, _2]) } - public var Message_ImageExpired: String { return self._s[417]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[419]! } - public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[420]! } - public var UserInfo_AddToExisting: String { return self._s[421]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[422]! } - public var Wallet_Send_SyncInProgress: String { return self._s[423]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[424]! } + public var Message_ImageExpired: String { return self._s[418]! } + public var TwoStepAuth_RecoveryFailed: String { return self._s[420]! } + public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[421]! } + public var UserInfo_AddToExisting: String { return self._s[422]! } + public var TwoStepAuth_EnabledSuccess: String { return self._s[423]! } + public var Wallet_Send_SyncInProgress: String { return self._s[424]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[425]! } public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[425]!, self._r[425]!, [_1]) + return formatWithArgumentRanges(self._s[426]!, self._r[426]!, [_1]) } - public var Notifications_GroupNotificationsAlert: String { return self._s[426]! } - public var Passport_Language_km: String { return self._s[427]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[429]! } - public var VoiceOver_Media_PlaybackPlay: String { return self._s[430]! } - public var Notification_CallMissedShort: String { return self._s[431]! } - public var Wallet_Info_YourBalance: String { return self._s[432]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[433]! } - public var Watch_Compose_Send: String { return self._s[434]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[437]! } - public var TwoFactorSetup_Email_Action: String { return self._s[438]! } - public var Conversation_HoldForVideo: String { return self._s[439]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[440]! } - public var Wallet_TransactionInfo_CommentHeader: String { return self._s[441]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[443]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[445]! } - public var Channel_LinkItem: String { return self._s[446]! } + public var Notifications_GroupNotificationsAlert: String { return self._s[427]! } + public var Passport_Language_km: String { return self._s[428]! } + public var SocksProxySetup_AdNoticeHelp: String { return self._s[430]! } + public var VoiceOver_Media_PlaybackPlay: String { return self._s[431]! } + public var Notification_CallMissedShort: String { return self._s[432]! } + public var Wallet_Info_YourBalance: String { return self._s[433]! } + public var ReportPeer_ReasonOther_Send: String { return self._s[434]! } + public var Watch_Compose_Send: String { return self._s[435]! } + public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[438]! } + public var TwoFactorSetup_Email_Action: String { return self._s[439]! } + public var Conversation_HoldForVideo: String { return self._s[440]! } + public var Wallet_Configuration_ApplyErrorTextURLInvalidData: String { return self._s[441]! } + public var Wallet_TransactionInfo_CommentHeader: String { return self._s[442]! } + public var CheckoutInfo_ErrorCityInvalid: String { return self._s[444]! } + public var Appearance_AutoNightThemeDisabled: String { return self._s[446]! } + public var Channel_LinkItem: String { return self._s[447]! } public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[447]!, self._r[447]!, [_0, _1]) + return formatWithArgumentRanges(self._s[448]!, self._r[448]!, [_0, _1]) } public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[450]!, self._r[450]!, [_0]) + return formatWithArgumentRanges(self._s[451]!, self._r[451]!, [_0]) } - public var VoiceOver_Recording_StopAndPreview: String { return self._s[451]! } - public var Passport_Language_dv: String { return self._s[452]! } - public var Undo_LeftChannel: String { return self._s[453]! } - public var Notifications_ExceptionsMuted: String { return self._s[454]! } - public var ChatList_UnhideAction: String { return self._s[455]! } - public var Conversation_ContextMenuShare: String { return self._s[456]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[457]! } - public var ShareFileTip_Title: String { return self._s[458]! } - public var NotificationsSound_Chord: String { return self._s[459]! } - public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[460]! } + public var VoiceOver_Recording_StopAndPreview: String { return self._s[452]! } + public var Passport_Language_dv: String { return self._s[453]! } + public var Undo_LeftChannel: String { return self._s[454]! } + public var Notifications_ExceptionsMuted: String { return self._s[455]! } + public var ChatList_UnhideAction: String { return self._s[456]! } + public var Conversation_ContextMenuShare: String { return self._s[457]! } + public var Conversation_ContextMenuStickerPackInfo: String { return self._s[458]! } + public var ShareFileTip_Title: String { return self._s[459]! } + public var NotificationsSound_Chord: String { return self._s[460]! } + public var Wallet_TransactionInfo_OtherFeeHeader: String { return self._s[461]! } public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[461]!, self._r[461]!, [_1, _2]) + return formatWithArgumentRanges(self._s[462]!, self._r[462]!, [_1, _2]) } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[462]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[463]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[463]!, self._r[463]!, [_0]) + return formatWithArgumentRanges(self._s[464]!, self._r[464]!, [_0]) } public func Wallet_Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[464]!, self._r[464]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[465]!, self._r[465]!, [_1, _2, _3]) } - public var Wallet_Settings_ConfigurationInfo: String { return self._s[465]! } - public var Wallpaper_ErrorNotFound: String { return self._s[466]! } - public var Notification_CallOutgoingShort: String { return self._s[468]! } - public var Wallet_WordImport_IncorrectText: String { return self._s[469]! } + public var Wallet_Settings_ConfigurationInfo: String { return self._s[466]! } + public var Wallpaper_ErrorNotFound: String { return self._s[467]! } + public var Notification_CallOutgoingShort: String { return self._s[469]! } + public var Wallet_WordImport_IncorrectText: String { return self._s[470]! } public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[470]!, self._r[470]!, [_1, _2]) + return formatWithArgumentRanges(self._s[471]!, self._r[471]!, [_1, _2]) } - public var Passport_Address_TypeUtilityBill: String { return self._s[471]! } - public var Privacy_Forwards_LinkIfAllowed: String { return self._s[472]! } - public var ReportPeer_Report: String { return self._s[473]! } - public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[474]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[475]! } + public var Passport_Address_TypeUtilityBill: String { return self._s[472]! } + public var Privacy_Forwards_LinkIfAllowed: String { return self._s[473]! } + public var ReportPeer_Report: String { return self._s[474]! } + public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[475]! } + public var GroupInfo_DeactivatedStatus: String { return self._s[476]! } public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[476]!, self._r[476]!, [_1, _2]) + return formatWithArgumentRanges(self._s[477]!, self._r[477]!, [_1, _2]) } - public var StickerPack_Send: String { return self._s[477]! } - public var Login_CodeSentInternal: String { return self._s[478]! } - public var Wallet_Month_GenJanuary: String { return self._s[479]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[480]! } + public var StickerPack_Send: String { return self._s[478]! } + public var Login_CodeSentInternal: String { return self._s[479]! } + public var Wallet_Month_GenJanuary: String { return self._s[480]! } + public var GroupInfo_InviteLink_LinkSection: String { return self._s[481]! } public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[481]!, self._r[481]!, [_0]) + return formatWithArgumentRanges(self._s[482]!, self._r[482]!, [_0]) } public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[483]!, self._r[483]!, [_0]) + return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_0]) } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[484]! } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[485]! } public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[485]!, self._r[485]!, [_1]) + return formatWithArgumentRanges(self._s[486]!, self._r[486]!, [_1]) } - public var ReportPeer_ReasonViolence: String { return self._s[487]! } - public var Map_Locating: String { return self._s[488]! } + public var ReportPeer_ReasonViolence: String { return self._s[488]! } + public var Map_Locating: String { return self._s[489]! } public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[489]!, self._r[489]!, [_0]) + return formatWithArgumentRanges(self._s[490]!, self._r[490]!, [_0]) } public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[490]!, self._r[490]!, [_1]) + return formatWithArgumentRanges(self._s[491]!, self._r[491]!, [_1]) } - public var AutoDownloadSettings_GroupChats: String { return self._s[492]! } - public var CheckoutInfo_SaveInfo: String { return self._s[493]! } - public var SharedMedia_EmptyLinksText: String { return self._s[495]! } - public var Passport_Address_CityPlaceholder: String { return self._s[496]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[497]! } - public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[498]! } - public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[500]! } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[501]! } + public var AutoDownloadSettings_GroupChats: String { return self._s[493]! } + public var CheckoutInfo_SaveInfo: String { return self._s[494]! } + public var SharedMedia_EmptyLinksText: String { return self._s[496]! } + public var Passport_Address_CityPlaceholder: String { return self._s[497]! } + public var CheckoutInfo_ErrorStateInvalid: String { return self._s[498]! } + public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[499]! } + public var Wallet_Send_OwnAddressAlertTitle: String { return self._s[501]! } + public var Channel_AdminLog_CanAddAdmins: String { return self._s[502]! } public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[502]!, self._r[502]!, [_1]) + return formatWithArgumentRanges(self._s[503]!, self._r[503]!, [_1]) } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[503]!, self._r[503]!, [_0]) + return formatWithArgumentRanges(self._s[504]!, self._r[504]!, [_0]) } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[504]! } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[505]! } - public var ChangePhoneNumberCode_Code: String { return self._s[506]! } - public var Appearance_CreateTheme: String { return self._s[507]! } + public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[505]! } + public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[506]! } + public var ChangePhoneNumberCode_Code: String { return self._s[507]! } + public var Appearance_CreateTheme: String { return self._s[508]! } public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[508]!, self._r[508]!, [_0]) + return formatWithArgumentRanges(self._s[509]!, self._r[509]!, [_0]) } - public var TwoStepAuth_SetupEmail: String { return self._s[509]! } - public var HashtagSearch_AllChats: String { return self._s[510]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[512]! } + public var TwoStepAuth_SetupEmail: String { return self._s[510]! } + public var HashtagSearch_AllChats: String { return self._s[511]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[513]! } public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[513]!, self._r[513]!, [_0]) + return formatWithArgumentRanges(self._s[514]!, self._r[514]!, [_0]) } - public var PhotoEditor_QualityHigh: String { return self._s[515]! } + public var PhotoEditor_QualityHigh: String { return self._s[516]! } public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[516]!, self._r[516]!, [_0]) + return formatWithArgumentRanges(self._s[517]!, self._r[517]!, [_0]) } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[517]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[518]! } - public var Message_LiveLocation: String { return self._s[519]! } - public var Cache_LowDiskSpaceText: String { return self._s[520]! } - public var Wallet_Receive_ShareAddress: String { return self._s[521]! } - public var EditTheme_ErrorLinkTaken: String { return self._s[522]! } - public var Conversation_SendMessage: String { return self._s[523]! } - public var AuthSessions_EmptyTitle: String { return self._s[524]! } - public var Privacy_PhoneNumber: String { return self._s[525]! } - public var PeopleNearby_CreateGroup: String { return self._s[526]! } - public var CallSettings_UseLessData: String { return self._s[527]! } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[528]! } - public var Stickers_AddToFavorites: String { return self._s[529]! } - public var Wallet_WordImport_Title: String { return self._s[530]! } - public var PhotoEditor_QualityLow: String { return self._s[531]! } - public var Watch_UserInfo_Unblock: String { return self._s[532]! } - public var Settings_Logout: String { return self._s[533]! } + public var ApplyLanguage_ApplyLanguageAction: String { return self._s[518]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[519]! } + public var Message_LiveLocation: String { return self._s[520]! } + public var Cache_LowDiskSpaceText: String { return self._s[521]! } + public var Wallet_Receive_ShareAddress: String { return self._s[522]! } + public var EditTheme_ErrorLinkTaken: String { return self._s[523]! } + public var Conversation_SendMessage: String { return self._s[524]! } + public var AuthSessions_EmptyTitle: String { return self._s[525]! } + public var Privacy_PhoneNumber: String { return self._s[526]! } + public var PeopleNearby_CreateGroup: String { return self._s[527]! } + public var CallSettings_UseLessData: String { return self._s[528]! } + public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[529]! } + public var Stickers_AddToFavorites: String { return self._s[530]! } + public var Wallet_WordImport_Title: String { return self._s[531]! } + public var PhotoEditor_QualityLow: String { return self._s[532]! } + public var Watch_UserInfo_Unblock: String { return self._s[533]! } + public var Settings_Logout: String { return self._s[534]! } public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[534]!, self._r[534]!, [_1]) + return formatWithArgumentRanges(self._s[535]!, self._r[535]!, [_1]) } - public var ContactInfo_PhoneLabelWork: String { return self._s[535]! } - public var ChannelInfo_Stats: String { return self._s[536]! } - public var TextFormat_Link: String { return self._s[537]! } + public var ContactInfo_PhoneLabelWork: String { return self._s[536]! } + public var ChannelInfo_Stats: String { return self._s[537]! } + public var TextFormat_Link: String { return self._s[538]! } public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[538]!, self._r[538]!, [_1, _2]) + return formatWithArgumentRanges(self._s[539]!, self._r[539]!, [_1, _2]) } - public var Wallet_TransactionInfo_Title: String { return self._s[539]! } + public var Wallet_TransactionInfo_Title: String { return self._s[540]! } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[540]!, self._r[540]!, [_0]) + return formatWithArgumentRanges(self._s[541]!, self._r[541]!, [_0]) } - public var Watch_Notification_Joined: String { return self._s[541]! } - public var Group_Setup_TypePublicHelp: String { return self._s[542]! } - public var Passport_Scans_UploadNew: String { return self._s[543]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[544]! } - public var DialogList_Title: String { return self._s[547]! } - public var NotificationSettings_ContactJoined: String { return self._s[548]! } - public var GroupInfo_LabelAdmin: String { return self._s[549]! } - public var KeyCommand_ChatInfo: String { return self._s[550]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[551]! } - public var Call_ReportIncludeLog: String { return self._s[552]! } + public var Watch_Notification_Joined: String { return self._s[542]! } + public var Group_Setup_TypePublicHelp: String { return self._s[543]! } + public var Passport_Scans_UploadNew: String { return self._s[544]! } + public var Checkout_LiabilityAlertTitle: String { return self._s[545]! } + public var DialogList_Title: String { return self._s[548]! } + public var NotificationSettings_ContactJoined: String { return self._s[549]! } + public var GroupInfo_LabelAdmin: String { return self._s[550]! } + public var KeyCommand_ChatInfo: String { return self._s[551]! } + public var Conversation_EditingCaptionPanelTitle: String { return self._s[552]! } + public var Call_ReportIncludeLog: String { return self._s[553]! } public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[555]!, self._r[555]!, [_0]) + return formatWithArgumentRanges(self._s[556]!, self._r[556]!, [_0]) } - public var LocalGroup_IrrelevantWarning: String { return self._s[556]! } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[557]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[558]! } - public var Message_Sticker: String { return self._s[559]! } - public var LastSeen_JustNow: String { return self._s[561]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[563]! } - public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[564]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[565]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[566]! } - public var TwoStepAuth_Email: String { return self._s[567]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[568]! } - public var PhotoEditor_BlurToolOff: String { return self._s[569]! } - public var Message_PinnedStickerMessage: String { return self._s[570]! } - public var ContactInfo_PhoneLabelPager: String { return self._s[571]! } - public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[572]! } - public var Passport_DiscardMessageTitle: String { return self._s[573]! } - public var Privacy_PaymentsTitle: String { return self._s[574]! } - public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[575]! } - public var ClearCache_StorageCache: String { return self._s[576]! } - public var Appearance_TextSizeSetting: String { return self._s[577]! } - public var Channel_DiscussionGroup_Header: String { return self._s[579]! } - public var VoiceOver_Chat_OptionSelected: String { return self._s[580]! } - public var Appearance_ColorTheme: String { return self._s[581]! } - public var UserInfo_ShareContact: String { return self._s[582]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[583]! } - public var Common_More: String { return self._s[584]! } - public var Watch_Message_Call: String { return self._s[585]! } - public var Profile_EncryptionKey: String { return self._s[588]! } - public var Privacy_TopPeers: String { return self._s[589]! } - public var Conversation_StopPollConfirmation: String { return self._s[590]! } - public var Wallet_Words_NotDoneText: String { return self._s[592]! } - public var Privacy_TopPeersWarning: String { return self._s[594]! } - public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[595]! } - public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[596]! } - public var Wallet_RestoreFailed_EnterWords: String { return self._s[599]! } - public var DialogList_SearchSectionMessages: String { return self._s[600]! } - public var Notifications_ChannelNotifications: String { return self._s[601]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[602]! } - public var Passport_Language_sk: String { return self._s[603]! } - public var Notification_MessageLifetime1h: String { return self._s[604]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[605]! } - public var Call_ReportSkip: String { return self._s[607]! } - public var Cache_ServiceFiles: String { return self._s[608]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[609]! } - public var VoiceOver_Chat_YourFile: String { return self._s[610]! } - public var Map_Hybrid: String { return self._s[611]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[613]! } - public var ChatSettings_AutoDownloadVideos: String { return self._s[615]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[616]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[617]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[620]! } + public var LocalGroup_IrrelevantWarning: String { return self._s[557]! } + public var ChatAdmins_AllMembersAreAdmins: String { return self._s[558]! } + public var Conversation_DefaultRestrictedInline: String { return self._s[559]! } + public var Message_Sticker: String { return self._s[560]! } + public var LastSeen_JustNow: String { return self._s[562]! } + public var Passport_Email_EmailPlaceholder: String { return self._s[564]! } + public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[565]! } + public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[566]! } + public var Channel_EditAdmin_PermissionsHeader: String { return self._s[567]! } + public var TwoStepAuth_Email: String { return self._s[568]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[569]! } + public var PhotoEditor_BlurToolOff: String { return self._s[570]! } + public var Message_PinnedStickerMessage: String { return self._s[571]! } + public var ContactInfo_PhoneLabelPager: String { return self._s[572]! } + public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[573]! } + public var Passport_DiscardMessageTitle: String { return self._s[574]! } + public var Privacy_PaymentsTitle: String { return self._s[575]! } + public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[576]! } + public var ClearCache_StorageCache: String { return self._s[577]! } + public var Appearance_TextSizeSetting: String { return self._s[578]! } + public var Channel_DiscussionGroup_Header: String { return self._s[580]! } + public var VoiceOver_Chat_OptionSelected: String { return self._s[581]! } + public var Appearance_ColorTheme: String { return self._s[582]! } + public var UserInfo_ShareContact: String { return self._s[583]! } + public var Passport_Address_TypePassportRegistration: String { return self._s[584]! } + public var Common_More: String { return self._s[585]! } + public var Watch_Message_Call: String { return self._s[586]! } + public var Profile_EncryptionKey: String { return self._s[589]! } + public var Privacy_TopPeers: String { return self._s[590]! } + public var Conversation_StopPollConfirmation: String { return self._s[591]! } + public var Wallet_Words_NotDoneText: String { return self._s[593]! } + public var Privacy_TopPeersWarning: String { return self._s[595]! } + public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[596]! } + public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[597]! } + public var Wallet_RestoreFailed_EnterWords: String { return self._s[600]! } + public var DialogList_SearchSectionMessages: String { return self._s[601]! } + public var Notifications_ChannelNotifications: String { return self._s[602]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[603]! } + public var Passport_Language_sk: String { return self._s[604]! } + public var Notification_MessageLifetime1h: String { return self._s[605]! } + public var Wallpaper_ResetWallpapersInfo: String { return self._s[606]! } + public var Call_ReportSkip: String { return self._s[608]! } + public var Cache_ServiceFiles: String { return self._s[609]! } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[610]! } + public var VoiceOver_Chat_YourFile: String { return self._s[611]! } + public var Map_Hybrid: String { return self._s[612]! } + public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[614]! } + public var ChatSettings_AutoDownloadVideos: String { return self._s[616]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[617]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[618]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[621]! } public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[621]!, self._r[621]!, [_1]) + return formatWithArgumentRanges(self._s[622]!, self._r[622]!, [_1]) } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[623]! } - public var ScheduledMessages_ScheduledToday: String { return self._s[624]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[624]! } + public var ScheduledMessages_ScheduledToday: String { return self._s[625]! } public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[625]!, self._r[625]!, [_1, _2]) + return formatWithArgumentRanges(self._s[626]!, self._r[626]!, [_1, _2]) } - public var Conversation_LiveLocationYou: String { return self._s[626]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[627]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[628]! } - public var UserInfo_ShareBot: String { return self._s[631]! } + public var Conversation_LiveLocationYou: String { return self._s[627]! } + public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[628]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[629]! } + public var UserInfo_ShareBot: String { return self._s[632]! } public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[632]!, self._r[632]!, [_1, _2]) + return formatWithArgumentRanges(self._s[633]!, self._r[633]!, [_1, _2]) } - public var Conversation_ClearCache: String { return self._s[633]! } - public var PhotoEditor_ShadowsTint: String { return self._s[634]! } - public var Message_Audio: String { return self._s[635]! } - public var Passport_Language_lt: String { return self._s[636]! } + public var Conversation_ClearCache: String { return self._s[634]! } + public var PhotoEditor_ShadowsTint: String { return self._s[635]! } + public var Message_Audio: String { return self._s[636]! } + public var Passport_Language_lt: String { return self._s[637]! } public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[637]!, self._r[637]!, [_0]) + return formatWithArgumentRanges(self._s[638]!, self._r[638]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[638]! } - public var Conversation_FileICloudDrive: String { return self._s[639]! } - public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[640]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[641]! } + public var Permissions_SiriText_v0: String { return self._s[639]! } + public var Conversation_FileICloudDrive: String { return self._s[640]! } + public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[641]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[642]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[642]!, self._r[642]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[643]!, self._r[643]!, [_1, _2, _3, _4, _5, _6]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[643]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[644]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[644]!, self._r[644]!, [_0]) + return formatWithArgumentRanges(self._s[645]!, self._r[645]!, [_0]) } - public var Channel_SignMessages: String { return self._s[645]! } + public var Channel_SignMessages: String { return self._s[646]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[646]!, self._r[646]!, [_1]) + return formatWithArgumentRanges(self._s[647]!, self._r[647]!, [_1]) } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[647]! } - public var Passport_ScanPassport: String { return self._s[648]! } - public var Watch_Suggestion_Thanks: String { return self._s[649]! } - public var BlockedUsers_AddNew: String { return self._s[650]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[648]! } + public var Passport_ScanPassport: String { return self._s[649]! } + public var Watch_Suggestion_Thanks: String { return self._s[650]! } + public var BlockedUsers_AddNew: String { return self._s[651]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[651]!, self._r[651]!, [_1, _2]) + return formatWithArgumentRanges(self._s[652]!, self._r[652]!, [_1, _2]) } - public var Watch_Message_Invoice: String { return self._s[652]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[653]! } - public var Month_GenJuly: String { return self._s[654]! } - public var UserInfo_StartSecretChatStart: String { return self._s[655]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[656]! } - public var IntentsSettings_SuggestByShare: String { return self._s[658]! } - public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[659]! } - public var Notification_ChannelInviterSelf: String { return self._s[660]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[661]! } + public var Watch_Message_Invoice: String { return self._s[653]! } + public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[654]! } + public var Month_GenJuly: String { return self._s[655]! } + public var UserInfo_StartSecretChatStart: String { return self._s[656]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[657]! } + public var IntentsSettings_SuggestByShare: String { return self._s[659]! } + public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[660]! } + public var Notification_ChannelInviterSelf: String { return self._s[661]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[662]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[662]!, self._r[662]!, [_1, _2]) + return formatWithArgumentRanges(self._s[663]!, self._r[663]!, [_1, _2]) } - public var CheckoutInfo_Title: String { return self._s[663]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[664]! } + public var CheckoutInfo_Title: String { return self._s[664]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[665]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[665]!, self._r[665]!, [_0]) + return formatWithArgumentRanges(self._s[666]!, self._r[666]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[666]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[667]! } - public var Passport_Language_de: String { return self._s[668]! } - public var Update_Title: String { return self._s[669]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[670]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[671]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[672]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[673]! } - public var NotificationsSound_Telegraph: String { return self._s[674]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[675]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[676]! } + public var Passport_Identity_MainPage: String { return self._s[667]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[668]! } + public var Passport_Language_de: String { return self._s[669]! } + public var Update_Title: String { return self._s[670]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[671]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[672]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[673]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[674]! } + public var NotificationsSound_Telegraph: String { return self._s[675]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[676]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[677]! } public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[677]!, self._r[677]!, [_0]) + return formatWithArgumentRanges(self._s[678]!, self._r[678]!, [_0]) } - public var ClearCache_Description: String { return self._s[678]! } - public var Stickers_SuggestAll: String { return self._s[679]! } - public var Conversation_ForwardTitle: String { return self._s[680]! } - public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[681]! } + public var ClearCache_Description: String { return self._s[679]! } + public var Stickers_SuggestAll: String { return self._s[680]! } + public var Conversation_ForwardTitle: String { return self._s[681]! } + public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[682]! } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[682]!, self._r[682]!, [_0]) + return formatWithArgumentRanges(self._s[683]!, self._r[683]!, [_0]) } - public var Calls_NewCall: String { return self._s[683]! } - public var Call_StatusEnded: String { return self._s[684]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[685]! } - public var Settings_ProxyConnected: String { return self._s[686]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[687]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[688]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[689]! } - public var Passport_PasswordPlaceholder: String { return self._s[690]! } - public var Message_PinnedInvoice: String { return self._s[691]! } - public var Passport_Identity_IssueDate: String { return self._s[692]! } - public var Passport_Language_pl: String { return self._s[693]! } + public var Calls_NewCall: String { return self._s[684]! } + public var Call_StatusEnded: String { return self._s[685]! } + public var AutoDownloadSettings_DataUsageLow: String { return self._s[686]! } + public var Settings_ProxyConnected: String { return self._s[687]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[688]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[689]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[690]! } + public var Passport_PasswordPlaceholder: String { return self._s[691]! } + public var Message_PinnedInvoice: String { return self._s[692]! } + public var Passport_Identity_IssueDate: String { return self._s[693]! } + public var Passport_Language_pl: String { return self._s[694]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[694]!, self._r[694]!, [_0]) + return formatWithArgumentRanges(self._s[695]!, self._r[695]!, [_0]) } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[695]! } - public var Call_StatusConnecting: String { return self._s[696]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[696]! } + public var Call_StatusConnecting: String { return self._s[697]! } public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[697]!, self._r[697]!, [_0]) + return formatWithArgumentRanges(self._s[698]!, self._r[698]!, [_0]) } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[699]! } - public var Common_Edit: String { return self._s[700]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[701]! } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[700]! } + public var Common_Edit: String { return self._s[701]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[702]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[702]!, self._r[702]!, [_0]) + return formatWithArgumentRanges(self._s[703]!, self._r[703]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[703]! } - public var PrivateDataSettings_Title: String { return self._s[704]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[705]! } - public var ChatList_Read: String { return self._s[706]! } - public var Wallet_WordImport_Text: String { return self._s[707]! } - public var Undo_ChatClearedForBothSides: String { return self._s[708]! } - public var GroupPermission_SectionTitle: String { return self._s[709]! } - public var TwoFactorSetup_Intro_Title: String { return self._s[711]! } + public var GroupInfo_ChatAdmins: String { return self._s[704]! } + public var PrivateDataSettings_Title: String { return self._s[705]! } + public var Login_CancelPhoneVerificationStop: String { return self._s[706]! } + public var ChatList_Read: String { return self._s[707]! } + public var Wallet_WordImport_Text: String { return self._s[708]! } + public var Undo_ChatClearedForBothSides: String { return self._s[709]! } + public var GroupPermission_SectionTitle: String { return self._s[710]! } + public var TwoFactorSetup_Intro_Title: String { return self._s[712]! } public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[712]!, self._r[712]!, [_1, _2]) + return formatWithArgumentRanges(self._s[713]!, self._r[713]!, [_1, _2]) } - public var Checkout_ErrorPaymentFailed: String { return self._s[713]! } - public var Update_UpdateApp: String { return self._s[714]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[715]! } - public var Settings_Appearance: String { return self._s[716]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[720]! } - public var Watch_Location_Access: String { return self._s[721]! } - public var ShareMenu_CopyShareLink: String { return self._s[723]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[724]! } - public var Conversation_Theme: String { return self._s[726]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[714]! } + public var Update_UpdateApp: String { return self._s[715]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[716]! } + public var Settings_Appearance: String { return self._s[717]! } + public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[721]! } + public var Watch_Location_Access: String { return self._s[722]! } + public var ShareMenu_CopyShareLink: String { return self._s[724]! } + public var TwoStepAuth_SetupHintTitle: String { return self._s[725]! } + public var Conversation_Theme: String { return self._s[727]! } public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[727]!, self._r[727]!, [_0]) + return formatWithArgumentRanges(self._s[728]!, self._r[728]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[728]! } - public var Weekday_ShortWednesday: String { return self._s[729]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[730]! } - public var Undo_LeftGroup: String { return self._s[733]! } - public var Wallet_RestoreFailed_Text: String { return self._s[734]! } - public var Conversation_LinkDialogCopy: String { return self._s[735]! } - public var Wallet_TransactionInfo_NoAddress: String { return self._s[737]! } - public var Wallet_Navigation_Back: String { return self._s[738]! } - public var KeyCommand_FocusOnInputField: String { return self._s[739]! } - public var Contacts_SelectAll: String { return self._s[740]! } - public var Preview_SaveToCameraRoll: String { return self._s[741]! } - public var PrivacySettings_PasscodeOff: String { return self._s[742]! } - public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[743]! } - public var Wallpaper_Title: String { return self._s[744]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[745]! } - public var AccessDenied_Camera: String { return self._s[746]! } - public var Watch_Compose_CurrentLocation: String { return self._s[747]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[749]! } + public var Notifications_ClassicTones: String { return self._s[729]! } + public var Weekday_ShortWednesday: String { return self._s[730]! } + public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[731]! } + public var Undo_LeftGroup: String { return self._s[734]! } + public var Wallet_RestoreFailed_Text: String { return self._s[735]! } + public var Conversation_LinkDialogCopy: String { return self._s[736]! } + public var Wallet_TransactionInfo_NoAddress: String { return self._s[738]! } + public var Wallet_Navigation_Back: String { return self._s[739]! } + public var KeyCommand_FocusOnInputField: String { return self._s[740]! } + public var Contacts_SelectAll: String { return self._s[741]! } + public var Preview_SaveToCameraRoll: String { return self._s[742]! } + public var PrivacySettings_PasscodeOff: String { return self._s[743]! } + public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[744]! } + public var Wallpaper_Title: String { return self._s[745]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[746]! } + public var AccessDenied_Camera: String { return self._s[747]! } + public var Watch_Compose_CurrentLocation: String { return self._s[748]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[750]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[750]!, self._r[750]!, [_0]) + return formatWithArgumentRanges(self._s[751]!, self._r[751]!, [_0]) } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[751]! } - public var Passport_Language_ro: String { return self._s[752]! } - public var EditTheme_UploadNewTheme: String { return self._s[753]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[754]! } - public var Wallet_Intro_Terms: String { return self._s[755]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[752]! } + public var Passport_Language_ro: String { return self._s[753]! } + public var EditTheme_UploadNewTheme: String { return self._s[754]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[755]! } + public var Wallet_Intro_Terms: String { return self._s[756]! } public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[756]!, self._r[756]!, [_0]) + return formatWithArgumentRanges(self._s[757]!, self._r[757]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[757]! } - public var State_ConnectingToProxy: String { return self._s[758]! } - public var Calls_RatingTitle: String { return self._s[759]! } - public var Generic_ErrorMoreInfo: String { return self._s[760]! } - public var Appearance_PreviewReplyText: String { return self._s[761]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[762]! } + public var Login_CancelPhoneVerification: String { return self._s[758]! } + public var State_ConnectingToProxy: String { return self._s[759]! } + public var Calls_RatingTitle: String { return self._s[760]! } + public var Generic_ErrorMoreInfo: String { return self._s[761]! } + public var Appearance_PreviewReplyText: String { return self._s[762]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[763]! } public func Wallet_Send_Balance(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[763]!, self._r[763]!, [_0]) + return formatWithArgumentRanges(self._s[764]!, self._r[764]!, [_0]) } - public var IntentsSettings_SuggestedChatsContacts: String { return self._s[764]! } - public var SharedMedia_CategoryLinks: String { return self._s[765]! } - public var Calls_Missed: String { return self._s[766]! } - public var Cache_Photos: String { return self._s[770]! } - public var GroupPermission_NoAddMembers: String { return self._s[771]! } - public var ScheduledMessages_Title: String { return self._s[772]! } + public var IntentsSettings_SuggestedChatsContacts: String { return self._s[765]! } + public var SharedMedia_CategoryLinks: String { return self._s[766]! } + public var Calls_Missed: String { return self._s[767]! } + public var Cache_Photos: String { return self._s[771]! } + public var GroupPermission_NoAddMembers: String { return self._s[772]! } + public var ScheduledMessages_Title: String { return self._s[773]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[773]!, self._r[773]!, [_0]) + return formatWithArgumentRanges(self._s[774]!, self._r[774]!, [_0]) } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[774]! } - public var Settings_ProxyDisabled: String { return self._s[775]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[775]! } + public var Settings_ProxyDisabled: String { return self._s[776]! } public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[776]!, self._r[776]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[777]!, self._r[777]!, [_1, _2, _3, _4]) } public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[777]!, self._r[777]!, [_0]) + return formatWithArgumentRanges(self._s[778]!, self._r[778]!, [_0]) } - public var ChatList_Context_RemoveFromRecents: String { return self._s[779]! } - public var Appearance_Title: String { return self._s[780]! } + public var ChatList_Context_RemoveFromRecents: String { return self._s[780]! } + public var Appearance_Title: String { return self._s[781]! } public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[782]!, self._r[782]!, [_0]) + return formatWithArgumentRanges(self._s[783]!, self._r[783]!, [_0]) } - public var Conversation_WalletRequiredText: String { return self._s[783]! } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[784]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[785]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[786]! } - public var Preview_DeletePhoto: String { return self._s[787]! } - public var Appearance_AppIconFilledX: String { return self._s[788]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[789]! } + public var Conversation_WalletRequiredText: String { return self._s[784]! } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[785]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[786]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[787]! } + public var Preview_DeletePhoto: String { return self._s[788]! } + public var Appearance_AppIconFilledX: String { return self._s[789]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[790]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[790]!, self._r[790]!, [_0]) + return formatWithArgumentRanges(self._s[791]!, self._r[791]!, [_0]) } - public var Coub_TapForSound: String { return self._s[792]! } - public var Map_LocatingError: String { return self._s[793]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[795]! } - public var Conversation_SendMessage_SendSilently: String { return self._s[796]! } - public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[797]! } + public var Coub_TapForSound: String { return self._s[793]! } + public var Map_LocatingError: String { return self._s[794]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[796]! } + public var Conversation_SendMessage_SendSilently: String { return self._s[797]! } + public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[798]! } public func Wallet_Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[798]!, self._r[798]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[799]!, self._r[799]!, [_1, _2, _3]) } - public var Passport_ForgottenPassword: String { return self._s[799]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[800]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[801]! } - public var Login_TermsOfServiceSignupDecline: String { return self._s[803]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[804]! } - public var Message_Location: String { return self._s[805]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[806]! } - public var Channel_Management_Title: String { return self._s[807]! } - public var DialogList_SearchSectionDialogs: String { return self._s[809]! } - public var Compose_NewChannel_Members: String { return self._s[810]! } + public var Passport_ForgottenPassword: String { return self._s[800]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[801]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[802]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[804]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[805]! } + public var Message_Location: String { return self._s[806]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[807]! } + public var Channel_Management_Title: String { return self._s[808]! } + public var DialogList_SearchSectionDialogs: String { return self._s[810]! } + public var Compose_NewChannel_Members: String { return self._s[811]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[811]!, self._r[811]!, [_0]) + return formatWithArgumentRanges(self._s[812]!, self._r[812]!, [_0]) } - public var GroupInfo_Location: String { return self._s[812]! } - public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[813]! } - public var ClearCache_Clear: String { return self._s[814]! } - public var AutoNightTheme_ScheduledFrom: String { return self._s[815]! } - public var PhotoEditor_WarmthTool: String { return self._s[816]! } - public var Passport_Language_tr: String { return self._s[817]! } + public var GroupInfo_Location: String { return self._s[813]! } + public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[814]! } + public var ClearCache_Clear: String { return self._s[815]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[816]! } + public var PhotoEditor_WarmthTool: String { return self._s[817]! } + public var Passport_Language_tr: String { return self._s[818]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[818]!, self._r[818]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[819]!, self._r[819]!, [_1, _2, _3]) } - public var Login_ResetAccountProtected_Reset: String { return self._s[820]! } - public var Watch_PhotoView_Title: String { return self._s[821]! } - public var Passport_Phone_Delete: String { return self._s[822]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[823]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[824]! } - public var GroupInfo_Permissions: String { return self._s[825]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[826]! } - public var Profile_ShareContactButton: String { return self._s[827]! } - public var ChatSettings_Other: String { return self._s[828]! } - public var UserInfo_NotificationsDisabled: String { return self._s[829]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[830]! } - public var LastSeen_WithinAMonth: String { return self._s[831]! } - public var VoiceOver_Chat_PlayHint: String { return self._s[832]! } - public var Conversation_ReportGroupLocation: String { return self._s[833]! } - public var Conversation_EncryptionCanceled: String { return self._s[834]! } - public var MediaPicker_GroupDescription: String { return self._s[835]! } - public var WebSearch_Images: String { return self._s[836]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[821]! } + public var Watch_PhotoView_Title: String { return self._s[822]! } + public var Passport_Phone_Delete: String { return self._s[823]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[824]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[825]! } + public var GroupInfo_Permissions: String { return self._s[826]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[827]! } + public var Profile_ShareContactButton: String { return self._s[828]! } + public var ChatSettings_Other: String { return self._s[829]! } + public var UserInfo_NotificationsDisabled: String { return self._s[830]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[831]! } + public var LastSeen_WithinAMonth: String { return self._s[832]! } + public var VoiceOver_Chat_PlayHint: String { return self._s[833]! } + public var Conversation_ReportGroupLocation: String { return self._s[834]! } + public var Conversation_EncryptionCanceled: String { return self._s[835]! } + public var MediaPicker_GroupDescription: String { return self._s[836]! } + public var WebSearch_Images: String { return self._s[837]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[837]!, self._r[837]!, [_0]) + return formatWithArgumentRanges(self._s[838]!, self._r[838]!, [_0]) } - public var Message_Photo: String { return self._s[838]! } - public var PasscodeSettings_HelpBottom: String { return self._s[839]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[840]! } - public var VoiceOver_Media_PlaybackRateChange: String { return self._s[841]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[842]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[843]! } - public var NotificationsSound_Calypso: String { return self._s[844]! } - public var Map_Map: String { return self._s[845]! } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[847]! } - public var ChatSettings_TextSizeUnits: String { return self._s[848]! } + public var Message_Photo: String { return self._s[839]! } + public var PasscodeSettings_HelpBottom: String { return self._s[840]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[841]! } + public var VoiceOver_Media_PlaybackRateChange: String { return self._s[842]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[843]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[844]! } + public var NotificationsSound_Calypso: String { return self._s[845]! } + public var Map_Map: String { return self._s[846]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[848]! } + public var ChatSettings_TextSizeUnits: String { return self._s[849]! } public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[849]!, self._r[849]!, [_0]) + return formatWithArgumentRanges(self._s[850]!, self._r[850]!, [_0]) } - public var Common_of: String { return self._s[850]! } - public var Conversation_ForwardContacts: String { return self._s[853]! } - public var IntentsSettings_SuggestByAll: String { return self._s[855]! } + public var Common_of: String { return self._s[851]! } + public var Conversation_ForwardContacts: String { return self._s[854]! } + public var IntentsSettings_SuggestByAll: String { return self._s[856]! } public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[856]!, self._r[856]!, [_0]) + return formatWithArgumentRanges(self._s[857]!, self._r[857]!, [_0]) } - public var Passport_Language_hy: String { return self._s[857]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[858]! } - public var AutoDownloadSettings_Reset: String { return self._s[859]! } - public var Wallet_TransactionInfo_AddressCopied: String { return self._s[860]! } - public var Paint_ClearConfirm: String { return self._s[861]! } - public var Camera_VideoMode: String { return self._s[862]! } + public var Passport_Language_hy: String { return self._s[858]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[859]! } + public var AutoDownloadSettings_Reset: String { return self._s[860]! } + public var Wallet_TransactionInfo_AddressCopied: String { return self._s[861]! } + public var Paint_ClearConfirm: String { return self._s[862]! } + public var Camera_VideoMode: String { return self._s[863]! } public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[863]!, self._r[863]!, [_0]) + return formatWithArgumentRanges(self._s[864]!, self._r[864]!, [_0]) } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[864]! } - public var Conversation_ViewBackground: String { return self._s[865]! } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[865]! } + public var Conversation_ViewBackground: String { return self._s[866]! } public func Wallet_Info_TransactionDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[866]!, self._r[866]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[867]!, self._r[867]!, [_1, _2, _3]) } - public var Passport_Language_el: String { return self._s[867]! } - public var PhotoEditor_Original: String { return self._s[868]! } - public var Settings_FAQ_Button: String { return self._s[870]! } - public var Channel_Setup_PublicNoLink: String { return self._s[872]! } - public var Conversation_UnsupportedMedia: String { return self._s[873]! } - public var Conversation_SlideToCancel: String { return self._s[874]! } - public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[875]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[876]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[877]! } - public var Conversation_ReportSpamChannelConfirmation: String { return self._s[878]! } - public var AutoNightTheme_NotAvailable: String { return self._s[879]! } - public var Conversation_Owner: String { return self._s[880]! } - public var Common_Create: String { return self._s[881]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[882]! } - public var ContactList_Context_Call: String { return self._s[883]! } - public var Localization_ChooseLanguage: String { return self._s[885]! } - public var ChatList_Context_AddToContacts: String { return self._s[887]! } - public var Settings_Proxy: String { return self._s[889]! } - public var Privacy_TopPeersHelp: String { return self._s[890]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[891]! } - public var Chat_UnsendMyMessages: String { return self._s[892]! } + public var Passport_Language_el: String { return self._s[868]! } + public var PhotoEditor_Original: String { return self._s[869]! } + public var Settings_FAQ_Button: String { return self._s[871]! } + public var Channel_Setup_PublicNoLink: String { return self._s[873]! } + public var Conversation_UnsupportedMedia: String { return self._s[874]! } + public var Conversation_SlideToCancel: String { return self._s[875]! } + public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[876]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[877]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[878]! } + public var Conversation_ReportSpamChannelConfirmation: String { return self._s[879]! } + public var AutoNightTheme_NotAvailable: String { return self._s[880]! } + public var Conversation_Owner: String { return self._s[881]! } + public var Common_Create: String { return self._s[882]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[883]! } + public var ContactList_Context_Call: String { return self._s[884]! } + public var Localization_ChooseLanguage: String { return self._s[886]! } + public var ChatList_Context_AddToContacts: String { return self._s[888]! } + public var Settings_Proxy: String { return self._s[890]! } + public var Privacy_TopPeersHelp: String { return self._s[891]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[892]! } + public var Chat_UnsendMyMessages: String { return self._s[893]! } public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[893]!, self._r[893]!, [_0]) + return formatWithArgumentRanges(self._s[894]!, self._r[894]!, [_0]) } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[894]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[895]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[896]!, self._r[896]!, [_0]) + return formatWithArgumentRanges(self._s[897]!, self._r[897]!, [_0]) } - public var Contacts_SortedByPresence: String { return self._s[897]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[898]! } - public var Cache_Title: String { return self._s[899]! } + public var Contacts_SortedByPresence: String { return self._s[898]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[899]! } + public var Cache_Title: String { return self._s[900]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[900]!, self._r[900]!, [_0]) + return formatWithArgumentRanges(self._s[901]!, self._r[901]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[901]! } - public var Channel_Moderator_Title: String { return self._s[902]! } - public var InstantPage_AutoNightTheme: String { return self._s[904]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[902]! } + public var Channel_Moderator_Title: String { return self._s[903]! } + public var InstantPage_AutoNightTheme: String { return self._s[905]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[907]!, self._r[907]!, [_1]) + return formatWithArgumentRanges(self._s[908]!, self._r[908]!, [_1]) } - public var Passport_Scans_Upload: String { return self._s[908]! } - public var Undo_Undo: String { return self._s[910]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[911]! } - public var TwoStepAuth_RemovePassword: String { return self._s[912]! } - public var Common_Delete: String { return self._s[913]! } - public var Contacts_AddPeopleNearby: String { return self._s[915]! } - public var Conversation_ContextMenuDelete: String { return self._s[916]! } - public var SocksProxySetup_Credentials: String { return self._s[917]! } - public var Appearance_EditTheme: String { return self._s[919]! } - public var ClearCache_StorageOtherApps: String { return self._s[920]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[921]! } - public var Wallet_Send_NetworkErrorText: String { return self._s[922]! } - public var AuthSessions_DevicesTitle: String { return self._s[924]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[926]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[927]! } - public var Passport_Language_id: String { return self._s[929]! } - public var WallpaperSearch_ColorTeal: String { return self._s[930]! } - public var ChannelIntro_Title: String { return self._s[931]! } + public var Passport_Scans_Upload: String { return self._s[909]! } + public var Undo_Undo: String { return self._s[911]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[912]! } + public var TwoStepAuth_RemovePassword: String { return self._s[913]! } + public var Common_Delete: String { return self._s[914]! } + public var Contacts_AddPeopleNearby: String { return self._s[916]! } + public var Conversation_ContextMenuDelete: String { return self._s[917]! } + public var SocksProxySetup_Credentials: String { return self._s[918]! } + public var Appearance_EditTheme: String { return self._s[920]! } + public var ClearCache_StorageOtherApps: String { return self._s[921]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[922]! } + public var Wallet_Send_NetworkErrorText: String { return self._s[923]! } + public var AuthSessions_DevicesTitle: String { return self._s[925]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[927]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[928]! } + public var Passport_Language_id: String { return self._s[930]! } + public var WallpaperSearch_ColorTeal: String { return self._s[931]! } + public var ChannelIntro_Title: String { return self._s[932]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[932]!, self._r[932]!, [_0]) + return formatWithArgumentRanges(self._s[933]!, self._r[933]!, [_0]) } - public var VoiceOver_Chat_OpenLinkHint: String { return self._s[934]! } - public var VoiceOver_Chat_Reply: String { return self._s[935]! } - public var ScheduledMessages_BotActionUnavailable: String { return self._s[936]! } - public var Channel_Info_Description: String { return self._s[937]! } - public var Stickers_FavoriteStickers: String { return self._s[938]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[939]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[940]! } - public var ChatSearch_ResultsTooltip: String { return self._s[941]! } - public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[942]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[943]! } - public var Group_PublicLink_Placeholder: String { return self._s[944]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[945]! } + public var VoiceOver_Chat_OpenLinkHint: String { return self._s[935]! } + public var VoiceOver_Chat_Reply: String { return self._s[936]! } + public var ScheduledMessages_BotActionUnavailable: String { return self._s[937]! } + public var Channel_Info_Description: String { return self._s[938]! } + public var Stickers_FavoriteStickers: String { return self._s[939]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[940]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[941]! } + public var ChatSearch_ResultsTooltip: String { return self._s[942]! } + public var Wallet_VoiceOver_Editing_ClearText: String { return self._s[943]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[944]! } + public var Group_PublicLink_Placeholder: String { return self._s[945]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[946]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[946]!, self._r[946]!, [_1]) + return formatWithArgumentRanges(self._s[947]!, self._r[947]!, [_1]) } - public var TextFormat_Underline: String { return self._s[947]! } + public var TextFormat_Underline: String { return self._s[948]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[948]!, self._r[948]!, [_1, _2]) + return formatWithArgumentRanges(self._s[949]!, self._r[949]!, [_1, _2]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[949]!, self._r[949]!, [_0]) + return formatWithArgumentRanges(self._s[950]!, self._r[950]!, [_0]) } - public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[950]! } + public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[951]! } public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[951]!, self._r[951]!, [_1, _2]) + return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_1, _2]) } - public var Wallet_Intro_ImportExisting: String { return self._s[952]! } - public var GroupPermission_Delete: String { return self._s[953]! } - public var Passport_Language_uk: String { return self._s[954]! } - public var StickerPack_HideStickers: String { return self._s[956]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[957]! } + public var Wallet_Intro_ImportExisting: String { return self._s[953]! } + public var GroupPermission_Delete: String { return self._s[954]! } + public var Passport_Language_uk: String { return self._s[955]! } + public var StickerPack_HideStickers: String { return self._s[957]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[958]! } public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[958]!, self._r[958]!, [_1, _2]) + return formatWithArgumentRanges(self._s[959]!, self._r[959]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[959]! } + public var Activity_UploadingVideoMessage: String { return self._s[960]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[960]!, self._r[960]!, [_0]) + return formatWithArgumentRanges(self._s[961]!, self._r[961]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[961]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[962]! } - public var Settings_CallSettings: String { return self._s[963]! } - public var Camera_SquareMode: String { return self._s[964]! } - public var Conversation_SendMessage_ScheduleMessage: String { return self._s[965]! } - public var GroupInfo_SharedMediaNone: String { return self._s[966]! } + public var Channel_TitleInfo: String { return self._s[962]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[963]! } + public var Settings_CallSettings: String { return self._s[964]! } + public var Camera_SquareMode: String { return self._s[965]! } + public var Conversation_SendMessage_ScheduleMessage: String { return self._s[966]! } + public var GroupInfo_SharedMediaNone: String { return self._s[967]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[967]!, self._r[967]!, [_1]) + return formatWithArgumentRanges(self._s[968]!, self._r[968]!, [_1]) } - public var Bot_GenericBotStatus: String { return self._s[968]! } - public var Application_Update: String { return self._s[970]! } - public var Month_ShortJanuary: String { return self._s[971]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[972]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[973]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[974]! } - public var Passport_Address_Street2Placeholder: String { return self._s[975]! } + public var Bot_GenericBotStatus: String { return self._s[969]! } + public var Application_Update: String { return self._s[971]! } + public var Month_ShortJanuary: String { return self._s[972]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[973]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[974]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[975]! } + public var Passport_Address_Street2Placeholder: String { return self._s[976]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[976]!, self._r[976]!, [_0]) + return formatWithArgumentRanges(self._s[977]!, self._r[977]!, [_0]) } - public var NetworkUsageSettings_Cellular: String { return self._s[977]! } - public var Appearance_PreviewOutgoingText: String { return self._s[978]! } - public var Notifications_PermissionsAllowInSettings: String { return self._s[979]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[981]! } - public var Map_Directions: String { return self._s[982]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[984]! } - public var Appearance_ThemeDay: String { return self._s[985]! } - public var LogoutOptions_LogOut: String { return self._s[986]! } - public var Group_PublicLink_Title: String { return self._s[988]! } - public var Channel_AddBotErrorNoRights: String { return self._s[989]! } - public var Passport_Identity_AddPassport: String { return self._s[990]! } - public var LocalGroup_ButtonTitle: String { return self._s[991]! } - public var Call_Message: String { return self._s[992]! } - public var PhotoEditor_ExposureTool: String { return self._s[993]! } - public var Wallet_Receive_CommentInfo: String { return self._s[995]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[996]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[998]! } - public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[999]! } - public var Appearance_Preview: String { return self._s[1000]! } - public var Compose_ChannelMembers: String { return self._s[1001]! } - public var Conversation_DeleteManyMessages: String { return self._s[1002]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[1003]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1004]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1005]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[1008]! } - public var Conversation_UpdateTelegram: String { return self._s[1009]! } - public var EditTheme_Create_TopInfo: String { return self._s[1010]! } + public var NetworkUsageSettings_Cellular: String { return self._s[978]! } + public var Appearance_PreviewOutgoingText: String { return self._s[979]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[980]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[982]! } + public var Map_Directions: String { return self._s[983]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[985]! } + public var Appearance_ThemeDay: String { return self._s[986]! } + public var LogoutOptions_LogOut: String { return self._s[987]! } + public var Group_PublicLink_Title: String { return self._s[989]! } + public var Channel_AddBotErrorNoRights: String { return self._s[990]! } + public var Passport_Identity_AddPassport: String { return self._s[991]! } + public var LocalGroup_ButtonTitle: String { return self._s[992]! } + public var Call_Message: String { return self._s[993]! } + public var PhotoEditor_ExposureTool: String { return self._s[994]! } + public var Wallet_Receive_CommentInfo: String { return self._s[996]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[997]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[999]! } + public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[1000]! } + public var Appearance_Preview: String { return self._s[1001]! } + public var Compose_ChannelMembers: String { return self._s[1002]! } + public var Conversation_DeleteManyMessages: String { return self._s[1003]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[1004]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1005]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1006]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[1009]! } + public var Conversation_UpdateTelegram: String { return self._s[1010]! } + public var EditTheme_Create_TopInfo: String { return self._s[1011]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1011]!, self._r[1011]!, [_0]) + return formatWithArgumentRanges(self._s[1012]!, self._r[1012]!, [_0]) } - public var Wallet_WordCheck_Continue: String { return self._s[1012]! } - public var TwoFactorSetup_Hint_Action: String { return self._s[1013]! } - public var IntentsSettings_ResetAll: String { return self._s[1014]! } + public var Wallet_WordCheck_Continue: String { return self._s[1013]! } + public var TwoFactorSetup_Hint_Action: String { return self._s[1014]! } + public var IntentsSettings_ResetAll: String { return self._s[1015]! } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1015]!, self._r[1015]!, [_1]) + return formatWithArgumentRanges(self._s[1016]!, self._r[1016]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[1016]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[1017]! } + public var GroupInfo_Administrators_Title: String { return self._s[1017]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[1018]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1018]!, self._r[1018]!, [_0]) + return formatWithArgumentRanges(self._s[1019]!, self._r[1019]!, [_0]) } - public var Tour_Title3: String { return self._s[1019]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1020]! } - public var Clipboard_SendPhoto: String { return self._s[1024]! } - public var MediaPicker_Videos: String { return self._s[1025]! } - public var Passport_Email_Title: String { return self._s[1026]! } + public var Tour_Title3: String { return self._s[1020]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[1021]! } + public var Clipboard_SendPhoto: String { return self._s[1025]! } + public var MediaPicker_Videos: String { return self._s[1026]! } + public var Passport_Email_Title: String { return self._s[1027]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1027]!, self._r[1027]!, [_0]) + return formatWithArgumentRanges(self._s[1028]!, self._r[1028]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[1028]! } - public var Conversation_MessageDialogDelete: String { return self._s[1029]! } - public var Privacy_Calls_CustomHelp: String { return self._s[1031]! } - public var Message_Wallpaper: String { return self._s[1032]! } - public var MemberSearch_BotSection: String { return self._s[1033]! } - public var GroupInfo_SetSound: String { return self._s[1034]! } - public var Core_ServiceUserStatus: String { return self._s[1035]! } - public var LiveLocationUpdated_JustNow: String { return self._s[1036]! } - public var Call_StatusFailed: String { return self._s[1037]! } - public var TwoFactorSetup_Email_Placeholder: String { return self._s[1038]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1039]! } - public var TwoStepAuth_SetPassword: String { return self._s[1040]! } - public var Permissions_PeopleNearbyText_v0: String { return self._s[1041]! } + public var StickerPacksSettings_Title: String { return self._s[1029]! } + public var Conversation_MessageDialogDelete: String { return self._s[1030]! } + public var Privacy_Calls_CustomHelp: String { return self._s[1032]! } + public var Message_Wallpaper: String { return self._s[1033]! } + public var MemberSearch_BotSection: String { return self._s[1034]! } + public var GroupInfo_SetSound: String { return self._s[1035]! } + public var Core_ServiceUserStatus: String { return self._s[1036]! } + public var LiveLocationUpdated_JustNow: String { return self._s[1037]! } + public var Call_StatusFailed: String { return self._s[1038]! } + public var TwoFactorSetup_Email_Placeholder: String { return self._s[1039]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[1040]! } + public var TwoStepAuth_SetPassword: String { return self._s[1041]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[1042]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1043]!, self._r[1043]!, [_0]) + return formatWithArgumentRanges(self._s[1044]!, self._r[1044]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[1044]! } - public var Profile_Username: String { return self._s[1045]! } - public var Bot_DescriptionTitle: String { return self._s[1046]! } - public var MaskStickerSettings_Title: String { return self._s[1047]! } - public var SharedMedia_CategoryOther: String { return self._s[1048]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[1049]! } - public var Common_NotNow: String { return self._s[1050]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[1051]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[1052]! } - public var Map_Location: String { return self._s[1053]! } - public var Invitation_JoinGroup: String { return self._s[1054]! } - public var AutoDownloadSettings_Title: String { return self._s[1056]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1057]! } - public var Channel_ErrorAddBlocked: String { return self._s[1058]! } - public var Conversation_UnblockUser: String { return self._s[1059]! } - public var EditTheme_Edit_TopInfo: String { return self._s[1060]! } - public var Watch_Bot_Restart: String { return self._s[1061]! } - public var TwoStepAuth_Title: String { return self._s[1062]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[1063]! } - public var Checkout_ShippingMethod: String { return self._s[1064]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1065]! } + public var Calls_SubmitRating: String { return self._s[1045]! } + public var Profile_Username: String { return self._s[1046]! } + public var Bot_DescriptionTitle: String { return self._s[1047]! } + public var MaskStickerSettings_Title: String { return self._s[1048]! } + public var SharedMedia_CategoryOther: String { return self._s[1049]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[1050]! } + public var Common_NotNow: String { return self._s[1051]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[1052]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[1053]! } + public var Map_Location: String { return self._s[1054]! } + public var Invitation_JoinGroup: String { return self._s[1055]! } + public var AutoDownloadSettings_Title: String { return self._s[1057]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[1058]! } + public var Channel_ErrorAddBlocked: String { return self._s[1059]! } + public var Conversation_UnblockUser: String { return self._s[1060]! } + public var EditTheme_Edit_TopInfo: String { return self._s[1061]! } + public var Watch_Bot_Restart: String { return self._s[1062]! } + public var TwoStepAuth_Title: String { return self._s[1063]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[1064]! } + public var Checkout_ShippingMethod: String { return self._s[1065]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[1066]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1066]!, self._r[1066]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1067]!, self._r[1067]!, [_1, _2, _3]) } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1068]!, self._r[1068]!, [_0]) - } - public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1069]!, self._r[1069]!, [_0]) } - public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1070]! } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1071]! } - public var AuthSessions_TerminateOtherSessions: String { return self._s[1072]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[1073]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[1074]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1075]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1076]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[1077]! } - public var Checkout_PaymentMethod_Title: String { return self._s[1078]! } - public var SocksProxySetup_Connection: String { return self._s[1079]! } - public var Group_MessagePhotoRemoved: String { return self._s[1080]! } - public var Channel_Stickers_NotFound: String { return self._s[1083]! } - public var Group_About_Help: String { return self._s[1084]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[1085]! } - public var PeopleNearby_Title: String { return self._s[1087]! } - public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1088]!, self._r[1088]!, [_1]) + public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1070]!, self._r[1070]!, [_0]) } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1090]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1091]! } - public var SocksProxySetup_Password: String { return self._s[1092]! } - public var Notifications_PermissionsEnable: String { return self._s[1093]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[1095]! } + public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1071]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[1072]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[1073]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[1074]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[1075]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[1076]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[1077]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[1078]! } + public var Checkout_PaymentMethod_Title: String { return self._s[1079]! } + public var SocksProxySetup_Connection: String { return self._s[1080]! } + public var Group_MessagePhotoRemoved: String { return self._s[1081]! } + public var Channel_Stickers_NotFound: String { return self._s[1084]! } + public var Group_About_Help: String { return self._s[1085]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[1086]! } + public var PeopleNearby_Title: String { return self._s[1088]! } + public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1089]!, self._r[1089]!, [_1]) + } + public var Map_Home: String { return self._s[1090]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1092]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1093]! } + public var SocksProxySetup_Password: String { return self._s[1094]! } + public var Notifications_PermissionsEnable: String { return self._s[1095]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[1097]! } public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1096]!, self._r[1096]!, [_1]) + return formatWithArgumentRanges(self._s[1098]!, self._r[1098]!, [_1]) } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1098]!, self._r[1098]!, [_0]) + return formatWithArgumentRanges(self._s[1100]!, self._r[1100]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[1099]! } - public var ArchivedPacksAlert_Title: String { return self._s[1100]! } - public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1101]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[1101]! } + public var ArchivedPacksAlert_Title: String { return self._s[1102]! } + public var Wallet_Receive_InvoiceUrlCopied: String { return self._s[1103]! } + public var Map_PlacesNearby: String { return self._s[1104]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1102]!, self._r[1102]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1105]!, self._r[1105]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1103]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1105]! } - public var Conversation_StatusTyping: String { return self._s[1106]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[1107]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[1108]! } - public var UserInfo_CreateNewContact: String { return self._s[1109]! } - public var Passport_Identity_FrontSide: String { return self._s[1110]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1111]! } - public var Calls_CallTabTitle: String { return self._s[1112]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1113]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1106]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1108]! } + public var Conversation_StatusTyping: String { return self._s[1109]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[1110]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[1111]! } + public var UserInfo_CreateNewContact: String { return self._s[1112]! } + public var Passport_Identity_FrontSide: String { return self._s[1113]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1114]! } + public var Calls_CallTabTitle: String { return self._s[1115]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1116]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1115]!, self._r[1115]!, [_0]) + return formatWithArgumentRanges(self._s[1118]!, self._r[1118]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[1116]! } - public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1117]! } - public var SharedMedia_EmptyMusicText: String { return self._s[1118]! } - public var Wallet_Completed_Text: String { return self._s[1119]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1120]! } - public var Paint_Stickers: String { return self._s[1121]! } - public var Privacy_GroupsAndChannels: String { return self._s[1122]! } - public var ChatList_Context_Delete: String { return self._s[1124]! } - public var UserInfo_AddContact: String { return self._s[1125]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[1119]! } + public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1120]! } + public var SharedMedia_EmptyMusicText: String { return self._s[1121]! } + public var Wallet_Completed_Text: String { return self._s[1122]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1123]! } + public var Paint_Stickers: String { return self._s[1124]! } + public var Privacy_GroupsAndChannels: String { return self._s[1125]! } + public var ChatList_Context_Delete: String { return self._s[1127]! } + public var UserInfo_AddContact: String { return self._s[1128]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1126]!, self._r[1126]!, [_0]) + return formatWithArgumentRanges(self._s[1129]!, self._r[1129]!, [_0]) } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[1128]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[1131]! } public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1130]!, self._r[1130]!, [_0]) + return formatWithArgumentRanges(self._s[1133]!, self._r[1133]!, [_0]) } - public var DialogList_NoMessagesTitle: String { return self._s[1131]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[1132]! } - public var BlockedUsers_BlockUser: String { return self._s[1133]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[1134]! } - public var MediaPicker_UngroupDescription: String { return self._s[1135]! } - public var Watch_NoConnection: String { return self._s[1136]! } - public var Month_GenSeptember: String { return self._s[1137]! } - public var Conversation_ViewGroup: String { return self._s[1139]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1142]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[1143]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1144]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1145]! } - public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1146]! } - public var MediaPicker_CameraRoll: String { return self._s[1148]! } - public var Month_GenAugust: String { return self._s[1149]! } - public var Wallet_Configuration_SourceHeader: String { return self._s[1150]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[1151]! } - public var SharedMedia_EmptyText: String { return self._s[1152]! } - public var Map_ShareLiveLocation: String { return self._s[1153]! } - public var Calls_All: String { return self._s[1154]! } - public var Map_SendThisPlace: String { return self._s[1156]! } - public var Appearance_ThemeNight: String { return self._s[1158]! } - public var Conversation_HoldForAudio: String { return self._s[1159]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[1162]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[1163]! } - public var SocksProxySetup_Secret: String { return self._s[1164]! } + public var DialogList_NoMessagesTitle: String { return self._s[1134]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[1135]! } + public var BlockedUsers_BlockUser: String { return self._s[1136]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[1137]! } + public var MediaPicker_UngroupDescription: String { return self._s[1138]! } + public var Watch_NoConnection: String { return self._s[1139]! } + public var Month_GenSeptember: String { return self._s[1140]! } + public var Conversation_ViewGroup: String { return self._s[1142]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1145]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[1146]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1147]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1148]! } + public var Wallet_WordCheck_IncorrectHeader: String { return self._s[1149]! } + public var MediaPicker_CameraRoll: String { return self._s[1151]! } + public var Month_GenAugust: String { return self._s[1152]! } + public var Wallet_Configuration_SourceHeader: String { return self._s[1153]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[1154]! } + public var SharedMedia_EmptyText: String { return self._s[1155]! } + public var Map_ShareLiveLocation: String { return self._s[1156]! } + public var Calls_All: String { return self._s[1157]! } + public var Map_SendThisPlace: String { return self._s[1159]! } + public var Appearance_ThemeNight: String { return self._s[1161]! } + public var Conversation_HoldForAudio: String { return self._s[1162]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[1165]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[1166]! } + public var SocksProxySetup_Secret: String { return self._s[1167]! } public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1165]!, self._r[1165]!, [_0]) + return formatWithArgumentRanges(self._s[1168]!, self._r[1168]!, [_0]) } - public var Channel_BanList_RestrictedTitle: String { return self._s[1167]! } - public var Conversation_Location: String { return self._s[1168]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[1170]! } + public var Conversation_Location: String { return self._s[1171]! } public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1169]!, self._r[1169]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1172]!, self._r[1172]!, [_1, _2]) } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[1171]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1172]! } - public var Notifications_PermissionsText: String { return self._s[1173]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1174]! } - public var Call_Flip: String { return self._s[1175]! } - public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1177]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1178]! } - public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1179]! } - public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1180]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1182]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1184]! } - public var Channel_TooMuchBots: String { return self._s[1186]! } - public var Passport_DeletePassportConfirmation: String { return self._s[1187]! } - public var Login_InvalidCodeError: String { return self._s[1188]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1189]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[1174]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1175]! } + public var Notifications_PermissionsText: String { return self._s[1176]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1177]! } + public var Call_Flip: String { return self._s[1178]! } + public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[1180]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1181]! } + public var Wallet_TransactionInfo_StorageFeeInfoUrl: String { return self._s[1182]! } + public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1183]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1185]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1187]! } + public var Channel_TooMuchBots: String { return self._s[1189]! } + public var Passport_DeletePassportConfirmation: String { return self._s[1190]! } + public var Login_InvalidCodeError: String { return self._s[1191]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1192]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1190]!, self._r[1190]!, [_0]) + return formatWithArgumentRanges(self._s[1193]!, self._r[1193]!, [_0]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1191]!, self._r[1191]!, [_0]) + return formatWithArgumentRanges(self._s[1194]!, self._r[1194]!, [_0]) } - public var VoiceOver_Navigation_ProxySettings: String { return self._s[1192]! } - public var Call_CallInProgressTitle: String { return self._s[1193]! } - public var Month_ShortSeptember: String { return self._s[1194]! } - public var Watch_ChannelInfo_Title: String { return self._s[1195]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1198]! } - public var DialogList_PasscodeLockHelp: String { return self._s[1199]! } - public var Chat_MultipleTextMessagesDisabled: String { return self._s[1200]! } - public var Wallet_Receive_Title: String { return self._s[1201]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[1202]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1203]! } - public var PhotoEditor_CropReset: String { return self._s[1204]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1206]! } - public var Channel_Management_LabelEditor: String { return self._s[1207]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1209]! } - public var PhotoEditor_HighlightsTool: String { return self._s[1210]! } - public var Wallet_Info_WalletCreated: String { return self._s[1211]! } - public var UserInfo_Title: String { return self._s[1212]! } - public var ChatList_HideAction: String { return self._s[1213]! } - public var AccessDenied_Title: String { return self._s[1214]! } - public var DialogList_SearchLabel: String { return self._s[1215]! } - public var Group_Setup_HistoryHidden: String { return self._s[1216]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1217]! } - public var State_Updating: String { return self._s[1219]! } - public var Contacts_TabTitle: String { return self._s[1220]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[1222]! } - public var GroupInfo_GroupHistory: String { return self._s[1223]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1224]! } - public var Wallpaper_SetColor: String { return self._s[1225]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1226]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1227]! } - public var Chat_AttachmentLimitReached: String { return self._s[1228]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1229]! } - public var Contacts_NotRegisteredSection: String { return self._s[1230]! } + public var VoiceOver_Navigation_ProxySettings: String { return self._s[1195]! } + public var Call_CallInProgressTitle: String { return self._s[1196]! } + public var Month_ShortSeptember: String { return self._s[1197]! } + public var Watch_ChannelInfo_Title: String { return self._s[1198]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1201]! } + public var DialogList_PasscodeLockHelp: String { return self._s[1202]! } + public var Chat_MultipleTextMessagesDisabled: String { return self._s[1203]! } + public var Wallet_Receive_Title: String { return self._s[1204]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[1205]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1206]! } + public var PhotoEditor_CropReset: String { return self._s[1207]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1209]! } + public var Channel_Management_LabelEditor: String { return self._s[1210]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1212]! } + public var PhotoEditor_HighlightsTool: String { return self._s[1213]! } + public var Wallet_Info_WalletCreated: String { return self._s[1214]! } + public var UserInfo_Title: String { return self._s[1215]! } + public var ChatList_HideAction: String { return self._s[1216]! } + public var AccessDenied_Title: String { return self._s[1217]! } + public var DialogList_SearchLabel: String { return self._s[1218]! } + public var Group_Setup_HistoryHidden: String { return self._s[1219]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1220]! } + public var State_Updating: String { return self._s[1222]! } + public var Contacts_TabTitle: String { return self._s[1223]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[1225]! } + public var GroupInfo_GroupHistory: String { return self._s[1226]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1227]! } + public var Wallpaper_SetColor: String { return self._s[1228]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1229]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1230]! } + public var Chat_AttachmentLimitReached: String { return self._s[1231]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1232]! } + public var Contacts_NotRegisteredSection: String { return self._s[1233]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1231]!, self._r[1231]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1234]!, self._r[1234]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[1232]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[1233]! } - public var SocksProxySetup_Connecting: String { return self._s[1234]! } - public var ExplicitContent_AlertChannel: String { return self._s[1235]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[1236]! } - public var Conversation_Contact: String { return self._s[1237]! } - public var Login_CodeExpired: String { return self._s[1238]! } - public var Passport_DiscardMessageAction: String { return self._s[1239]! } - public var ChatList_Context_Unpin: String { return self._s[1240]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1241]! } + public var Paint_Clear: String { return self._s[1235]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[1236]! } + public var SocksProxySetup_Connecting: String { return self._s[1237]! } + public var ExplicitContent_AlertChannel: String { return self._s[1238]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[1239]! } + public var Conversation_Contact: String { return self._s[1240]! } + public var Login_CodeExpired: String { return self._s[1241]! } + public var Passport_DiscardMessageAction: String { return self._s[1242]! } + public var ChatList_Context_Unpin: String { return self._s[1243]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1244]! } public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1242]!, self._r[1242]!, [_0]) - } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[1243]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1244]! } - public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1245]!, self._r[1245]!, [_0]) } - public var Month_ShortApril: String { return self._s[1246]! } - public var AuthSessions_CurrentSession: String { return self._s[1247]! } - public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1250]! } - public var Wallet_Navigation_Cancel: String { return self._s[1252]! } - public var WallpaperPreview_CropTopText: String { return self._s[1253]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1254]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1255]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[1246]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1247]! } + public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1248]!, self._r[1248]!, [_0]) + } + public var Month_ShortApril: String { return self._s[1249]! } + public var AuthSessions_CurrentSession: String { return self._s[1250]! } + public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1253]! } + public var Wallet_Navigation_Cancel: String { return self._s[1255]! } + public var WallpaperPreview_CropTopText: String { return self._s[1256]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1257]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1258]! } public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1256]!, self._r[1256]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1259]!, self._r[1259]!, [_0, _1]) } - public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1257]! } - public var Channel_Setup_TypePrivate: String { return self._s[1259]! } - public var Forward_ChannelReadOnly: String { return self._s[1262]! } - public var PhotoEditor_CurvesBlue: String { return self._s[1263]! } - public var AddContact_SharedContactException: String { return self._s[1264]! } - public var UserInfo_BotPrivacy: String { return self._s[1266]! } - public var Wallet_CreateInvoice_Title: String { return self._s[1267]! } - public var Notification_PassportValueEmail: String { return self._s[1268]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[1269]! } - public var GroupPermission_NewTitle: String { return self._s[1270]! } - public var CallFeedback_ReasonDropped: String { return self._s[1271]! } - public var GroupInfo_Permissions_AddException: String { return self._s[1272]! } - public var Channel_SignMessages_Help: String { return self._s[1274]! } - public var Undo_ChatDeleted: String { return self._s[1276]! } - public var Conversation_ChatBackground: String { return self._s[1277]! } + public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1260]! } + public var Channel_Setup_TypePrivate: String { return self._s[1262]! } + public var Forward_ChannelReadOnly: String { return self._s[1265]! } + public var PhotoEditor_CurvesBlue: String { return self._s[1266]! } + public var AddContact_SharedContactException: String { return self._s[1267]! } + public var UserInfo_BotPrivacy: String { return self._s[1269]! } + public var Wallet_CreateInvoice_Title: String { return self._s[1270]! } + public var Notification_PassportValueEmail: String { return self._s[1271]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[1272]! } + public var GroupPermission_NewTitle: String { return self._s[1273]! } + public var CallFeedback_ReasonDropped: String { return self._s[1274]! } + public var GroupInfo_Permissions_AddException: String { return self._s[1275]! } + public var Channel_SignMessages_Help: String { return self._s[1277]! } + public var Undo_ChatDeleted: String { return self._s[1279]! } + public var Conversation_ChatBackground: String { return self._s[1280]! } public func Wallet_WordCheck_Text(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1278]!, self._r[1278]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1281]!, self._r[1281]!, [_1, _2, _3]) } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1279]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1280]! } - public var Passport_Language_pt: String { return self._s[1281]! } - public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1282]! } - public var NotificationsSound_Popcorn: String { return self._s[1285]! } - public var AutoNightTheme_Disabled: String { return self._s[1286]! } - public var BlockedUsers_LeavePrefix: String { return self._s[1287]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[1288]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1289]! } - public var WallpaperSearch_ColorBlue: String { return self._s[1290]! } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1282]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1283]! } + public var Passport_Language_pt: String { return self._s[1284]! } + public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1285]! } + public var NotificationsSound_Popcorn: String { return self._s[1288]! } + public var AutoNightTheme_Disabled: String { return self._s[1289]! } + public var BlockedUsers_LeavePrefix: String { return self._s[1290]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[1291]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1292]! } + public var WallpaperSearch_ColorBlue: String { return self._s[1293]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1291]!, self._r[1291]!, [_0]) + return formatWithArgumentRanges(self._s[1294]!, self._r[1294]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1292]! } - public var SocksProxySetup_UseForCalls: String { return self._s[1293]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1295]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1295]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1296]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1298]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1296]!, self._r[1296]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1299]!, self._r[1299]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1299]! } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1300]! } - public var Compose_NewEncryptedChat: String { return self._s[1301]! } - public var Login_CodeFloodError: String { return self._s[1302]! } - public var Calls_TabTitle: String { return self._s[1303]! } - public var Privacy_ProfilePhoto: String { return self._s[1304]! } - public var Passport_Language_he: String { return self._s[1305]! } + public var SocksProxySetup_Hostname: String { return self._s[1302]! } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1303]! } + public var Compose_NewEncryptedChat: String { return self._s[1304]! } + public var Login_CodeFloodError: String { return self._s[1305]! } + public var Calls_TabTitle: String { return self._s[1306]! } + public var Privacy_ProfilePhoto: String { return self._s[1307]! } + public var Passport_Language_he: String { return self._s[1308]! } public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1306]!, self._r[1306]!, [_0]) + return formatWithArgumentRanges(self._s[1309]!, self._r[1309]!, [_0]) } - public var GroupPermission_Title: String { return self._s[1307]! } + public var GroupPermission_Title: String { return self._s[1310]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1308]!, self._r[1308]!, [_0]) + return formatWithArgumentRanges(self._s[1311]!, self._r[1311]!, [_0]) } - public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1309]! } - public var GroupPermission_NoChangeInfo: String { return self._s[1310]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[1311]! } - public var Tour_Text1: String { return self._s[1312]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[1313]! } - public var Month_ShortFebruary: String { return self._s[1314]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1315]! } + public var Wallet_TransactionInfo_SenderHeader: String { return self._s[1312]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1313]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[1314]! } + public var Tour_Text1: String { return self._s[1315]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[1316]! } + public var Month_ShortFebruary: String { return self._s[1317]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1318]! } public func Wallet_Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1316]!, self._r[1316]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1319]!, self._r[1319]!, [_1, _2, _3]) } - public var NotificationsSound_Glass: String { return self._s[1317]! } - public var Appearance_ThemeNightBlue: String { return self._s[1318]! } - public var CheckoutInfo_Pay: String { return self._s[1319]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1321]! } - public var Call_CallAgain: String { return self._s[1323]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1324]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1325]! } - public var Passport_InvalidPasswordError: String { return self._s[1326]! } - public var Watch_Message_Game: String { return self._s[1327]! } - public var Stickers_Install: String { return self._s[1328]! } - public var VoiceOver_Chat_Message: String { return self._s[1329]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1330]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1332]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1333]! } - public var AuthSessions_OtherSessions: String { return self._s[1334]! } - public var Channel_Username_Help: String { return self._s[1335]! } - public var Camera_Title: String { return self._s[1336]! } - public var IntentsSettings_Title: String { return self._s[1337]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1339]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1340]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1341]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1342]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1343]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1344]! } - public var ScheduledMessages_DeleteMany: String { return self._s[1345]! } - public var Conversation_RestrictedStickers: String { return self._s[1346]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1348]! } - public var UserInfo_TelegramCall: String { return self._s[1350]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1351]! } - public var CreatePoll_OptionsHeader: String { return self._s[1352]! } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1353]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1354]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1355]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1356]! } + public var NotificationsSound_Glass: String { return self._s[1320]! } + public var Appearance_ThemeNightBlue: String { return self._s[1321]! } + public var CheckoutInfo_Pay: String { return self._s[1322]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1324]! } + public var Call_CallAgain: String { return self._s[1326]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1327]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1328]! } + public var Passport_InvalidPasswordError: String { return self._s[1329]! } + public var Watch_Message_Game: String { return self._s[1330]! } + public var Stickers_Install: String { return self._s[1331]! } + public var VoiceOver_Chat_Message: String { return self._s[1332]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1333]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1335]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1336]! } + public var AuthSessions_OtherSessions: String { return self._s[1337]! } + public var Channel_Username_Help: String { return self._s[1338]! } + public var Camera_Title: String { return self._s[1339]! } + public var IntentsSettings_Title: String { return self._s[1340]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1342]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1343]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1344]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1345]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1346]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1347]! } + public var ScheduledMessages_DeleteMany: String { return self._s[1348]! } + public var Conversation_RestrictedStickers: String { return self._s[1349]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1351]! } + public var UserInfo_TelegramCall: String { return self._s[1353]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1354]! } + public var CreatePoll_OptionsHeader: String { return self._s[1355]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1356]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1357]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1358]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1359]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1357]!, self._r[1357]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1360]!, self._r[1360]!, [_1, _2, _3]) } - public var Wallet_Month_GenAugust: String { return self._s[1358]! } - public var Settings_SaveEditedPhotos: String { return self._s[1359]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1360]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1361]! } - public var Conversation_MessageDialogRetry: String { return self._s[1362]! } - public var ChatList_Context_MarkAsUnread: String { return self._s[1363]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1364]! } - public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1365]! } - public var Group_Setup_TypeHeader: String { return self._s[1366]! } - public var Paint_RecentStickers: String { return self._s[1367]! } - public var PhotoEditor_GrainTool: String { return self._s[1368]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1369]! } - public var EmptyGroupInfo_Line4: String { return self._s[1370]! } - public var Watch_AuthRequired: String { return self._s[1372]! } + public var Wallet_Month_GenAugust: String { return self._s[1361]! } + public var Settings_SaveEditedPhotos: String { return self._s[1362]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1363]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1364]! } + public var Conversation_MessageDialogRetry: String { return self._s[1365]! } + public var ChatList_Context_MarkAsUnread: String { return self._s[1366]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1367]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1368]! } + public var Group_Setup_TypeHeader: String { return self._s[1369]! } + public var Paint_RecentStickers: String { return self._s[1370]! } + public var PhotoEditor_GrainTool: String { return self._s[1371]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1372]! } + public var EmptyGroupInfo_Line4: String { return self._s[1373]! } + public var Watch_AuthRequired: String { return self._s[1375]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1373]!, self._r[1373]!, [_0]) + return formatWithArgumentRanges(self._s[1376]!, self._r[1376]!, [_0]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1374]! } - public var ChannelIntro_Text: String { return self._s[1375]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1376]! } - public var GroupPermission_NoSendMedia: String { return self._s[1377]! } - public var Calls_AddTab: String { return self._s[1378]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1379]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1380]! } - public var Conversation_WalletRequiredSetup: String { return self._s[1381]! } - public var Notification_MessageLifetime1d: String { return self._s[1382]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1383]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1384]! } - public var Passport_Identity_GenderFemale: String { return self._s[1385]! } - public var BlockedUsers_BlockTitle: String { return self._s[1386]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1377]! } + public var ChannelIntro_Text: String { return self._s[1378]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1379]! } + public var GroupPermission_NoSendMedia: String { return self._s[1380]! } + public var Calls_AddTab: String { return self._s[1381]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1382]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1383]! } + public var Conversation_WalletRequiredSetup: String { return self._s[1384]! } + public var Notification_MessageLifetime1d: String { return self._s[1385]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1386]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1387]! } + public var Passport_Identity_GenderFemale: String { return self._s[1388]! } + public var BlockedUsers_BlockTitle: String { return self._s[1389]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1387]!, self._r[1387]!, [_1]) + return formatWithArgumentRanges(self._s[1390]!, self._r[1390]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1388]! } - public var WallpaperSearch_ColorBlack: String { return self._s[1389]! } - public var Settings_Context_Logout: String { return self._s[1390]! } - public var Wallet_Info_UnknownTransaction: String { return self._s[1391]! } - public var ChatList_ArchiveAction: String { return self._s[1392]! } - public var AutoNightTheme_Scheduled: String { return self._s[1393]! } - public var TwoFactorSetup_Email_SkipAction: String { return self._s[1394]! } - public var Settings_Devices: String { return self._s[1395]! } - public var ContactInfo_Note: String { return self._s[1396]! } + public var Weekday_Yesterday: String { return self._s[1391]! } + public var WallpaperSearch_ColorBlack: String { return self._s[1392]! } + public var Settings_Context_Logout: String { return self._s[1393]! } + public var Wallet_Info_UnknownTransaction: String { return self._s[1394]! } + public var ChatList_ArchiveAction: String { return self._s[1395]! } + public var AutoNightTheme_Scheduled: String { return self._s[1396]! } + public var TwoFactorSetup_Email_SkipAction: String { return self._s[1397]! } + public var Settings_Devices: String { return self._s[1398]! } + public var ContactInfo_Note: String { return self._s[1399]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1397]!, self._r[1397]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1400]!, self._r[1400]!, [_1, _2, _3, _4, _5, _6]) } - public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1398]! } - public var Wallet_Receive_CreateInvoice: String { return self._s[1399]! } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1400]! } - public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1401]! } + public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1401]! } + public var Wallet_Receive_CreateInvoice: String { return self._s[1402]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1403]! } + public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[1404]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1402]!, self._r[1402]!, [_1, _2]) - } - public var CreatePoll_Create: String { return self._s[1403]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1404]! } - public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1405]!, self._r[1405]!, [_1, _2]) } - public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1406]! } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1407]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1409]! } - public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1410]!, self._r[1410]!, [_1]) + public var CreatePoll_Create: String { return self._s[1406]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1407]! } + public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1408]!, self._r[1408]!, [_1, _2]) } - public var Preview_OpenInInstagram: String { return self._s[1411]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1412]! } + public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1409]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1410]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1412]! } + public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1413]!, self._r[1413]!, [_1]) + } + public var Preview_OpenInInstagram: String { return self._s[1414]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1415]! } public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1413]!, self._r[1413]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1416]!, self._r[1416]!, [_1, _2, _3]) } public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1414]!, self._r[1414]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1417]!, self._r[1417]!, [_1, _2]) } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1415]! } - public var ArchivedChats_IntroText3: String { return self._s[1416]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[1417]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1418]! } - public var Wallet_Month_GenSeptember: String { return self._s[1419]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1420]! } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1418]! } + public var ArchivedChats_IntroText3: String { return self._s[1419]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[1420]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1421]! } + public var Wallet_Month_GenSeptember: String { return self._s[1422]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1423]! } public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1421]!, self._r[1421]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1424]!, self._r[1424]!, [_1, _2, _3]) } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1423]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1424]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1425]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1426]! } - public var Gif_NoGifsFound: String { return self._s[1427]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1428]! } - public var VoiceOver_MessageContextDelete: String { return self._s[1429]! } - public var EditTheme_Preview: String { return self._s[1430]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1426]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1427]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1428]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1429]! } + public var Gif_NoGifsFound: String { return self._s[1430]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1431]! } + public var VoiceOver_MessageContextDelete: String { return self._s[1432]! } + public var EditTheme_Preview: String { return self._s[1433]! } public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1431]!, self._r[1431]!, [_0]) + return formatWithArgumentRanges(self._s[1434]!, self._r[1434]!, [_0]) } - public var GroupInfo_ActionPromote: String { return self._s[1432]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1433]! } - public var GroupInfo_Permissions_Title: String { return self._s[1434]! } - public var Permissions_ContactsText_v0: String { return self._s[1435]! } - public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1436]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1437]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1440]! } - public var Passport_FieldEmailHelp: String { return self._s[1441]! } + public var GroupInfo_ActionPromote: String { return self._s[1435]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1436]! } + public var GroupInfo_Permissions_Title: String { return self._s[1437]! } + public var Permissions_ContactsText_v0: String { return self._s[1438]! } + public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1439]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1440]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1443]! } + public var Passport_FieldEmailHelp: String { return self._s[1444]! } public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1442]!, self._r[1442]!, [_0]) + return formatWithArgumentRanges(self._s[1445]!, self._r[1445]!, [_0]) } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1443]! } - public var Weekday_ShortSaturday: String { return self._s[1444]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1445]! } - public var Watch_Conversation_UserInfo: String { return self._s[1446]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1447]! } - public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1448]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1449]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1450]! } - public var PhotoEditor_VignetteTool: String { return self._s[1451]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1452]! } - public var Passport_Language_et: String { return self._s[1453]! } - public var AppUpgrade_Running: String { return self._s[1454]! } - public var Channel_DiscussionGroup_Info: String { return self._s[1456]! } - public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1457]! } - public var Passport_Language_bg: String { return self._s[1458]! } - public var Stickers_NoStickersFound: String { return self._s[1460]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1446]! } + public var Weekday_ShortSaturday: String { return self._s[1447]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1448]! } + public var Watch_Conversation_UserInfo: String { return self._s[1449]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1450]! } + public var GroupPermission_PermissionDisabledByDefault: String { return self._s[1451]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1452]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1453]! } + public var PhotoEditor_VignetteTool: String { return self._s[1454]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1455]! } + public var Passport_Language_et: String { return self._s[1456]! } + public var AppUpgrade_Running: String { return self._s[1457]! } + public var Channel_DiscussionGroup_Info: String { return self._s[1459]! } + public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1460]! } + public var Passport_Language_bg: String { return self._s[1461]! } + public var Stickers_NoStickersFound: String { return self._s[1463]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1462]!, self._r[1462]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1465]!, self._r[1465]!, [_1, _2]) } public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1463]!, self._r[1463]!, [_0]) + return formatWithArgumentRanges(self._s[1466]!, self._r[1466]!, [_0]) } - public var Wallet_Month_GenJuly: String { return self._s[1464]! } - public var Wallet_Receive_AddressHeader: String { return self._s[1465]! } - public var Wallet_Send_AmountText: String { return self._s[1466]! } - public var Settings_About: String { return self._s[1467]! } + public var Wallet_Month_GenJuly: String { return self._s[1467]! } + public var Wallet_Receive_AddressHeader: String { return self._s[1468]! } + public var Wallet_Send_AmountText: String { return self._s[1469]! } + public var Settings_About: String { return self._s[1470]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1468]!, self._r[1468]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1471]!, self._r[1471]!, [_0, _1, _2]) } - public var ChatList_Context_MarkAsRead: String { return self._s[1470]! } - public var KeyCommand_NewMessage: String { return self._s[1471]! } - public var Group_ErrorAddBlocked: String { return self._s[1472]! } + public var ChatList_Context_MarkAsRead: String { return self._s[1473]! } + public var KeyCommand_NewMessage: String { return self._s[1474]! } + public var Group_ErrorAddBlocked: String { return self._s[1475]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1473]!, self._r[1473]!, [_0]) + return formatWithArgumentRanges(self._s[1476]!, self._r[1476]!, [_0]) } - public var Map_LocationTitle: String { return self._s[1474]! } - public var ReportGroupLocation_Title: String { return self._s[1475]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1476]! } - public var Cache_ClearProgress: String { return self._s[1477]! } + public var Map_LocationTitle: String { return self._s[1477]! } + public var ReportGroupLocation_Title: String { return self._s[1478]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1479]! } + public var Cache_ClearProgress: String { return self._s[1480]! } public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1478]!, self._r[1478]!, [_0]) + return formatWithArgumentRanges(self._s[1481]!, self._r[1481]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1479]! } - public var Passport_UpdateRequiredError: String { return self._s[1480]! } - public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1481]! } + public var GroupRemoved_AddToGroup: String { return self._s[1482]! } + public var Passport_UpdateRequiredError: String { return self._s[1483]! } + public var Wallet_SecureStorageNotAvailable_Text: String { return self._s[1484]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1482]!, self._r[1482]!, [_1]) + return formatWithArgumentRanges(self._s[1485]!, self._r[1485]!, [_1]) } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1484]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1485]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1486]! } - public var Passport_Language_ka: String { return self._s[1487]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1487]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1488]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1489]! } + public var Passport_Language_ka: String { return self._s[1490]! } public func Wallet_Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1488]!, self._r[1488]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1491]!, self._r[1491]!, [_1, _2, _3]) } - public var Call_Decline: String { return self._s[1489]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1490]! } - public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1493]! } + public var Call_Decline: String { return self._s[1492]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1493]! } + public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1496]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1494]!, self._r[1494]!, [_0]) + return formatWithArgumentRanges(self._s[1497]!, self._r[1497]!, [_0]) } - public var CallFeedback_Send: String { return self._s[1495]! } - public var EditTheme_EditTitle: String { return self._s[1496]! } + public var CallFeedback_Send: String { return self._s[1498]! } + public var EditTheme_EditTitle: String { return self._s[1499]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1497]!, self._r[1497]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1500]!, self._r[1500]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1498]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1501]! } public func Wallet_Updated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1500]!, self._r[1500]!, [_0]) + return formatWithArgumentRanges(self._s[1503]!, self._r[1503]!, [_0]) } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1501]! } - public var Passport_DeletePassport: String { return self._s[1502]! } - public var Appearance_AppIconFilled: String { return self._s[1503]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1504]! } - public var Month_ShortDecember: String { return self._s[1505]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1507]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1504]! } + public var Passport_DeletePassport: String { return self._s[1505]! } + public var Appearance_AppIconFilled: String { return self._s[1506]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1507]! } + public var Month_ShortDecember: String { return self._s[1508]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1510]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1508]!, self._r[1508]!, [_0]) + return formatWithArgumentRanges(self._s[1511]!, self._r[1511]!, [_0]) } - public var Channel_Stickers_Searching: String { return self._s[1509]! } - public var Conversation_EncryptedDescription1: String { return self._s[1510]! } - public var Conversation_EncryptedDescription2: String { return self._s[1511]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[1512]! } - public var Conversation_EncryptedDescription3: String { return self._s[1514]! } - public var PhotoEditor_SharpenTool: String { return self._s[1515]! } - public var Wallet_Configuration_Title: String { return self._s[1516]! } + public var Channel_Stickers_Searching: String { return self._s[1512]! } + public var Conversation_EncryptedDescription1: String { return self._s[1513]! } + public var Conversation_EncryptedDescription2: String { return self._s[1514]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[1515]! } + public var Conversation_EncryptedDescription3: String { return self._s[1517]! } + public var PhotoEditor_SharpenTool: String { return self._s[1518]! } + public var Wallet_Configuration_Title: String { return self._s[1519]! } public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1517]!, self._r[1517]!, [_0]) + return formatWithArgumentRanges(self._s[1520]!, self._r[1520]!, [_0]) } - public var Conversation_EncryptedDescription4: String { return self._s[1519]! } - public var Channel_Members_AddMembers: String { return self._s[1520]! } - public var Wallpaper_Search: String { return self._s[1521]! } - public var Weekday_Friday: String { return self._s[1522]! } - public var Privacy_ContactsSync: String { return self._s[1523]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1524]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1525]! } + public var Conversation_EncryptedDescription4: String { return self._s[1522]! } + public var Channel_Members_AddMembers: String { return self._s[1523]! } + public var Wallpaper_Search: String { return self._s[1524]! } + public var Weekday_Friday: String { return self._s[1525]! } + public var Privacy_ContactsSync: String { return self._s[1526]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1527]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1528]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1526]!, self._r[1526]!, [_0]) + return formatWithArgumentRanges(self._s[1529]!, self._r[1529]!, [_0]) } - public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1527]! } - public var GroupInfo_Permissions_Removed: String { return self._s[1528]! } - public var ScheduledMessages_ScheduledOnline: String { return self._s[1529]! } - public var Passport_Identity_GenderMale: String { return self._s[1530]! } + public var Wallet_Configuration_BlockchainIdHeader: String { return self._s[1530]! } + public var GroupInfo_Permissions_Removed: String { return self._s[1531]! } + public var ScheduledMessages_ScheduledOnline: String { return self._s[1532]! } + public var Passport_Identity_GenderMale: String { return self._s[1533]! } public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1531]!, self._r[1531]!, [_0]) + return formatWithArgumentRanges(self._s[1534]!, self._r[1534]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1532]! } - public var Conversation_JumpToDate: String { return self._s[1533]! } - public var Contacts_GlobalSearch: String { return self._s[1534]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1535]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[1536]! } - public var Profile_MessageLifetime1d: String { return self._s[1537]! } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1535]! } + public var Conversation_JumpToDate: String { return self._s[1536]! } + public var Contacts_GlobalSearch: String { return self._s[1537]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1538]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[1539]! } + public var Profile_MessageLifetime1d: String { return self._s[1540]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1538]!, self._r[1538]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1541]!, self._r[1541]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1541]! } + public var StickerPack_BuiltinPackName: String { return self._s[1544]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1542]!, self._r[1542]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1545]!, self._r[1545]!, [_1, _2]) } - public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1543]! } - public var Passport_InfoTitle: String { return self._s[1545]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1546]! } + public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1546]! } + public var Passport_InfoTitle: String { return self._s[1548]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1549]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1550]!, self._r[1550]!, [_0]) + return formatWithArgumentRanges(self._s[1553]!, self._r[1553]!, [_0]) } public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1551]!, self._r[1551]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1554]!, self._r[1554]!, [_1, _2]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1552]! } - public var Profile_BotInfo: String { return self._s[1553]! } - public var Watch_Compose_CreateMessage: String { return self._s[1554]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1555]! } - public var Month_ShortNovember: String { return self._s[1556]! } - public var Conversation_ScamWarning: String { return self._s[1557]! } - public var Wallpaper_SetCustomBackground: String { return self._s[1558]! } - public var Appearance_TextSize_Title: String { return self._s[1559]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1560]! } - public var NotificationsSound_Chime: String { return self._s[1561]! } - public var Passport_Language_ko: String { return self._s[1563]! } - public var InviteText_URL: String { return self._s[1564]! } - public var TextFormat_Monospace: String { return self._s[1565]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1555]! } + public var Profile_BotInfo: String { return self._s[1556]! } + public var Watch_Compose_CreateMessage: String { return self._s[1557]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1558]! } + public var Month_ShortNovember: String { return self._s[1559]! } + public var Conversation_ScamWarning: String { return self._s[1560]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1561]! } + public var Appearance_TextSize_Title: String { return self._s[1562]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1563]! } + public var NotificationsSound_Chime: String { return self._s[1564]! } + public var Passport_Language_ko: String { return self._s[1566]! } + public var InviteText_URL: String { return self._s[1567]! } + public var TextFormat_Monospace: String { return self._s[1568]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1566]!, self._r[1566]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1569]!, self._r[1569]!, [_1, _2, _3]) } - public var EditTheme_Edit_BottomInfo: String { return self._s[1567]! } + public var EditTheme_Edit_BottomInfo: String { return self._s[1570]! } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1568]!, self._r[1568]!, [_0]) + return formatWithArgumentRanges(self._s[1571]!, self._r[1571]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1569]!, self._r[1569]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1572]!, self._r[1572]!, [_1, _2]) } - public var Wallet_Words_Title: String { return self._s[1570]! } - public var Wallet_Month_ShortMay: String { return self._s[1571]! } - public var EditTheme_CreateTitle: String { return self._s[1573]! } - public var Passport_InfoLearnMore: String { return self._s[1574]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1575]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1576]! } - public var Your_card_has_expired: String { return self._s[1577]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1578]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1579]! } - public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1583]! } - public var Conversation_Report: String { return self._s[1585]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1586]! } - public var Notification_MessageLifetime1m: String { return self._s[1587]! } - public var Privacy_ContactsTitle: String { return self._s[1588]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1589]! } - public var Wallet_WordCheck_Title: String { return self._s[1590]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1591]! } - public var Channel_Members_Title: String { return self._s[1592]! } - public var Map_OpenInWaze: String { return self._s[1593]! } - public var Login_PhoneBannedError: String { return self._s[1594]! } + public var Wallet_Words_Title: String { return self._s[1573]! } + public var Wallet_Month_ShortMay: String { return self._s[1574]! } + public var EditTheme_CreateTitle: String { return self._s[1576]! } + public var Passport_InfoLearnMore: String { return self._s[1577]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1578]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1579]! } + public var Your_card_has_expired: String { return self._s[1580]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1581]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1582]! } + public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[1586]! } + public var Conversation_Report: String { return self._s[1588]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1589]! } + public var Notification_MessageLifetime1m: String { return self._s[1590]! } + public var Privacy_ContactsTitle: String { return self._s[1591]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1592]! } + public var Wallet_WordCheck_Title: String { return self._s[1593]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1594]! } + public var Channel_Members_Title: String { return self._s[1595]! } + public var Map_OpenInWaze: String { return self._s[1596]! } + public var Login_PhoneBannedError: String { return self._s[1597]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1595]!, self._r[1595]!, [_0]) + return formatWithArgumentRanges(self._s[1598]!, self._r[1598]!, [_0]) } - public var IntentsSettings_MainAccount: String { return self._s[1596]! } - public var Group_Management_AddModeratorHelp: String { return self._s[1597]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[1598]! } - public var Common_OK: String { return self._s[1599]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1600]! } - public var Wallet_Words_NotDoneResponse: String { return self._s[1601]! } - public var Cache_Music: String { return self._s[1602]! } - public var Wallet_Configuration_SourceURL: String { return self._s[1603]! } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1604]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1605]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1606]! } + public var IntentsSettings_MainAccount: String { return self._s[1599]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1600]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[1601]! } + public var Common_OK: String { return self._s[1602]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1603]! } + public var Wallet_Words_NotDoneResponse: String { return self._s[1604]! } + public var Cache_Music: String { return self._s[1605]! } + public var Wallet_Configuration_SourceURL: String { return self._s[1606]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1607]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1608]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1609]! } public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1607]!, self._r[1607]!, [_1]) + return formatWithArgumentRanges(self._s[1610]!, self._r[1610]!, [_1]) } public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1608]!, self._r[1608]!, [_0]) + return formatWithArgumentRanges(self._s[1611]!, self._r[1611]!, [_0]) } - public var TwoFactorSetup_Done_Action: String { return self._s[1609]! } + public var TwoFactorSetup_Done_Action: String { return self._s[1612]! } public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1610]!, self._r[1610]!, [_0]) + return formatWithArgumentRanges(self._s[1613]!, self._r[1613]!, [_0]) } - public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1611]! } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1613]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1614]! } - public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1616]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1617]! } - public var State_ConnectingToProxyInfo: String { return self._s[1618]! } - public var Conversation_SwipeToReplyHintTitle: String { return self._s[1619]! } - public var Message_VideoMessage: String { return self._s[1621]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1622]! } - public var ContactInfo_PhoneLabelOther: String { return self._s[1623]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1624]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1625]! } + public var Wallet_Send_ErrorNotEnoughFundsText: String { return self._s[1614]! } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1616]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1617]! } + public var Wallet_Receive_CreateInvoiceInfo: String { return self._s[1619]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1620]! } + public var State_ConnectingToProxyInfo: String { return self._s[1621]! } + public var Conversation_SwipeToReplyHintTitle: String { return self._s[1622]! } + public var Message_VideoMessage: String { return self._s[1624]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1625]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1626]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1627]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1628]! } public func Wallet_Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1626]!, self._r[1626]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1629]!, self._r[1629]!, [_1, _2, _3]) } - public var WallpaperPreview_SwipeBottomText: String { return self._s[1627]! } - public var Activity_RecordingAudio: String { return self._s[1628]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[1629]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1630]! } - public var Wallet_Info_Address: String { return self._s[1631]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[1630]! } + public var Activity_RecordingAudio: String { return self._s[1631]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[1632]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1633]! } + public var Wallet_Info_Address: String { return self._s[1634]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1633]!, self._r[1633]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1636]!, self._r[1636]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1637]!, self._r[1637]!, [_0]) + return formatWithArgumentRanges(self._s[1640]!, self._r[1640]!, [_0]) } - public var Conversation_ApplyLocalization: String { return self._s[1638]! } - public var TwoFactorSetup_Intro_Action: String { return self._s[1639]! } - public var UserInfo_AddPhone: String { return self._s[1640]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1641]! } + public var Conversation_ApplyLocalization: String { return self._s[1641]! } + public var TwoFactorSetup_Intro_Action: String { return self._s[1642]! } + public var UserInfo_AddPhone: String { return self._s[1643]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1644]! } public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1642]!, self._r[1642]!, [_0]) + return formatWithArgumentRanges(self._s[1645]!, self._r[1645]!, [_0]) } - public var Passport_Scans: String { return self._s[1644]! } - public var BlockedUsers_Unblock: String { return self._s[1645]! } + public var Passport_Scans: String { return self._s[1647]! } + public var BlockedUsers_Unblock: String { return self._s[1648]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1646]!, self._r[1646]!, [_1]) + return formatWithArgumentRanges(self._s[1649]!, self._r[1649]!, [_1]) } - public var Channel_Management_LabelCreator: String { return self._s[1647]! } - public var Conversation_ReportSpamAndLeave: String { return self._s[1648]! } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1649]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1650]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1651]! } + public var Channel_Management_LabelCreator: String { return self._s[1650]! } + public var Conversation_ReportSpamAndLeave: String { return self._s[1651]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1652]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1653]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1654]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1652]!, self._r[1652]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1655]!, self._r[1655]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1653]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1654]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1655]! } - public var ChannelIntro_CreateChannel: String { return self._s[1656]! } - public var Conversation_UnreadMessages: String { return self._s[1657]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1658]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1659]! } - public var Theme_Context_Apply: String { return self._s[1660]! } - public var Notification_GroupActivated: String { return self._s[1661]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1662]! } - public var Wallet_Intro_CreateWallet: String { return self._s[1663]! } + public var Login_PhoneNumberHelp: String { return self._s[1656]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1657]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1658]! } + public var ChannelIntro_CreateChannel: String { return self._s[1659]! } + public var Conversation_UnreadMessages: String { return self._s[1660]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1661]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1662]! } + public var Theme_Context_Apply: String { return self._s[1663]! } + public var Notification_GroupActivated: String { return self._s[1664]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1665]! } + public var Wallet_Intro_CreateWallet: String { return self._s[1666]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1664]!, self._r[1664]!, [_0]) + return formatWithArgumentRanges(self._s[1667]!, self._r[1667]!, [_0]) } public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1665]!, self._r[1665]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1668]!, self._r[1668]!, [_0, _1]) } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1667]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1670]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1668]!, self._r[1668]!, [_0]) - } - public var Undo_DeletedChannel: String { return self._s[1669]! } - public var CallFeedback_AddComment: String { return self._s[1670]! } - public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1671]!, self._r[1671]!, [_0]) } - public var Document_TargetConfirmationFormat: String { return self._s[1672]! } + public var Undo_DeletedChannel: String { return self._s[1672]! } + public var CallFeedback_AddComment: String { return self._s[1673]! } + public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1674]!, self._r[1674]!, [_0]) + } + public var Document_TargetConfirmationFormat: String { return self._s[1675]! } public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1673]!, self._r[1673]!, [_0]) + return formatWithArgumentRanges(self._s[1676]!, self._r[1676]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[1674]! } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[1677]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1675]!, self._r[1675]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[1678]!, self._r[1678]!, [_1, _2, _3, _4]) } - public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1676]! } - public var Theme_ErrorNotFound: String { return self._s[1677]! } - public var Contacts_SortByName: String { return self._s[1678]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1679]! } + public var Wallet_SecureStorageChanged_PasscodeText: String { return self._s[1679]! } + public var Theme_ErrorNotFound: String { return self._s[1680]! } + public var Contacts_SortByName: String { return self._s[1681]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1682]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1681]!, self._r[1681]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1684]!, self._r[1684]!, [_1, _2, _3]) } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1682]! } - public var ScheduledMessages_EditTime: String { return self._s[1683]! } - public var Conversation_ClearSelfHistory: String { return self._s[1684]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1685]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[1686]! } - public var Stickers_SuggestNone: String { return self._s[1687]! } - public var ChatSettings_Cache: String { return self._s[1688]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1689]! } - public var Media_ShareThisPhoto: String { return self._s[1690]! } - public var Chat_SlowmodeTooltipPending: String { return self._s[1691]! } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[1692]! } - public var Conversation_ContextMenuCopyLink: String { return self._s[1693]! } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1694]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1695]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1696]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1685]! } + public var ScheduledMessages_EditTime: String { return self._s[1686]! } + public var Conversation_ClearSelfHistory: String { return self._s[1687]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1688]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[1689]! } + public var Stickers_SuggestNone: String { return self._s[1690]! } + public var ChatSettings_Cache: String { return self._s[1691]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1692]! } + public var Media_ShareThisPhoto: String { return self._s[1693]! } + public var Chat_SlowmodeTooltipPending: String { return self._s[1694]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1695]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1696]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1697]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1698]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1699]! } public func Wallet_SecureStorageReset_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1697]!, self._r[1697]!, [_0]) + return formatWithArgumentRanges(self._s[1700]!, self._r[1700]!, [_0]) } - public var Permissions_CellularDataTitle_v0: String { return self._s[1698]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1700]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1701]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[1702]! } - public var Map_OpenIn: String { return self._s[1703]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1701]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1703]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1704]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[1705]! } + public var Map_OpenIn: String { return self._s[1706]! } public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1706]!, self._r[1706]!, [_1]) + return formatWithArgumentRanges(self._s[1709]!, self._r[1709]!, [_1]) } public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1707]!, self._r[1707]!, [_0]) + return formatWithArgumentRanges(self._s[1710]!, self._r[1710]!, [_0]) } - public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1708]! } - public var MessagePoll_LabelClosed: String { return self._s[1709]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1711]! } - public var Wallet_Send_SendAnyway: String { return self._s[1712]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1713]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[1714]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1715]! } - public var Map_SetThisPlace: String { return self._s[1716]! } - public var Login_SelectCountry_Title: String { return self._s[1717]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1718]! } + public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1711]! } + public var MessagePoll_LabelClosed: String { return self._s[1712]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1714]! } + public var Wallet_Send_SendAnyway: String { return self._s[1715]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1716]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1717]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1718]! } + public var Map_SetThisPlace: String { return self._s[1719]! } + public var Login_SelectCountry_Title: String { return self._s[1720]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1721]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1719]!, self._r[1719]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1722]!, self._r[1722]!, [_1, _2]) } - public var Channel_AdminLog_ChangeInfo: String { return self._s[1720]! } - public var Watch_Suggestion_BRB: String { return self._s[1721]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[1722]! } - public var Contacts_PermissionsTitle: String { return self._s[1723]! } - public var Conversation_RestrictedInline: String { return self._s[1724]! } - public var StickerPack_ViewPack: String { return self._s[1726]! } - public var Wallet_UnknownError: String { return self._s[1727]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1723]! } + public var Watch_Suggestion_BRB: String { return self._s[1724]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1725]! } + public var Contacts_PermissionsTitle: String { return self._s[1726]! } + public var Conversation_RestrictedInline: String { return self._s[1727]! } + public var StickerPack_ViewPack: String { return self._s[1729]! } + public var Wallet_UnknownError: String { return self._s[1730]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1728]!, self._r[1728]!, [_0]) + return formatWithArgumentRanges(self._s[1731]!, self._r[1731]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1730]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1733]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1735]! } - public var Channel_Info_Stickers: String { return self._s[1736]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1737]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1738]! } - public var Passport_DeletePersonalDetails: String { return self._s[1739]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1740]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1741]! } - public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1742]! } - public var Conversation_SearchNoResults: String { return self._s[1744]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1745]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1746]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1747]! } - public var Login_Code: String { return self._s[1748]! } - public var EditTheme_Create_BottomInfo: String { return self._s[1749]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1750]! } - public var Weekday_ShortThursday: String { return self._s[1751]! } - public var Resolve_ErrorNotFound: String { return self._s[1753]! } - public var LastSeen_Offline: String { return self._s[1754]! } - public var PeopleNearby_NoMembers: String { return self._s[1755]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1756]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1757]! } - public var GroupInfo_Title: String { return self._s[1759]! } - public var NotificationsSound_Note: String { return self._s[1760]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1761]! } - public var Watch_Message_Poll: String { return self._s[1762]! } - public var Privacy_Calls: String { return self._s[1763]! } + public var Compose_NewChannel: String { return self._s[1733]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1736]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1738]! } + public var Channel_Info_Stickers: String { return self._s[1739]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1740]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1741]! } + public var Passport_DeletePersonalDetails: String { return self._s[1742]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1743]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1744]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1745]! } + public var Conversation_SearchNoResults: String { return self._s[1747]! } + public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1748]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1749]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1750]! } + public var Login_Code: String { return self._s[1751]! } + public var EditTheme_Create_BottomInfo: String { return self._s[1752]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1753]! } + public var Weekday_ShortThursday: String { return self._s[1754]! } + public var Resolve_ErrorNotFound: String { return self._s[1756]! } + public var LastSeen_Offline: String { return self._s[1757]! } + public var PeopleNearby_NoMembers: String { return self._s[1758]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1759]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1760]! } + public var GroupInfo_Title: String { return self._s[1762]! } + public var NotificationsSound_Note: String { return self._s[1763]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1764]! } + public var Watch_Message_Poll: String { return self._s[1765]! } + public var Privacy_Calls: String { return self._s[1766]! } public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1764]!, self._r[1764]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1767]!, self._r[1767]!, [_1, _2, _3]) } - public var Month_ShortAugust: String { return self._s[1765]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1766]! } - public var Notifications_Reset: String { return self._s[1767]! } - public var Conversation_Pin: String { return self._s[1768]! } - public var Passport_Language_lv: String { return self._s[1769]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1770]! } - public var BlockedUsers_Info: String { return self._s[1771]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1773]! } - public var Watch_Conversation_Unblock: String { return self._s[1775]! } + public var Month_ShortAugust: String { return self._s[1768]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1769]! } + public var Notifications_Reset: String { return self._s[1770]! } + public var Conversation_Pin: String { return self._s[1771]! } + public var Passport_Language_lv: String { return self._s[1772]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1773]! } + public var BlockedUsers_Info: String { return self._s[1774]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1776]! } + public var Watch_Conversation_Unblock: String { return self._s[1778]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1776]!, self._r[1776]!, [_0]) - } - public var CloudStorage_Title: String { return self._s[1777]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1778]! } - public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1779]!, self._r[1779]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1780]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1781]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1782]! } - public var Passport_Address_EditBankStatement: String { return self._s[1783]! } - public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1784]!, self._r[1784]!, [_1, _2]) + public var CloudStorage_Title: String { return self._s[1780]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1781]! } + public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1782]!, self._r[1782]!, [_0]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1785]! } - public var ShareMenu_Comment: String { return self._s[1786]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1787]! } - public var Notifications_PermissionsTitle: String { return self._s[1788]! } - public var GroupPermission_NoSendLinks: String { return self._s[1789]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1790]! } - public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1791]! } - public var Settings_Support: String { return self._s[1792]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1793]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1794]! } - public var Privacy_Forwards_Preview: String { return self._s[1795]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1796]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1797]! } - public var Common_Select: String { return self._s[1799]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1800]! } - public var WallpaperSearch_ColorGray: String { return self._s[1803]! } - public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1804]! } - public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1805]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1806]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1807]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1808]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1809]! } - public var Widget_AuthRequired: String { return self._s[1810]! } - public var Camera_FlashOn: String { return self._s[1811]! } - public var Conversation_ContextMenuLookUp: String { return self._s[1812]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1813]! } - public var Watch_Suggestion_OK: String { return self._s[1814]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1783]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1784]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1785]! } + public var Passport_Address_EditBankStatement: String { return self._s[1786]! } + public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1787]!, self._r[1787]!, [_1, _2]) + } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1788]! } + public var ShareMenu_Comment: String { return self._s[1789]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1790]! } + public var Notifications_PermissionsTitle: String { return self._s[1791]! } + public var GroupPermission_NoSendLinks: String { return self._s[1792]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1793]! } + public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1794]! } + public var Settings_Support: String { return self._s[1795]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1796]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1797]! } + public var Privacy_Forwards_Preview: String { return self._s[1798]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1799]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1800]! } + public var Common_Select: String { return self._s[1802]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1803]! } + public var WallpaperSearch_ColorGray: String { return self._s[1806]! } + public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1807]! } + public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1808]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1809]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1810]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1811]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1812]! } + public var Widget_AuthRequired: String { return self._s[1813]! } + public var Camera_FlashOn: String { return self._s[1814]! } + public var Conversation_ContextMenuLookUp: String { return self._s[1815]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1816]! } + public var Watch_Suggestion_OK: String { return self._s[1817]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1816]!, self._r[1816]!, [_0]) + return formatWithArgumentRanges(self._s[1819]!, self._r[1819]!, [_0]) } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1818]!, self._r[1818]!, [_0]) + return formatWithArgumentRanges(self._s[1821]!, self._r[1821]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[1819]! } - public var DialogList_AdLabel: String { return self._s[1820]! } - public var WatchRemote_NotificationText: String { return self._s[1821]! } - public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1822]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1823]! } - public var Conversation_ReportSpam: String { return self._s[1824]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1825]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1827]! } - public var PhoneLabel_Title: String { return self._s[1828]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1829]! } - public var Settings_ChangePhoneNumber: String { return self._s[1830]! } - public var Notifications_ExceptionsTitle: String { return self._s[1831]! } - public var Notifications_AlertTones: String { return self._s[1832]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1833]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1834]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1835]! } - public var VoiceOver_Chat_Photo: String { return self._s[1837]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1838]! } - public var ReportPeer_ReasonOther: String { return self._s[1839]! } - public var ChatList_Context_JoinChannel: String { return self._s[1840]! } - public var KeyCommand_ScrollDown: String { return self._s[1842]! } - public var Conversation_ScheduleMessage_Title: String { return self._s[1843]! } + public var TextFormat_Strikethrough: String { return self._s[1822]! } + public var DialogList_AdLabel: String { return self._s[1823]! } + public var WatchRemote_NotificationText: String { return self._s[1824]! } + public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1825]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1826]! } + public var Conversation_ReportSpam: String { return self._s[1827]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1828]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1830]! } + public var PhoneLabel_Title: String { return self._s[1831]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1832]! } + public var Settings_ChangePhoneNumber: String { return self._s[1833]! } + public var Notifications_ExceptionsTitle: String { return self._s[1834]! } + public var Notifications_AlertTones: String { return self._s[1835]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1836]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1837]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1838]! } + public var VoiceOver_Chat_Photo: String { return self._s[1840]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1841]! } + public var ReportPeer_ReasonOther: String { return self._s[1842]! } + public var ChatList_Context_JoinChannel: String { return self._s[1843]! } + public var KeyCommand_ScrollDown: String { return self._s[1845]! } + public var Conversation_ScheduleMessage_Title: String { return self._s[1846]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1844]!, self._r[1844]!, [_0]) + return formatWithArgumentRanges(self._s[1847]!, self._r[1847]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1845]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1846]! } - public var AuthSessions_LogOut: String { return self._s[1847]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1848]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1849]! } - public var Passport_Phone_Title: String { return self._s[1850]! } - public var ContactList_Context_StartSecretChat: String { return self._s[1851]! } - public var Settings_PhoneNumber: String { return self._s[1852]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1848]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1849]! } + public var AuthSessions_LogOut: String { return self._s[1850]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1851]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1852]! } + public var Passport_Phone_Title: String { return self._s[1853]! } + public var ContactList_Context_StartSecretChat: String { return self._s[1854]! } + public var Settings_PhoneNumber: String { return self._s[1855]! } public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1853]!, self._r[1853]!, [_0]) + return formatWithArgumentRanges(self._s[1856]!, self._r[1856]!, [_0]) } - public var NotificationsSound_Alert: String { return self._s[1854]! } - public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1855]! } - public var WebSearch_SearchNoResults: String { return self._s[1856]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1858]! } - public var Wallet_Configuration_SourceInfo: String { return self._s[1859]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1860]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1861]! } - public var PhotoEditor_CurvesTool: String { return self._s[1862]! } - public var Checkout_PaymentMethod: String { return self._s[1864]! } + public var NotificationsSound_Alert: String { return self._s[1857]! } + public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1858]! } + public var WebSearch_SearchNoResults: String { return self._s[1859]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1861]! } + public var Wallet_Configuration_SourceInfo: String { return self._s[1862]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1863]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1864]! } + public var PhotoEditor_CurvesTool: String { return self._s[1865]! } + public var Checkout_PaymentMethod: String { return self._s[1867]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1865]!, self._r[1865]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1868]!, self._r[1868]!, [_1, _2]) } - public var Contacts_AccessDeniedError: String { return self._s[1866]! } - public var Camera_PhotoMode: String { return self._s[1869]! } - public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1870]! } - public var Appearance_TextSize_Apply: String { return self._s[1871]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1873]! } - public var CallSettings_OnMobile: String { return self._s[1874]! } - public var Tour_Text2: String { return self._s[1875]! } + public var Contacts_AccessDeniedError: String { return self._s[1869]! } + public var Camera_PhotoMode: String { return self._s[1872]! } + public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1873]! } + public var Appearance_TextSize_Apply: String { return self._s[1874]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1876]! } + public var CallSettings_OnMobile: String { return self._s[1877]! } + public var Tour_Text2: String { return self._s[1878]! } public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1876]!, self._r[1876]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1879]!, self._r[1879]!, [_1, _2]) } - public var DialogList_EncryptionProcessing: String { return self._s[1878]! } - public var Permissions_Skip: String { return self._s[1879]! } - public var Wallet_Words_NotDoneOk: String { return self._s[1880]! } - public var SecretImage_Title: String { return self._s[1881]! } - public var Watch_MessageView_Title: String { return self._s[1882]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1883]! } - public var AttachmentMenu_Poll: String { return self._s[1884]! } + public var DialogList_EncryptionProcessing: String { return self._s[1881]! } + public var Permissions_Skip: String { return self._s[1882]! } + public var Wallet_Words_NotDoneOk: String { return self._s[1883]! } + public var SecretImage_Title: String { return self._s[1884]! } + public var Watch_MessageView_Title: String { return self._s[1885]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1886]! } + public var AttachmentMenu_Poll: String { return self._s[1887]! } public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1885]!, self._r[1885]!, [_0]) + return formatWithArgumentRanges(self._s[1888]!, self._r[1888]!, [_0]) } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1886]!, self._r[1886]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1889]!, self._r[1889]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1887]! } - public var WallpaperPreview_Title: String { return self._s[1888]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1889]! } - public var Settings_ProxyConnecting: String { return self._s[1890]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1892]! } - public var VoiceOver_Chat_YourVideo: String { return self._s[1893]! } - public var Wallet_Intro_Title: String { return self._s[1894]! } - public var TwoFactorSetup_Password_Action: String { return self._s[1895]! } - public var Profile_MessageLifetime5s: String { return self._s[1896]! } - public var Username_InvalidCharacters: String { return self._s[1897]! } - public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1898]! } - public var ScheduledMessages_ClearAll: String { return self._s[1899]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1900]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1901]! } - public var Settings_AddAccount: String { return self._s[1902]! } - public var Notification_CreatedChannel: String { return self._s[1905]! } + public var Notification_CallCanceled: String { return self._s[1890]! } + public var WallpaperPreview_Title: String { return self._s[1891]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1892]! } + public var Settings_ProxyConnecting: String { return self._s[1893]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1895]! } + public var VoiceOver_Chat_YourVideo: String { return self._s[1896]! } + public var Wallet_Intro_Title: String { return self._s[1897]! } + public var TwoFactorSetup_Password_Action: String { return self._s[1898]! } + public var Profile_MessageLifetime5s: String { return self._s[1899]! } + public var Username_InvalidCharacters: String { return self._s[1900]! } + public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1901]! } + public var ScheduledMessages_ClearAll: String { return self._s[1902]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1903]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1904]! } + public var Settings_AddAccount: String { return self._s[1905]! } + public var Notification_CreatedChannel: String { return self._s[1908]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1906]!, self._r[1906]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1909]!, self._r[1909]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1908]! } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1909]! } - public var VoiceOver_Media_PlaybackStop: String { return self._s[1910]! } - public var Contacts_TopSection: String { return self._s[1911]! } - public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1912]! } + public var Passcode_AppLockedAlert: String { return self._s[1911]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1912]! } + public var VoiceOver_Media_PlaybackStop: String { return self._s[1913]! } + public var Contacts_TopSection: String { return self._s[1914]! } + public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1915]! } public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1913]!, self._r[1913]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1916]!, self._r[1916]!, [_0, _1]) } - public var Wallet_Info_Receive: String { return self._s[1914]! } - public var Wallet_Completed_ViewWallet: String { return self._s[1915]! } + public var Wallet_Info_Receive: String { return self._s[1917]! } + public var Wallet_Completed_ViewWallet: String { return self._s[1918]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1916]!, self._r[1916]!, [_0]) + return formatWithArgumentRanges(self._s[1919]!, self._r[1919]!, [_0]) } - public var ReportPeer_ReasonSpam: String { return self._s[1917]! } - public var UserInfo_TapToCall: String { return self._s[1918]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1920]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1921]! } - public var Common_Search: String { return self._s[1922]! } - public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1923]! } + public var ReportPeer_ReasonSpam: String { return self._s[1920]! } + public var UserInfo_TapToCall: String { return self._s[1921]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1923]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1924]! } + public var Common_Search: String { return self._s[1925]! } + public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1926]! } public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1924]!, self._r[1924]!, [_0]) + return formatWithArgumentRanges(self._s[1927]!, self._r[1927]!, [_0]) } - public var Wallet_Month_ShortJuly: String { return self._s[1925]! } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1927]! } - public var Message_InvoiceLabel: String { return self._s[1928]! } - public var Conversation_InputTextPlaceholder: String { return self._s[1929]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1930]! } + public var Wallet_Month_ShortJuly: String { return self._s[1928]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1930]! } + public var Message_InvoiceLabel: String { return self._s[1931]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1932]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1933]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1931]!, self._r[1931]!, [_0]) + return formatWithArgumentRanges(self._s[1934]!, self._r[1934]!, [_0]) } - public var IntentsSettings_Reset: String { return self._s[1932]! } - public var Conversation_Info: String { return self._s[1933]! } - public var Login_InfoDeletePhoto: String { return self._s[1934]! } - public var Passport_Language_vi: String { return self._s[1936]! } - public var UserInfo_ScamUserWarning: String { return self._s[1937]! } - public var Conversation_Search: String { return self._s[1938]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1940]! } - public var ReportPeer_ReasonPornography: String { return self._s[1941]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1942]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1943]! } - public var Map_LiveLocationGroupDescription: String { return self._s[1944]! } - public var Channel_Setup_TypeHeader: String { return self._s[1945]! } - public var AuthSessions_LoggedIn: String { return self._s[1946]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1947]! } - public var Login_SmsRequestState3: String { return self._s[1948]! } - public var Passport_Address_EditUtilityBill: String { return self._s[1949]! } - public var Appearance_ReduceMotionInfo: String { return self._s[1950]! } - public var Join_ChannelsTooMuch: String { return self._s[1951]! } - public var Channel_Edit_LinkItem: String { return self._s[1952]! } - public var Privacy_Calls_P2PNever: String { return self._s[1953]! } - public var Conversation_AddToReadingList: String { return self._s[1955]! } - public var Share_MultipleMessagesDisabled: String { return self._s[1956]! } - public var Message_Animation: String { return self._s[1957]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[1958]! } - public var Map_Unknown: String { return self._s[1959]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[1960]! } + public var IntentsSettings_Reset: String { return self._s[1935]! } + public var Conversation_Info: String { return self._s[1936]! } + public var Login_InfoDeletePhoto: String { return self._s[1937]! } + public var Passport_Language_vi: String { return self._s[1939]! } + public var UserInfo_ScamUserWarning: String { return self._s[1940]! } + public var Conversation_Search: String { return self._s[1941]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1943]! } + public var ReportPeer_ReasonPornography: String { return self._s[1944]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[1945]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1946]! } + public var Map_LiveLocationGroupDescription: String { return self._s[1947]! } + public var Channel_Setup_TypeHeader: String { return self._s[1948]! } + public var AuthSessions_LoggedIn: String { return self._s[1949]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1950]! } + public var Login_SmsRequestState3: String { return self._s[1951]! } + public var Passport_Address_EditUtilityBill: String { return self._s[1952]! } + public var Appearance_ReduceMotionInfo: String { return self._s[1953]! } + public var Join_ChannelsTooMuch: String { return self._s[1954]! } + public var Channel_Edit_LinkItem: String { return self._s[1955]! } + public var Privacy_Calls_P2PNever: String { return self._s[1956]! } + public var Conversation_AddToReadingList: String { return self._s[1958]! } + public var Share_MultipleMessagesDisabled: String { return self._s[1959]! } + public var Message_Animation: String { return self._s[1960]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[1961]! } + public var Map_Unknown: String { return self._s[1962]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[1963]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1961]!, self._r[1961]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1964]!, self._r[1964]!, [_1, _2]) } public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1962]!, self._r[1962]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1965]!, self._r[1965]!, [_1, _2]) } - public var Call_StatusRequesting: String { return self._s[1963]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[1964]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1965]! } + public var Call_StatusRequesting: String { return self._s[1966]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[1967]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1968]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1966]!, self._r[1966]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1969]!, self._r[1969]!, [_1, _2]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1967]!, self._r[1967]!, [_0]) + return formatWithArgumentRanges(self._s[1970]!, self._r[1970]!, [_0]) } - public var Update_Skip: String { return self._s[1968]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1969]! } - public var Message_PinnedPollMessage: String { return self._s[1970]! } - public var BlockedUsers_Title: String { return self._s[1971]! } + public var Update_Skip: String { return self._s[1971]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1972]! } + public var Message_PinnedPollMessage: String { return self._s[1973]! } + public var BlockedUsers_Title: String { return self._s[1974]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1972]!, self._r[1972]!, [_1]) + return formatWithArgumentRanges(self._s[1975]!, self._r[1975]!, [_1]) } - public var Username_CheckingUsername: String { return self._s[1973]! } - public var NotificationsSound_Bell: String { return self._s[1974]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[1975]! } - public var Weekday_Monday: String { return self._s[1976]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1977]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1978]! } - public var ChatSettings_Groups: String { return self._s[1979]! } + public var Username_CheckingUsername: String { return self._s[1976]! } + public var NotificationsSound_Bell: String { return self._s[1977]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[1978]! } + public var Weekday_Monday: String { return self._s[1979]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1980]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1981]! } + public var ChatSettings_Groups: String { return self._s[1982]! } public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1980]!, self._r[1980]!, [_0]) + return formatWithArgumentRanges(self._s[1983]!, self._r[1983]!, [_0]) } - public var Your_card_was_declined: String { return self._s[1981]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1983]! } - public var Wallet_Month_ShortApril: String { return self._s[1984]! } - public var ChatList_Unmute: String { return self._s[1985]! } - public var PhotoEditor_CurvesAll: String { return self._s[1986]! } - public var Weekday_ShortTuesday: String { return self._s[1987]! } - public var DialogList_Read: String { return self._s[1988]! } - public var Appearance_AppIconClassic: String { return self._s[1989]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1990]! } - public var Passport_Identity_Gender: String { return self._s[1991]! } + public var Your_card_was_declined: String { return self._s[1984]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1986]! } + public var Wallet_Month_ShortApril: String { return self._s[1987]! } + public var ChatList_Unmute: String { return self._s[1988]! } + public var PhotoEditor_CurvesAll: String { return self._s[1989]! } + public var Weekday_ShortTuesday: String { return self._s[1990]! } + public var DialogList_Read: String { return self._s[1991]! } + public var Appearance_AppIconClassic: String { return self._s[1992]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1993]! } + public var Passport_Identity_Gender: String { return self._s[1994]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1992]!, self._r[1992]!, [_0]) - } - public var Target_SelectGroup: String { return self._s[1993]! } - public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1995]!, self._r[1995]!, [_0]) } - public var Passport_Language_en: String { return self._s[1996]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1997]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1998]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[1999]! } - public var ScheduledMessages_SendNow: String { return self._s[2000]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[2002]! } - public var Login_InfoHelp: String { return self._s[2003]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2004]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2005]! } + public var Target_SelectGroup: String { return self._s[1996]! } + public var Map_HomeAndWorkInfo: String { return self._s[1998]! } + public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1999]!, self._r[1999]!, [_0]) + } + public var Passport_Language_en: String { return self._s[2000]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2001]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2002]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[2003]! } + public var ScheduledMessages_SendNow: String { return self._s[2004]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[2006]! } + public var Login_InfoHelp: String { return self._s[2007]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2008]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2009]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2006]!, self._r[2006]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2010]!, self._r[2010]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[2009]! } - public var CreatePoll_Title: String { return self._s[2010]! } - public var Conversation_ViewTheme: String { return self._s[2011]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2012]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2013]! } - public var TwoFactorSetup_Intro_Text: String { return self._s[2014]! } - public var UserInfo_GroupsInCommon: String { return self._s[2015]! } - public var TelegramWallet_Intro_TermsUrl: String { return self._s[2016]! } - public var Call_AudioRouteHide: String { return self._s[2017]! } + public var SocksProxySetup_AddProxy: String { return self._s[2013]! } + public var CreatePoll_Title: String { return self._s[2014]! } + public var Conversation_ViewTheme: String { return self._s[2015]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2016]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2017]! } + public var TwoFactorSetup_Intro_Text: String { return self._s[2018]! } + public var UserInfo_GroupsInCommon: String { return self._s[2019]! } + public var TelegramWallet_Intro_TermsUrl: String { return self._s[2020]! } + public var Call_AudioRouteHide: String { return self._s[2021]! } public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2019]!, self._r[2019]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2023]!, self._r[2023]!, [_1, _2]) } - public var ContactInfo_PhoneLabelMobile: String { return self._s[2020]! } - public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2021]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[2024]! } + public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2025]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2022]!, self._r[2022]!, [_0]) + return formatWithArgumentRanges(self._s[2026]!, self._r[2026]!, [_0]) } - public var TextFormat_Bold: String { return self._s[2023]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[2024]! } - public var Notifications_Title: String { return self._s[2025]! } - public var Group_Username_InvalidTooShort: String { return self._s[2026]! } - public var Channel_ErrorAddTooMuch: String { return self._s[2027]! } + public var TextFormat_Bold: String { return self._s[2027]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[2028]! } + public var Notifications_Title: String { return self._s[2029]! } + public var Group_Username_InvalidTooShort: String { return self._s[2030]! } + public var Channel_ErrorAddTooMuch: String { return self._s[2031]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2028]!, self._r[2028]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2032]!, self._r[2032]!, ["\(_0)"]) } - public var VoiceOver_DiscardPreparedContent: String { return self._s[2030]! } - public var Stickers_SuggestAdded: String { return self._s[2031]! } - public var Login_CountryCode: String { return self._s[2032]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[2033]! } - public var Map_GetDirections: String { return self._s[2034]! } - public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2035]! } - public var Login_PhoneFloodError: String { return self._s[2036]! } + public var VoiceOver_DiscardPreparedContent: String { return self._s[2034]! } + public var Stickers_SuggestAdded: String { return self._s[2035]! } + public var Login_CountryCode: String { return self._s[2036]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[2037]! } + public var Map_GetDirections: String { return self._s[2038]! } + public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2039]! } + public var Login_PhoneFloodError: String { return self._s[2040]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2037]!, self._r[2037]!, [_0]) + return formatWithArgumentRanges(self._s[2041]!, self._r[2041]!, [_0]) } public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2038]!, self._r[2038]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2042]!, self._r[2042]!, [_1, _2, _3]) } - public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2039]! } - public var Settings_SetUsername: String { return self._s[2041]! } - public var Group_Location_ChangeLocation: String { return self._s[2042]! } - public var Notification_GroupInviterSelf: String { return self._s[2043]! } - public var InstantPage_TapToOpenLink: String { return self._s[2044]! } + public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2043]! } + public var Settings_SetUsername: String { return self._s[2045]! } + public var Group_Location_ChangeLocation: String { return self._s[2046]! } + public var Notification_GroupInviterSelf: String { return self._s[2047]! } + public var InstantPage_TapToOpenLink: String { return self._s[2048]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2045]!, self._r[2045]!, [_0]) + return formatWithArgumentRanges(self._s[2049]!, self._r[2049]!, [_0]) } - public var Watch_Suggestion_TalkLater: String { return self._s[2046]! } - public var SecretChat_Title: String { return self._s[2047]! } - public var Group_UpgradeNoticeText1: String { return self._s[2048]! } - public var AuthSessions_Title: String { return self._s[2049]! } + public var Watch_Suggestion_TalkLater: String { return self._s[2050]! } + public var SecretChat_Title: String { return self._s[2051]! } + public var Group_UpgradeNoticeText1: String { return self._s[2052]! } + public var AuthSessions_Title: String { return self._s[2053]! } public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2050]!, self._r[2050]!, [_0]) + return formatWithArgumentRanges(self._s[2054]!, self._r[2054]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[2051]! } - public var Channel_About_Title: String { return self._s[2052]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[2053]! } + public var PhotoEditor_CropAuto: String { return self._s[2055]! } + public var Channel_About_Title: String { return self._s[2056]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[2057]! } public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2055]!, self._r[2055]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2059]!, self._r[2059]!, ["\(_0)"]) } - public var VoiceOver_MessageContextReport: String { return self._s[2056]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2058]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[2059]! } + public var VoiceOver_MessageContextReport: String { return self._s[2060]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2062]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[2063]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2060]!, self._r[2060]!, [_1]) + return formatWithArgumentRanges(self._s[2064]!, self._r[2064]!, [_1]) } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2062]!, self._r[2062]!, [_0]) + return formatWithArgumentRanges(self._s[2066]!, self._r[2066]!, [_0]) } public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2063]!, self._r[2063]!, [_0]) + return formatWithArgumentRanges(self._s[2067]!, self._r[2067]!, [_0]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[2064]! } - public var Presence_online: String { return self._s[2067]! } - public var PasscodeSettings_Title: String { return self._s[2068]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2069]! } - public var Web_OpenExternal: String { return self._s[2070]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[2072]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2073]! } - public var LocalGroup_Title: String { return self._s[2074]! } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[2068]! } + public var Presence_online: String { return self._s[2071]! } + public var PasscodeSettings_Title: String { return self._s[2072]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2073]! } + public var Web_OpenExternal: String { return self._s[2074]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[2076]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2077]! } + public var LocalGroup_Title: String { return self._s[2078]! } public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2075]!, self._r[2075]!, [_0]) - } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2076]! } - public var Map_YouAreHere: String { return self._s[2077]! } - public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2078]!, self._r[2078]!, [_0]) - } - public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2079]!, self._r[2079]!, [_0]) } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2080]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2081]! } - public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2080]! } + public var Map_YouAreHere: String { return self._s[2081]! } + public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2082]!, self._r[2082]!, [_0]) } - public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2083]!, self._r[2083]!, [_0]) } - public var SocksProxySetup_Username: String { return self._s[2084]! } - public var Bot_Start: String { return self._s[2085]! } - public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2084]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2085]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2086]!, self._r[2086]!, [_0]) } - public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2087]!, self._r[2087]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[2088]! } - public var AccentColor_Title: String { return self._s[2090]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2091]! } + public var SocksProxySetup_Username: String { return self._s[2088]! } + public var Bot_Start: String { return self._s[2089]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2090]!, self._r[2090]!, [_0]) + } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2091]!, self._r[2091]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[2092]! } + public var AccentColor_Title: String { return self._s[2094]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2095]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2092]!, self._r[2092]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2096]!, self._r[2096]!, [_1, _2]) } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2093]!, self._r[2093]!, [_0]) + return formatWithArgumentRanges(self._s[2097]!, self._r[2097]!, [_0]) } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2094]!, self._r[2094]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2098]!, self._r[2098]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[2095]! } - public var Login_InfoAvatarPhoto: String { return self._s[2096]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2097]! } - public var Tour_Title4: String { return self._s[2098]! } - public var Passport_Identity_Translation: String { return self._s[2099]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2100]! } - public var Login_TermsOfServiceLabel: String { return self._s[2102]! } - public var Passport_Language_it: String { return self._s[2103]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2104]! } - public var Passport_Identity_SelfieHelp: String { return self._s[2105]! } - public var Conversation_ClearAll: String { return self._s[2107]! } - public var Wallet_Send_UninitializedText: String { return self._s[2109]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[2110]! } - public var TwoStepAuth_FloodError: String { return self._s[2111]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[2099]! } + public var Login_InfoAvatarPhoto: String { return self._s[2100]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2101]! } + public var Tour_Title4: String { return self._s[2102]! } + public var Passport_Identity_Translation: String { return self._s[2103]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2104]! } + public var Login_TermsOfServiceLabel: String { return self._s[2106]! } + public var Passport_Language_it: String { return self._s[2107]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2108]! } + public var Passport_Identity_SelfieHelp: String { return self._s[2109]! } + public var Conversation_ClearAll: String { return self._s[2111]! } + public var Wallet_Send_UninitializedText: String { return self._s[2113]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[2114]! } + public var TwoStepAuth_FloodError: String { return self._s[2115]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2112]!, self._r[2112]!, [_1]) - } - public var Paint_Delete: String { return self._s[2113]! } - public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2114]!, self._r[2114]!, [_0]) - } - public var Privacy_AddNewPeer: String { return self._s[2115]! } - public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2116]!, self._r[2116]!, [_1]) } - public var LogoutOptions_SetPasscodeText: String { return self._s[2117]! } + public var Paint_Delete: String { return self._s[2117]! } + public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2118]!, self._r[2118]!, [_0]) + } + public var Privacy_AddNewPeer: String { return self._s[2119]! } + public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, [_1]) + } + public var LogoutOptions_SetPasscodeText: String { return self._s[2121]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2118]!, self._r[2118]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2122]!, self._r[2122]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[2119]! } + public var Message_PinnedAudioMessage: String { return self._s[2123]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, [_0]) + return formatWithArgumentRanges(self._s[2124]!, self._r[2124]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[2121]! } - public var Notifications_GroupNotificationsSound: String { return self._s[2122]! } - public var Wallet_Month_GenNovember: String { return self._s[2123]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[2124]! } - public var Conversation_MessageEditedLabel: String { return self._s[2125]! } + public var Notification_Mute1hMin: String { return self._s[2125]! } + public var Notifications_GroupNotificationsSound: String { return self._s[2126]! } + public var Wallet_Month_GenNovember: String { return self._s[2127]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[2128]! } + public var Conversation_MessageEditedLabel: String { return self._s[2129]! } public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2126]!, self._r[2126]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_0, _1]) } - public var Notification_Exceptions_AlwaysOff: String { return self._s[2127]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2128]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[2131]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2132]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2129]!, self._r[2129]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[2133]!, self._r[2133]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[2130]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[2134]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2131]!, self._r[2131]!, [_1]) + return formatWithArgumentRanges(self._s[2135]!, self._r[2135]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[2132]! } - public var Month_GenOctober: String { return self._s[2133]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2134]! } - public var EnterPasscode_EnterPasscode: String { return self._s[2135]! } - public var MediaPicker_TimerTooltip: String { return self._s[2137]! } - public var SharedMedia_TitleAll: String { return self._s[2138]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2141]! } - public var Conversation_RestrictedMedia: String { return self._s[2142]! } - public var AccessDenied_PhotosRestricted: String { return self._s[2143]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[2145]! } - public var ChangePhoneNumberCode_Called: String { return self._s[2146]! } + public var AccessDenied_LocationTracking: String { return self._s[2136]! } + public var Month_GenOctober: String { return self._s[2137]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2138]! } + public var EnterPasscode_EnterPasscode: String { return self._s[2139]! } + public var MediaPicker_TimerTooltip: String { return self._s[2141]! } + public var SharedMedia_TitleAll: String { return self._s[2142]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2145]! } + public var Conversation_RestrictedMedia: String { return self._s[2146]! } + public var AccessDenied_PhotosRestricted: String { return self._s[2147]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[2149]! } + public var ChangePhoneNumberCode_Called: String { return self._s[2150]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2147]!, self._r[2147]!, [_0]) + return formatWithArgumentRanges(self._s[2151]!, self._r[2151]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[2150]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[2152]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2153]! } + public var Conversation_SavedMessages: String { return self._s[2154]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[2156]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2157]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2155]!, self._r[2155]!, [_0]) + return formatWithArgumentRanges(self._s[2159]!, self._r[2159]!, [_0]) } - public var VoiceOver_Chat_YourMessage: String { return self._s[2156]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[2160]! } public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2157]!, self._r[2157]!, [_0]) + return formatWithArgumentRanges(self._s[2161]!, self._r[2161]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[2158]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2159]! } + public var ReportPeer_AlertSuccess: String { return self._s[2162]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2163]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2160]!, self._r[2160]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2164]!, self._r[2164]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[2161]! } - public var PhotoEditor_FadeTool: String { return self._s[2162]! } - public var Privacy_ContactsReset: String { return self._s[2163]! } + public var Checkout_PasswordEntry_Title: String { return self._s[2165]! } + public var PhotoEditor_FadeTool: String { return self._s[2166]! } + public var Privacy_ContactsReset: String { return self._s[2167]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2165]!, self._r[2165]!, [_0]) + return formatWithArgumentRanges(self._s[2169]!, self._r[2169]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[2166]! } - public var ChatList_Mute: String { return self._s[2167]! } + public var Message_PinnedVideoMessage: String { return self._s[2170]! } + public var ChatList_Mute: String { return self._s[2171]! } public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2168]!, self._r[2168]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2172]!, self._r[2172]!, [_1, _2, _3]) } - public var Permissions_CellularDataText_v0: String { return self._s[2169]! } - public var ShareMenu_SelectChats: String { return self._s[2172]! } - public var ChatList_Context_Unarchive: String { return self._s[2173]! } - public var MusicPlayer_VoiceNote: String { return self._s[2174]! } - public var Conversation_RestrictedText: String { return self._s[2175]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2176]! } - public var Wallet_Month_GenApril: String { return self._s[2177]! } - public var Wallet_Month_ShortMarch: String { return self._s[2178]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[2179]! } - public var Cache_Videos: String { return self._s[2180]! } - public var PrivacySettings_PhoneNumber: String { return self._s[2181]! } - public var Wallet_Month_GenFebruary: String { return self._s[2182]! } - public var FeatureDisabled_Oops: String { return self._s[2184]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[2185]! } + public var Permissions_CellularDataText_v0: String { return self._s[2173]! } + public var ShareMenu_SelectChats: String { return self._s[2176]! } + public var ChatList_Context_Unarchive: String { return self._s[2177]! } + public var MusicPlayer_VoiceNote: String { return self._s[2178]! } + public var Conversation_RestrictedText: String { return self._s[2179]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2180]! } + public var Wallet_Month_GenApril: String { return self._s[2181]! } + public var Wallet_Month_ShortMarch: String { return self._s[2182]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[2183]! } + public var Cache_Videos: String { return self._s[2184]! } + public var PrivacySettings_PhoneNumber: String { return self._s[2185]! } + public var Wallet_Month_GenFebruary: String { return self._s[2186]! } + public var FeatureDisabled_Oops: String { return self._s[2188]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[2189]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2186]!, self._r[2186]!, [_0]) + return formatWithArgumentRanges(self._s[2190]!, self._r[2190]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[2187]! } - public var GroupPermission_NoSendPolls: String { return self._s[2188]! } - public var Wallet_Qr_ScanCode: String { return self._s[2189]! } - public var Message_VideoExpired: String { return self._s[2191]! } - public var Notifications_Badge: String { return self._s[2192]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[2193]! } - public var Wallet_Receive_AddressCopied: String { return self._s[2194]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[2195]! } - public var Username_InvalidTooShort: String { return self._s[2196]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2197]! } - public var Channel_AdminLog_PinMessages: String { return self._s[2198]! } - public var ArchivedChats_IntroTitle3: String { return self._s[2199]! } + public var Stickers_GroupStickersHelp: String { return self._s[2191]! } + public var GroupPermission_NoSendPolls: String { return self._s[2192]! } + public var Wallet_Qr_ScanCode: String { return self._s[2193]! } + public var Message_VideoExpired: String { return self._s[2195]! } + public var Notifications_Badge: String { return self._s[2196]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[2197]! } + public var Wallet_Receive_AddressCopied: String { return self._s[2198]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[2199]! } + public var Username_InvalidTooShort: String { return self._s[2200]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2201]! } + public var Channel_AdminLog_PinMessages: String { return self._s[2202]! } + public var ArchivedChats_IntroTitle3: String { return self._s[2203]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2200]!, self._r[2200]!, [_1]) + return formatWithArgumentRanges(self._s[2204]!, self._r[2204]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[2201]! } - public var Conversation_DefaultRestrictedText: String { return self._s[2202]! } - public var SharedMedia_CategoryDocs: String { return self._s[2205]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[2205]! } + public var Conversation_DefaultRestrictedText: String { return self._s[2206]! } + public var SharedMedia_CategoryDocs: String { return self._s[2209]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2206]!, self._r[2206]!, [_1]) - } - public var Wallet_Send_UninitializedTitle: String { return self._s[2207]! } - public var Privacy_Forwards_NeverLink: String { return self._s[2209]! } - public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2210]!, self._r[2210]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2211]! } + public var Wallet_Send_UninitializedTitle: String { return self._s[2211]! } + public var Privacy_Forwards_NeverLink: String { return self._s[2213]! } + public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2214]!, self._r[2214]!, [_1]) + } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2215]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2212]!, self._r[2212]!, [_0]) + return formatWithArgumentRanges(self._s[2216]!, self._r[2216]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[2213]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2214]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[2215]! } - public var Channel_UpdatePhotoItem: String { return self._s[2216]! } - public var GroupInfo_LeftStatus: String { return self._s[2217]! } - public var Watch_MessageView_Forward: String { return self._s[2219]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[2220]! } - public var Cache_ClearEmpty: String { return self._s[2222]! } - public var Localization_LanguageName: String { return self._s[2223]! } - public var Wallet_AccessDenied_Title: String { return self._s[2224]! } - public var WebSearch_GIFs: String { return self._s[2225]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2226]! } - public var Wallet_AccessDenied_Settings: String { return self._s[2227]! } - public var Username_InvalidStartsWithNumber: String { return self._s[2228]! } - public var Common_Back: String { return self._s[2229]! } - public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2230]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2231]! } - public var Wallet_Send_Send: String { return self._s[2232]! } + public var ChatSettings_PrivateChats: String { return self._s[2217]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2218]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[2219]! } + public var Channel_UpdatePhotoItem: String { return self._s[2220]! } + public var GroupInfo_LeftStatus: String { return self._s[2221]! } + public var Watch_MessageView_Forward: String { return self._s[2223]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[2224]! } + public var Cache_ClearEmpty: String { return self._s[2226]! } + public var Localization_LanguageName: String { return self._s[2227]! } + public var Wallet_AccessDenied_Title: String { return self._s[2228]! } + public var WebSearch_GIFs: String { return self._s[2229]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2230]! } + public var Wallet_AccessDenied_Settings: String { return self._s[2231]! } + public var Username_InvalidStartsWithNumber: String { return self._s[2232]! } + public var Common_Back: String { return self._s[2233]! } + public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2234]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2235]! } + public var Wallet_Send_Send: String { return self._s[2236]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2233]!, self._r[2233]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2237]!, self._r[2237]!, [_1, _2]) } - public var Wallet_Info_RefreshErrorTitle: String { return self._s[2234]! } - public var Wallet_Month_GenJune: String { return self._s[2235]! } - public var Passport_Email_Help: String { return self._s[2236]! } - public var Watch_Conversation_Reply: String { return self._s[2238]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[2241]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2242]! } - public var Channel_BanUser_Unban: String { return self._s[2244]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2245]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2246]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2248]! } - public var Wallet_Send_AddressHeader: String { return self._s[2249]! } - public var Passport_Identity_Name: String { return self._s[2250]! } + public var Wallet_Info_RefreshErrorTitle: String { return self._s[2238]! } + public var Wallet_Month_GenJune: String { return self._s[2239]! } + public var Passport_Email_Help: String { return self._s[2240]! } + public var Watch_Conversation_Reply: String { return self._s[2242]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[2245]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2246]! } + public var Channel_BanUser_Unban: String { return self._s[2248]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2249]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2250]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2252]! } + public var Wallet_Send_AddressHeader: String { return self._s[2253]! } + public var Passport_Identity_Name: String { return self._s[2254]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2251]!, self._r[2251]!, [_0]) + return formatWithArgumentRanges(self._s[2255]!, self._r[2255]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[2252]! } - public var Conversation_BlockUser: String { return self._s[2253]! } - public var Month_GenJanuary: String { return self._s[2254]! } - public var ChatSettings_TextSize: String { return self._s[2255]! } - public var Notification_PassportValuePhone: String { return self._s[2256]! } - public var Passport_Language_ne: String { return self._s[2257]! } - public var Notification_CallBack: String { return self._s[2258]! } - public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2259]! } - public var TwoStepAuth_EmailHelp: String { return self._s[2260]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[2256]! } + public var Conversation_BlockUser: String { return self._s[2257]! } + public var Month_GenJanuary: String { return self._s[2258]! } + public var ChatSettings_TextSize: String { return self._s[2259]! } + public var Notification_PassportValuePhone: String { return self._s[2260]! } + public var Passport_Language_ne: String { return self._s[2261]! } + public var Notification_CallBack: String { return self._s[2262]! } + public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2263]! } + public var TwoStepAuth_EmailHelp: String { return self._s[2264]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2261]!, self._r[2261]!, [_0]) + return formatWithArgumentRanges(self._s[2265]!, self._r[2265]!, [_0]) } - public var Channel_Info_Management: String { return self._s[2262]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[2263]! } - public var Stickers_FrequentlyUsed: String { return self._s[2264]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2265]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2267]! } + public var Channel_Info_Management: String { return self._s[2266]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[2267]! } + public var Stickers_FrequentlyUsed: String { return self._s[2268]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2269]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2271]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2268]!, self._r[2268]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2272]!, self._r[2272]!, [_1, "\(_2)"]) } - public var TwoFactorSetup_Password_Title: String { return self._s[2269]! } - public var Passport_Address_EditResidentialAddress: String { return self._s[2270]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[2271]! } - public var CreatePoll_TextHeader: String { return self._s[2272]! } + public var TwoFactorSetup_Password_Title: String { return self._s[2273]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[2274]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[2275]! } + public var CreatePoll_TextHeader: String { return self._s[2276]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2273]!, self._r[2273]!, [_0]) + return formatWithArgumentRanges(self._s[2277]!, self._r[2277]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[2274]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2275]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[2277]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[2278]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[2279]! } + public var PhotoEditor_QualityMedium: String { return self._s[2278]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2279]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[2281]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[2282]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[2283]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2280]!, self._r[2280]!, [_0]) + return formatWithArgumentRanges(self._s[2284]!, self._r[2284]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2281]!, self._r[2281]!, [_1]) + return formatWithArgumentRanges(self._s[2285]!, self._r[2285]!, [_1]) } - public var LogoutOptions_LogOutWalletInfo: String { return self._s[2282]! } - public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2283]! } - public var Conversation_LinkDialogOpen: String { return self._s[2285]! } - public var TwoFactorSetup_Hint_Title: String { return self._s[2286]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[2287]! } - public var Settings_Username: String { return self._s[2289]! } - public var Conversation_Block: String { return self._s[2291]! } - public var Wallpaper_Wallpaper: String { return self._s[2292]! } - public var SocksProxySetup_UseProxy: String { return self._s[2294]! } - public var Wallet_Send_Confirmation: String { return self._s[2295]! } - public var EditTheme_UploadEditedTheme: String { return self._s[2296]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[2297]! } - public var MessageTimer_Forever: String { return self._s[2298]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[2299]! } - public var PhotoEditor_DiscardChanges: String { return self._s[2300]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2301]! } - public var Passport_Language_da: String { return self._s[2302]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[2303]! } + public var LogoutOptions_LogOutWalletInfo: String { return self._s[2286]! } + public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2287]! } + public var Conversation_LinkDialogOpen: String { return self._s[2289]! } + public var TwoFactorSetup_Hint_Title: String { return self._s[2290]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[2291]! } + public var Settings_Username: String { return self._s[2293]! } + public var Conversation_Block: String { return self._s[2295]! } + public var Wallpaper_Wallpaper: String { return self._s[2296]! } + public var SocksProxySetup_UseProxy: String { return self._s[2298]! } + public var Wallet_Send_Confirmation: String { return self._s[2299]! } + public var EditTheme_UploadEditedTheme: String { return self._s[2300]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[2301]! } + public var MessageTimer_Forever: String { return self._s[2302]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[2303]! } + public var PhotoEditor_DiscardChanges: String { return self._s[2304]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2305]! } + public var Passport_Language_da: String { return self._s[2306]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[2307]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2304]!, self._r[2304]!, [_0]) + return formatWithArgumentRanges(self._s[2308]!, self._r[2308]!, [_0]) } - public var Passport_Address_EditPassportRegistration: String { return self._s[2305]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[2309]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2307]!, self._r[2307]!, [_0]) + return formatWithArgumentRanges(self._s[2311]!, self._r[2311]!, [_0]) } - public var Settings_AddDevice: String { return self._s[2308]! } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2310]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2311]! } - public var Conversation_PinnedPoll: String { return self._s[2312]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2313]! } + public var Settings_AddDevice: String { return self._s[2312]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2314]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2315]! } + public var Conversation_PinnedPoll: String { return self._s[2316]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2317]! } public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2314]!, self._r[2314]!, [_1]) + return formatWithArgumentRanges(self._s[2318]!, self._r[2318]!, [_1]) } - public var WallpaperSearch_ColorPurple: String { return self._s[2315]! } - public var Cache_ByPeerHeader: String { return self._s[2316]! } + public var WallpaperSearch_ColorPurple: String { return self._s[2319]! } + public var Cache_ByPeerHeader: String { return self._s[2320]! } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2317]!, self._r[2317]!, [_0]) + return formatWithArgumentRanges(self._s[2321]!, self._r[2321]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[2318]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2321]! } - public var Wallet_Completed_Title: String { return self._s[2322]! } - public var Notification_PinnedMessage: String { return self._s[2323]! } - public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2324]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2326]! } - public var Contacts_SortBy: String { return self._s[2327]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2322]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2325]! } + public var Wallet_Completed_Title: String { return self._s[2326]! } + public var Notification_PinnedMessage: String { return self._s[2327]! } + public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2328]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2330]! } + public var Contacts_SortBy: String { return self._s[2331]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2328]!, self._r[2328]!, [_1]) + return formatWithArgumentRanges(self._s[2332]!, self._r[2332]!, [_1]) } - public var Appearance_ColorThemeNight: String { return self._s[2330]! } + public var Appearance_ColorThemeNight: String { return self._s[2334]! } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2331]!, self._r[2331]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2335]!, self._r[2335]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[2332]! } - public var Watch_UserInfo_Service: String { return self._s[2333]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2335]! } - public var Conversation_Unpin: String { return self._s[2337]! } - public var CancelResetAccount_Title: String { return self._s[2338]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2339]! } + public var Call_EncryptionKey_Title: String { return self._s[2336]! } + public var Watch_UserInfo_Service: String { return self._s[2337]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2339]! } + public var Conversation_Unpin: String { return self._s[2341]! } + public var CancelResetAccount_Title: String { return self._s[2342]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2343]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2341]!, self._r[2341]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2345]!, self._r[2345]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2342]! } - public var CallSettings_Title: String { return self._s[2343]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2344]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2346]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2347]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2346]! } + public var CallSettings_Title: String { return self._s[2347]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2348]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2350]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2351]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2348]!, self._r[2348]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2352]!, self._r[2352]!, [_1, _2]) } - public var Passport_Identity_DocumentDetails: String { return self._s[2349]! } - public var LoginPassword_PasswordHelp: String { return self._s[2350]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2351]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2352]! } - public var Checkout_TotalPaidAmount: String { return self._s[2353]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2353]! } + public var LoginPassword_PasswordHelp: String { return self._s[2354]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2355]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2356]! } + public var Checkout_TotalPaidAmount: String { return self._s[2357]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2354]!, self._r[2354]!, [_0]) + return formatWithArgumentRanges(self._s[2358]!, self._r[2358]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[2355]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2357]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2358]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2359]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2361]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2362]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2359]!, self._r[2359]!, [_1]) + return formatWithArgumentRanges(self._s[2363]!, self._r[2363]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2360]! } - public var Contacts_InviteFriends: String { return self._s[2362]! } - public var Map_ChooseLocationTitle: String { return self._s[2363]! } - public var Conversation_StopPoll: String { return self._s[2365]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2364]! } + public var Contacts_InviteFriends: String { return self._s[2366]! } + public var Map_ChooseLocationTitle: String { return self._s[2367]! } + public var Conversation_StopPoll: String { return self._s[2369]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2366]!, self._r[2366]!, [_0]) + return formatWithArgumentRanges(self._s[2370]!, self._r[2370]!, [_0]) } - public var Call_Camera: String { return self._s[2367]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2368]! } - public var AppWallet_Intro_Text: String { return self._s[2369]! } - public var Calls_RatingFeedback: String { return self._s[2370]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2371]! } - public var Wallet_Alert_OK: String { return self._s[2372]! } - public var NotificationsSound_Pulse: String { return self._s[2373]! } - public var Watch_LastSeen_Lately: String { return self._s[2374]! } - public var ReportGroupLocation_Report: String { return self._s[2377]! } - public var Widget_NoUsers: String { return self._s[2378]! } - public var Conversation_UnvotePoll: String { return self._s[2379]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2381]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2382]! } - public var NotificationsSound_Circles: String { return self._s[2383]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2386]! } - public var Wallet_Settings_DeleteWallet: String { return self._s[2387]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2388]! } - public var Proxy_TooltipUnavailable: String { return self._s[2389]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2391]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2393]! } - public var Conversation_FileDropbox: String { return self._s[2394]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2395]! } - public var Tour_Text3: String { return self._s[2397]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2399]! } - public var GroupPermission_NoSendMessages: String { return self._s[2400]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2401]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2402]! } + public var Call_Camera: String { return self._s[2371]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2372]! } + public var AppWallet_Intro_Text: String { return self._s[2373]! } + public var Calls_RatingFeedback: String { return self._s[2374]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2375]! } + public var Wallet_Alert_OK: String { return self._s[2376]! } + public var NotificationsSound_Pulse: String { return self._s[2377]! } + public var Watch_LastSeen_Lately: String { return self._s[2378]! } + public var ReportGroupLocation_Report: String { return self._s[2381]! } + public var Widget_NoUsers: String { return self._s[2382]! } + public var Conversation_UnvotePoll: String { return self._s[2383]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2385]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2386]! } + public var NotificationsSound_Circles: String { return self._s[2387]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2390]! } + public var Wallet_Settings_DeleteWallet: String { return self._s[2391]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2392]! } + public var Proxy_TooltipUnavailable: String { return self._s[2393]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2395]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2397]! } + public var Conversation_FileDropbox: String { return self._s[2398]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2399]! } + public var Tour_Text3: String { return self._s[2401]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2403]! } + public var GroupPermission_NoSendMessages: String { return self._s[2404]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2405]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2406]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2404]!, self._r[2404]!, [_0]) - } - public var GroupInfo_AddParticipantTitle: String { return self._s[2405]! } - public var Checkout_ShippingOption_Title: String { return self._s[2406]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2407]! } - public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2408]!, self._r[2408]!, [_0]) } + public var GroupInfo_AddParticipantTitle: String { return self._s[2409]! } + public var Checkout_ShippingOption_Title: String { return self._s[2410]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2411]! } + public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2412]!, self._r[2412]!, [_0]) + } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2409]!, self._r[2409]!, [_0]) + return formatWithArgumentRanges(self._s[2413]!, self._r[2413]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2410]! } - public var EditTheme_FileReadError: String { return self._s[2411]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2412]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2413]! } - public var AutoDownloadSettings_Photos: String { return self._s[2415]! } - public var Appearance_PreviewIncomingText: String { return self._s[2416]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[2417]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2418]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2419]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2420]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2421]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2422]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2423]! } - public var Notification_SecretChatScreenshot: String { return self._s[2424]! } - public var AccessDenied_Wallpapers: String { return self._s[2425]! } - public var ChatList_Context_Mute: String { return self._s[2427]! } - public var Passport_Address_City: String { return self._s[2428]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2429]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2430]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2431]! } - public var AccessDenied_LocationDisabled: String { return self._s[2432]! } - public var Group_Location_Title: String { return self._s[2433]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2435]! } - public var GroupInfo_Sound: String { return self._s[2436]! } - public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2437]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2438]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2439]! } - public var Contacts_Title: String { return self._s[2440]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[2441]! } - public var Passport_Language_fr: String { return self._s[2442]! } - public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2443]! } - public var Notifications_ResetAllNotifications: String { return self._s[2444]! } - public var IntentsSettings_SuggestedChats: String { return self._s[2446]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2448]! } - public var Checkout_NewCard_Title: String { return self._s[2449]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2450]! } - public var Conversation_ForwardChats: String { return self._s[2451]! } - public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2453]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2454]! } - public var Settings_FAQ: String { return self._s[2456]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2457]! } - public var Conversation_ContextMenuForward: String { return self._s[2458]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2461]! } - public var PrivacyPolicy_Title: String { return self._s[2464]! } - public var Notifications_TextTone: String { return self._s[2465]! } - public var Profile_CreateNewContact: String { return self._s[2466]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2467]! } - public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2469]! } - public var Call_Speaker: String { return self._s[2470]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2471]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2473]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2474]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2414]! } + public var EditTheme_FileReadError: String { return self._s[2415]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2416]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2417]! } + public var AutoDownloadSettings_Photos: String { return self._s[2419]! } + public var Appearance_PreviewIncomingText: String { return self._s[2420]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[2421]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2422]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2423]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2424]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2425]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2426]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2427]! } + public var Notification_SecretChatScreenshot: String { return self._s[2428]! } + public var AccessDenied_Wallpapers: String { return self._s[2429]! } + public var ChatList_Context_Mute: String { return self._s[2431]! } + public var Passport_Address_City: String { return self._s[2432]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2433]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2434]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2435]! } + public var AccessDenied_LocationDisabled: String { return self._s[2436]! } + public var Group_Location_Title: String { return self._s[2437]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2439]! } + public var GroupInfo_Sound: String { return self._s[2440]! } + public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2441]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2442]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2443]! } + public var Contacts_Title: String { return self._s[2444]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2445]! } + public var Passport_Language_fr: String { return self._s[2446]! } + public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2447]! } + public var Notifications_ResetAllNotifications: String { return self._s[2448]! } + public var IntentsSettings_SuggestedChats: String { return self._s[2450]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2452]! } + public var Checkout_NewCard_Title: String { return self._s[2453]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2454]! } + public var Conversation_ForwardChats: String { return self._s[2455]! } + public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2457]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2458]! } + public var Settings_FAQ: String { return self._s[2460]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2461]! } + public var Conversation_ContextMenuForward: String { return self._s[2462]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2465]! } + public var PrivacyPolicy_Title: String { return self._s[2468]! } + public var Notifications_TextTone: String { return self._s[2469]! } + public var Profile_CreateNewContact: String { return self._s[2470]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2471]! } + public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2473]! } + public var Call_Speaker: String { return self._s[2474]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2475]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2477]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2478]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2475]!, self._r[2475]!, [_0]) + return formatWithArgumentRanges(self._s[2479]!, self._r[2479]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2476]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2477]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2478]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2479]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2480]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2481]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2482]! } - public var Bot_Unblock: String { return self._s[2483]! } - public var TextFormat_Italic: String { return self._s[2484]! } - public var WallpaperSearch_ColorPink: String { return self._s[2485]! } - public var Settings_About_Help: String { return self._s[2486]! } - public var SearchImages_Title: String { return self._s[2487]! } - public var Weekday_Wednesday: String { return self._s[2488]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2489]! } - public var ExplicitContent_AlertTitle: String { return self._s[2490]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2480]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2481]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2482]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2483]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2484]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2485]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2486]! } + public var Bot_Unblock: String { return self._s[2487]! } + public var TextFormat_Italic: String { return self._s[2488]! } + public var WallpaperSearch_ColorPink: String { return self._s[2489]! } + public var Settings_About_Help: String { return self._s[2490]! } + public var SearchImages_Title: String { return self._s[2491]! } + public var Weekday_Wednesday: String { return self._s[2492]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2493]! } + public var ExplicitContent_AlertTitle: String { return self._s[2494]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2491]!, self._r[2491]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2495]!, self._r[2495]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2492]! } - public var Weekday_Thursday: String { return self._s[2493]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2494]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2495]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2496]! } + public var Weekday_Thursday: String { return self._s[2497]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2498]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2499]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2496]!, self._r[2496]!, [_0]) + return formatWithArgumentRanges(self._s[2500]!, self._r[2500]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2497]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2498]! } - public var Passport_RequestedInformation: String { return self._s[2499]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2500]! } - public var Conversation_EncryptionProcessing: String { return self._s[2502]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2503]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2505]! } - public var Channel_Setup_Title: String { return self._s[2506]! } - public var Conversation_SearchPlaceholder: String { return self._s[2507]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2508]! } - public var Checkout_ErrorGeneric: String { return self._s[2509]! } - public var Passport_Language_hu: String { return self._s[2510]! } - public var GroupPermission_EditingDisabled: String { return self._s[2511]! } - public var Wallet_Month_ShortSeptember: String { return self._s[2513]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2501]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2502]! } + public var Passport_RequestedInformation: String { return self._s[2503]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2504]! } + public var Conversation_EncryptionProcessing: String { return self._s[2506]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2507]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2509]! } + public var Channel_Setup_Title: String { return self._s[2510]! } + public var Conversation_SearchPlaceholder: String { return self._s[2511]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2512]! } + public var Checkout_ErrorGeneric: String { return self._s[2513]! } + public var Passport_Language_hu: String { return self._s[2514]! } + public var GroupPermission_EditingDisabled: String { return self._s[2515]! } + public var Wallet_Month_ShortSeptember: String { return self._s[2517]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2514]!, self._r[2514]!, [_0]) + return formatWithArgumentRanges(self._s[2518]!, self._r[2518]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2517]!, self._r[2517]!, [_1]) + return formatWithArgumentRanges(self._s[2521]!, self._r[2521]!, [_1]) } - public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2518]! } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2522]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2519]!, self._r[2519]!, [_0]) + return formatWithArgumentRanges(self._s[2523]!, self._r[2523]!, [_0]) } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2520]! } - public var Group_Location_Info: String { return self._s[2521]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2522]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2523]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2524]! } + public var Group_Location_Info: String { return self._s[2525]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2526]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2527]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2524]!, self._r[2524]!, [_0]) + return formatWithArgumentRanges(self._s[2528]!, self._r[2528]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2525]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2526]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2527]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2528]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2529]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2530]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2531]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2532]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2529]!, self._r[2529]!, [_0]) + return formatWithArgumentRanges(self._s[2533]!, self._r[2533]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2530]! } - public var Message_PinnedAnimationMessage: String { return self._s[2532]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2534]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2535]! } - public var Wallet_Info_TransactionTo: String { return self._s[2537]! } - public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2538]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2539]! } - public var Embed_PlayingInPIP: String { return self._s[2540]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2541]! } + public var Passport_Language_cs: String { return self._s[2534]! } + public var Message_PinnedAnimationMessage: String { return self._s[2536]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2538]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2539]! } + public var Wallet_Info_TransactionTo: String { return self._s[2541]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2542]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2543]! } + public var Embed_PlayingInPIP: String { return self._s[2544]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2545]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2542]!, self._r[2542]!, [_0]) + return formatWithArgumentRanges(self._s[2546]!, self._r[2546]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2543]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2547]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2544]!, self._r[2544]!, [_1]) + return formatWithArgumentRanges(self._s[2548]!, self._r[2548]!, [_1]) } - public var Notification_PaymentSent: String { return self._s[2545]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2546]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2547]! } - public var AutoNightTheme_System: String { return self._s[2548]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2549]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2550]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2551]! } + public var Notification_PaymentSent: String { return self._s[2549]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2550]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2551]! } + public var AutoNightTheme_System: String { return self._s[2552]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2553]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2554]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2555]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2554]!, self._r[2554]!, [_1]) + return formatWithArgumentRanges(self._s[2558]!, self._r[2558]!, [_1]) } public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2555]!, self._r[2555]!, [_1]) + return formatWithArgumentRanges(self._s[2559]!, self._r[2559]!, [_1]) } public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2556]!, self._r[2556]!, [_1]) + return formatWithArgumentRanges(self._s[2560]!, self._r[2560]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2558]! } - public var PasscodeSettings_HelpTop: String { return self._s[2559]! } - public var Conversation_WalletRequiredTitle: String { return self._s[2560]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2561]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2562]! } - public var EditTheme_ShortLink: String { return self._s[2563]! } - public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2564]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2565]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2566]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2567]! } - public var Call_Accept: String { return self._s[2569]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2570]! } - public var Month_GenMarch: String { return self._s[2572]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2573]! } - public var LoginPassword_Title: String { return self._s[2574]! } - public var Call_End: String { return self._s[2575]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2576]! } - public var VoiceOver_Chat_Contact: String { return self._s[2577]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2578]! } - public var CallSettings_Always: String { return self._s[2579]! } - public var CallFeedback_Success: String { return self._s[2580]! } - public var TwoStepAuth_SetupHint: String { return self._s[2581]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2562]! } + public var PasscodeSettings_HelpTop: String { return self._s[2563]! } + public var Conversation_WalletRequiredTitle: String { return self._s[2564]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2565]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2566]! } + public var EditTheme_ShortLink: String { return self._s[2567]! } + public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2568]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2569]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2570]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2571]! } + public var Call_Accept: String { return self._s[2573]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2574]! } + public var Month_GenMarch: String { return self._s[2576]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2577]! } + public var LoginPassword_Title: String { return self._s[2578]! } + public var Call_End: String { return self._s[2579]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2580]! } + public var VoiceOver_Chat_Contact: String { return self._s[2581]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2582]! } + public var CallSettings_Always: String { return self._s[2583]! } + public var CallFeedback_Success: String { return self._s[2584]! } + public var TwoStepAuth_SetupHint: String { return self._s[2585]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2582]!, self._r[2582]!, [_1]) + return formatWithArgumentRanges(self._s[2586]!, self._r[2586]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2583]! } - public var Login_PhoneTitle: String { return self._s[2584]! } - public var Passport_FieldPhoneHelp: String { return self._s[2585]! } - public var Weekday_ShortSunday: String { return self._s[2586]! } - public var Passport_InfoFAQ_URL: String { return self._s[2587]! } - public var ContactInfo_Job: String { return self._s[2589]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2590]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2591]! } - public var TwoFactorSetup_Email_Text: String { return self._s[2592]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2593]! } - public var Invite_ChannelsTooMuch: String { return self._s[2594]! } - public var Wallet_Send_ConfirmationConfirm: String { return self._s[2595]! } - public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2596]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2597]! } - public var Wallet_Receive_AmountText: String { return self._s[2598]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2599]! } - public var CallFeedback_ReasonNoise: String { return self._s[2600]! } - public var Appearance_AppIconDefault: String { return self._s[2602]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2603]! } - public var MediaPicker_AddCaption: String { return self._s[2604]! } - public var CallSettings_TabIconDescription: String { return self._s[2605]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2587]! } + public var Login_PhoneTitle: String { return self._s[2588]! } + public var Passport_FieldPhoneHelp: String { return self._s[2589]! } + public var Weekday_ShortSunday: String { return self._s[2590]! } + public var Passport_InfoFAQ_URL: String { return self._s[2591]! } + public var ContactInfo_Job: String { return self._s[2593]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2594]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2595]! } + public var TwoFactorSetup_Email_Text: String { return self._s[2596]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2597]! } + public var Invite_ChannelsTooMuch: String { return self._s[2598]! } + public var Wallet_Send_ConfirmationConfirm: String { return self._s[2599]! } + public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2600]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2601]! } + public var Wallet_Receive_AmountText: String { return self._s[2602]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2603]! } + public var CallFeedback_ReasonNoise: String { return self._s[2604]! } + public var Appearance_AppIconDefault: String { return self._s[2606]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2607]! } + public var MediaPicker_AddCaption: String { return self._s[2608]! } + public var CallSettings_TabIconDescription: String { return self._s[2609]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2606]!, self._r[2606]!, [_0]) + return formatWithArgumentRanges(self._s[2610]!, self._r[2610]!, [_0]) } - public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2607]! } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2608]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2609]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2610]! } - public var DialogList_SearchSectionRecent: String { return self._s[2611]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2612]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2615]! } - public var LastSeen_WithinAWeek: String { return self._s[2616]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2617]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2619]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2620]! } + public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2611]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2612]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2613]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2614]! } + public var DialogList_SearchSectionRecent: String { return self._s[2615]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2616]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2619]! } + public var LastSeen_WithinAWeek: String { return self._s[2620]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2621]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2623]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2624]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2621]!, self._r[2621]!, [_0]) + return formatWithArgumentRanges(self._s[2625]!, self._r[2625]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2622]! } - public var Conversation_StatusLeftGroup: String { return self._s[2623]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2624]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2626]! } - public var GroupPermission_AddSuccess: String { return self._s[2627]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2629]! } - public var Conversation_ContextMenuCopy: String { return self._s[2630]! } - public var AccessDenied_CallMicrophone: String { return self._s[2631]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2626]! } + public var Conversation_StatusLeftGroup: String { return self._s[2627]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2628]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2630]! } + public var GroupPermission_AddSuccess: String { return self._s[2631]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2633]! } + public var Conversation_ContextMenuCopy: String { return self._s[2634]! } + public var AccessDenied_CallMicrophone: String { return self._s[2635]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2636]!, self._r[2636]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2633]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2634]! } - public var Checkout_PaymentMethod_New: String { return self._s[2635]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2636]! } - public var PhotoEditor_QualityTool: String { return self._s[2637]! } - public var Login_SendCodeViaSms: String { return self._s[2638]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2639]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2640]! } - public var Wallet_Receive_CopyAddress: String { return self._s[2641]! } - public var Login_EmailNotConfiguredError: String { return self._s[2642]! } - public var SocksProxySetup_Status: String { return self._s[2643]! } - public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2644]! } - public var PrivacyPolicy_Accept: String { return self._s[2645]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2646]! } - public var Appearance_AppIconClassicX: String { return self._s[2647]! } + public var Login_InvalidFirstNameError: String { return self._s[2637]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2638]! } + public var Checkout_PaymentMethod_New: String { return self._s[2639]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2640]! } + public var PhotoEditor_QualityTool: String { return self._s[2641]! } + public var Login_SendCodeViaSms: String { return self._s[2642]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2643]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2644]! } + public var Wallet_Receive_CopyAddress: String { return self._s[2645]! } + public var Login_EmailNotConfiguredError: String { return self._s[2646]! } + public var SocksProxySetup_Status: String { return self._s[2647]! } + public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2648]! } + public var PrivacyPolicy_Accept: String { return self._s[2649]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2650]! } + public var Appearance_AppIconClassicX: String { return self._s[2651]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2648]!, self._r[2648]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2652]!, self._r[2652]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2649]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2651]! } - public var AutoNightTheme_Automatic: String { return self._s[2652]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2653]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2654]! } - public var Cache_Help: String { return self._s[2655]! } - public var Group_ErrorAccessDenied: String { return self._s[2656]! } - public var Passport_Language_fa: String { return self._s[2657]! } - public var Wallet_Intro_Text: String { return self._s[2658]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2659]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2660]! } - public var PrivacySettings_LastSeen: String { return self._s[2661]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2653]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2655]! } + public var AutoNightTheme_Automatic: String { return self._s[2656]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2657]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2658]! } + public var Cache_Help: String { return self._s[2659]! } + public var Group_ErrorAccessDenied: String { return self._s[2660]! } + public var Passport_Language_fa: String { return self._s[2661]! } + public var Wallet_Intro_Text: String { return self._s[2662]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2663]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2664]! } + public var PrivacySettings_LastSeen: String { return self._s[2665]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2662]!, self._r[2662]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2666]!, self._r[2666]!, [_0, _1]) } - public var Wallet_Configuration_Apply: String { return self._s[2666]! } - public var Preview_SaveGif: String { return self._s[2667]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2668]! } - public var Profile_About: String { return self._s[2669]! } - public var Channel_About_Placeholder: String { return self._s[2670]! } - public var Login_InfoTitle: String { return self._s[2671]! } + public var Wallet_Configuration_Apply: String { return self._s[2670]! } + public var Preview_SaveGif: String { return self._s[2671]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2672]! } + public var Profile_About: String { return self._s[2673]! } + public var Channel_About_Placeholder: String { return self._s[2674]! } + public var Login_InfoTitle: String { return self._s[2675]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2672]!, self._r[2672]!, [_0]) + return formatWithArgumentRanges(self._s[2676]!, self._r[2676]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2673]! } - public var Watch_Suggestion_CantTalk: String { return self._s[2675]! } - public var ContactInfo_Title: String { return self._s[2676]! } - public var Media_ShareThisVideo: String { return self._s[2677]! } - public var Weekday_ShortFriday: String { return self._s[2678]! } - public var AccessDenied_Contacts: String { return self._s[2680]! } - public var Notification_CallIncomingShort: String { return self._s[2681]! } - public var Group_Setup_TypePublic: String { return self._s[2682]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2683]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2684]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2687]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2688]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2689]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2690]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2691]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2677]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2679]! } + public var ContactInfo_Title: String { return self._s[2680]! } + public var Media_ShareThisVideo: String { return self._s[2681]! } + public var Weekday_ShortFriday: String { return self._s[2682]! } + public var AccessDenied_Contacts: String { return self._s[2684]! } + public var Notification_CallIncomingShort: String { return self._s[2685]! } + public var Group_Setup_TypePublic: String { return self._s[2686]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2687]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2688]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2691]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2692]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2693]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2694]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2695]! } public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2692]!, self._r[2692]!, [_0]) + return formatWithArgumentRanges(self._s[2696]!, self._r[2696]!, [_0]) } - public var DialogList_Typing: String { return self._s[2693]! } - public var CallFeedback_IncludeLogs: String { return self._s[2695]! } - public var Checkout_Phone: String { return self._s[2697]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2700]! } - public var Privacy_Calls_Integration: String { return self._s[2701]! } - public var Notifications_PermissionsAllow: String { return self._s[2702]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2706]! } - public var Settings_ChatSettings: String { return self._s[2707]! } - public var Conversation_SendingOptionsTooltip: String { return self._s[2708]! } + public var DialogList_Typing: String { return self._s[2697]! } + public var CallFeedback_IncludeLogs: String { return self._s[2699]! } + public var Checkout_Phone: String { return self._s[2701]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2704]! } + public var Privacy_Calls_Integration: String { return self._s[2705]! } + public var Notifications_PermissionsAllow: String { return self._s[2706]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2710]! } + public var Settings_ChatSettings: String { return self._s[2711]! } + public var Conversation_SendingOptionsTooltip: String { return self._s[2712]! } public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2709]!, self._r[2709]!, [_0]) - } - public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2710]!, self._r[2710]!, [_1, _2]) - } - public var GroupRemoved_DeleteUser: String { return self._s[2712]! } - public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2713]!, self._r[2713]!, [_0]) } + public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2714]!, self._r[2714]!, [_1, _2]) + } + public var GroupRemoved_DeleteUser: String { return self._s[2716]! } + public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2717]!, self._r[2717]!, [_0]) + } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2714]!, self._r[2714]!, [_1]) + return formatWithArgumentRanges(self._s[2718]!, self._r[2718]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2715]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2716]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2718]! } - public var Conversation_Unblock: String { return self._s[2719]! } - public var PrivacySettings_DataSettings: String { return self._s[2720]! } - public var Group_PublicLink_Info: String { return self._s[2721]! } + public var Login_ContinueWithLocalization: String { return self._s[2719]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2720]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2722]! } + public var Conversation_Unblock: String { return self._s[2723]! } + public var PrivacySettings_DataSettings: String { return self._s[2724]! } + public var Group_PublicLink_Info: String { return self._s[2725]! } public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2722]!, self._r[2722]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2726]!, self._r[2726]!, [_1, _2, _3]) } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2723]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2727]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2724]!, self._r[2724]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2728]!, self._r[2728]!, [_0, _1]) } - public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2726]! } - public var PrivacySettings_Passcode: String { return self._s[2728]! } - public var Call_Mute: String { return self._s[2729]! } - public var Wallet_Weekday_Yesterday: String { return self._s[2730]! } - public var Passport_Language_dz: String { return self._s[2731]! } - public var Wallet_Receive_AmountHeader: String { return self._s[2732]! } - public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2733]! } - public var Passport_Language_tk: String { return self._s[2734]! } + public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2730]! } + public var PrivacySettings_Passcode: String { return self._s[2732]! } + public var Call_Mute: String { return self._s[2733]! } + public var Wallet_Weekday_Yesterday: String { return self._s[2734]! } + public var Passport_Language_dz: String { return self._s[2735]! } + public var Wallet_Receive_AmountHeader: String { return self._s[2736]! } + public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2737]! } + public var Passport_Language_tk: String { return self._s[2738]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2735]!, self._r[2735]!, [_0]) + return formatWithArgumentRanges(self._s[2739]!, self._r[2739]!, [_0]) } - public var Settings_Search: String { return self._s[2736]! } - public var Wallet_Month_ShortFebruary: String { return self._s[2737]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2738]! } - public var Wallet_Configuration_SourceJSON: String { return self._s[2739]! } - public var Conversation_ContextMenuReply: String { return self._s[2740]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2741]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2742]! } - public var Tour_Title1: String { return self._s[2743]! } - public var Wallet_Alert_Cancel: String { return self._s[2744]! } - public var Conversation_ClearGroupHistory: String { return self._s[2746]! } - public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2747]! } - public var WallpaperPreview_Motion: String { return self._s[2748]! } + public var Settings_Search: String { return self._s[2740]! } + public var Wallet_Month_ShortFebruary: String { return self._s[2741]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2742]! } + public var Wallet_Configuration_SourceJSON: String { return self._s[2743]! } + public var Conversation_ContextMenuReply: String { return self._s[2744]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2745]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2746]! } + public var Tour_Title1: String { return self._s[2747]! } + public var Wallet_Alert_Cancel: String { return self._s[2748]! } + public var Conversation_ClearGroupHistory: String { return self._s[2750]! } + public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2751]! } + public var WallpaperPreview_Motion: String { return self._s[2752]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2749]!, self._r[2749]!, [_0]) + return formatWithArgumentRanges(self._s[2753]!, self._r[2753]!, [_0]) } - public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2750]! } - public var Call_RateCall: String { return self._s[2751]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2752]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2753]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2754]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2756]! } + public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2754]! } + public var Call_RateCall: String { return self._s[2755]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2756]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2757]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2758]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2760]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2758]!, self._r[2758]!, [_0]) + return formatWithArgumentRanges(self._s[2762]!, self._r[2762]!, [_0]) } - public var Compose_Create: String { return self._s[2759]! } - public var Contacts_InviteToTelegram: String { return self._s[2760]! } - public var GroupInfo_Notifications: String { return self._s[2761]! } - public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2763]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2764]! } - public var Month_GenApril: String { return self._s[2765]! } - public var Appearance_AutoNightTheme: String { return self._s[2766]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2768]! } - public var Login_CodeSentSms: String { return self._s[2770]! } + public var Compose_Create: String { return self._s[2763]! } + public var Contacts_InviteToTelegram: String { return self._s[2764]! } + public var GroupInfo_Notifications: String { return self._s[2765]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2767]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2768]! } + public var Month_GenApril: String { return self._s[2769]! } + public var Appearance_AutoNightTheme: String { return self._s[2770]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2772]! } + public var Login_CodeSentSms: String { return self._s[2774]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2771]!, self._r[2771]!, [_0]) + return formatWithArgumentRanges(self._s[2775]!, self._r[2775]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2772]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2773]! } - public var Passport_Language_hr: String { return self._s[2774]! } - public var Common_ActionNotAllowedError: String { return self._s[2775]! } + public var EmptyGroupInfo_Line3: String { return self._s[2776]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2777]! } + public var Passport_Language_hr: String { return self._s[2778]! } + public var Common_ActionNotAllowedError: String { return self._s[2779]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2776]!, self._r[2776]!, [_0]) + return formatWithArgumentRanges(self._s[2780]!, self._r[2780]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2777]! } - public var Wallet_Info_TransactionFrom: String { return self._s[2778]! } - public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2779]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2780]! } - public var Privacy_SecretChatsTitle: String { return self._s[2781]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2783]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2784]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2785]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2786]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2787]! } - public var Preview_DeleteGif: String { return self._s[2788]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2789]! } - public var Group_ErrorNotMutualContact: String { return self._s[2790]! } - public var Notification_MessageLifetime5s: String { return self._s[2791]! } - public var Wallet_Send_OwnAddressAlertText: String { return self._s[2792]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2781]! } + public var Wallet_Info_TransactionFrom: String { return self._s[2782]! } + public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2783]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2784]! } + public var Privacy_SecretChatsTitle: String { return self._s[2785]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2787]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2788]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2789]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2790]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2791]! } + public var Preview_DeleteGif: String { return self._s[2792]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2793]! } + public var Group_ErrorNotMutualContact: String { return self._s[2794]! } + public var Notification_MessageLifetime5s: String { return self._s[2795]! } + public var Wallet_Send_OwnAddressAlertText: String { return self._s[2796]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2793]!, self._r[2793]!, [_0]) + return formatWithArgumentRanges(self._s[2797]!, self._r[2797]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2794]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2796]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2797]! } - public var Passport_Address_AddBankStatement: String { return self._s[2798]! } - public var Notification_CallIncoming: String { return self._s[2799]! } - public var Wallet_Words_NotDoneTitle: String { return self._s[2800]! } - public var Compose_NewGroupTitle: String { return self._s[2801]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2803]! } - public var Passport_Address_Postcode: String { return self._s[2805]! } + public var VoiceOver_Chat_Video: String { return self._s[2798]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2800]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2801]! } + public var Passport_Address_AddBankStatement: String { return self._s[2802]! } + public var Notification_CallIncoming: String { return self._s[2803]! } + public var Wallet_Words_NotDoneTitle: String { return self._s[2804]! } + public var Compose_NewGroupTitle: String { return self._s[2805]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2807]! } + public var Passport_Address_Postcode: String { return self._s[2809]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2806]!, self._r[2806]!, [_0]) + return formatWithArgumentRanges(self._s[2810]!, self._r[2810]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2807]! } - public var Wallet_Month_ShortOctober: String { return self._s[2808]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2809]! } - public var WallpaperColors_Title: String { return self._s[2810]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2811]! } - public var VoiceOver_MessageContextForward: String { return self._s[2812]! } - public var GroupPermission_Duration: String { return self._s[2813]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2811]! } + public var Wallet_Month_ShortOctober: String { return self._s[2812]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2813]! } + public var WallpaperColors_Title: String { return self._s[2814]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2815]! } + public var VoiceOver_MessageContextForward: String { return self._s[2816]! } + public var GroupPermission_Duration: String { return self._s[2817]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2814]!, self._r[2814]!, [_0]) + return formatWithArgumentRanges(self._s[2818]!, self._r[2818]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2815]! } - public var Username_Placeholder: String { return self._s[2816]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2817]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2818]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2819]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2819]! } + public var Username_Placeholder: String { return self._s[2820]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2821]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2822]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2823]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2821]!, self._r[2821]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2825]!, self._r[2825]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2822]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2823]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2824]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2825]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2826]! } - public var Conversation_ContextMenuMore: String { return self._s[2827]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2828]! } - public var CallSettings_TabIcon: String { return self._s[2829]! } - public var KeyCommand_Find: String { return self._s[2830]! } - public var ClearCache_FreeSpaceDescription: String { return self._s[2831]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2832]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2833]! } - public var Message_PinnedGame: String { return self._s[2834]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2835]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2837]! } - public var Login_CallRequestState2: String { return self._s[2839]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2841]! } + public var Passport_PasswordDescription: String { return self._s[2826]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2827]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2828]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2829]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2830]! } + public var Conversation_ContextMenuMore: String { return self._s[2831]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2832]! } + public var CallSettings_TabIcon: String { return self._s[2833]! } + public var KeyCommand_Find: String { return self._s[2834]! } + public var ClearCache_FreeSpaceDescription: String { return self._s[2835]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2836]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2837]! } + public var Message_PinnedGame: String { return self._s[2838]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2839]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2841]! } + public var Login_CallRequestState2: String { return self._s[2843]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2845]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2842]!, self._r[2842]!, [_0]) + return formatWithArgumentRanges(self._s[2846]!, self._r[2846]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2844]!, self._r[2844]!, [_0]) - } - public var AuthSessions_AddDevice: String { return self._s[2845]! } - public var WallpaperPreview_Blurred: String { return self._s[2846]! } - public var Conversation_InstantPagePreview: String { return self._s[2847]! } - public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2848]!, self._r[2848]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2851]! } - public var WallpaperSearch_ColorRed: String { return self._s[2852]! } - public var GroupPermission_NoPinMessages: String { return self._s[2853]! } - public var Passport_Language_es: String { return self._s[2854]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2856]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2857]! } + public var AuthSessions_AddDevice: String { return self._s[2849]! } + public var WallpaperPreview_Blurred: String { return self._s[2850]! } + public var Conversation_InstantPagePreview: String { return self._s[2851]! } + public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2852]!, self._r[2852]!, [_0]) + } + public var SecretTimer_VideoDescription: String { return self._s[2855]! } + public var WallpaperSearch_ColorRed: String { return self._s[2856]! } + public var GroupPermission_NoPinMessages: String { return self._s[2857]! } + public var Passport_Language_es: String { return self._s[2858]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2860]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2861]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2858]!, self._r[2858]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2862]!, self._r[2862]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2859]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2860]! } - public var Watch_UserInfo_Unmute: String { return self._s[2861]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2862]! } - public var AccessDenied_CameraRestricted: String { return self._s[2864]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2863]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2864]! } + public var Watch_UserInfo_Unmute: String { return self._s[2865]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2866]! } + public var AccessDenied_CameraRestricted: String { return self._s[2868]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2865]!, self._r[2865]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2869]!, self._r[2869]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2867]! } - public var Settings_CopyUsername: String { return self._s[2868]! } - public var Contacts_SearchLabel: String { return self._s[2869]! } - public var Map_OpenInYandexNavigator: String { return self._s[2871]! } - public var PasscodeSettings_EncryptData: String { return self._s[2872]! } - public var Settings_Wallet: String { return self._s[2873]! } - public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2874]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2875]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2876]! } - public var DialogList_AdNoticeAlert: String { return self._s[2877]! } - public var Wallet_Month_GenMay: String { return self._s[2879]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2880]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2881]! } - public var Localization_LanguageCustom: String { return self._s[2882]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2883]! } - public var CallFeedback_Title: String { return self._s[2884]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2887]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2888]! } - public var Wallet_Intro_CreateErrorTitle: String { return self._s[2889]! } - public var Conversation_InfoGroup: String { return self._s[2890]! } - public var Compose_NewMessage: String { return self._s[2891]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2892]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2893]! } - public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2894]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2895]! } + public var ChatList_ReadAll: String { return self._s[2871]! } + public var Settings_CopyUsername: String { return self._s[2872]! } + public var Contacts_SearchLabel: String { return self._s[2873]! } + public var Map_OpenInYandexNavigator: String { return self._s[2875]! } + public var PasscodeSettings_EncryptData: String { return self._s[2876]! } + public var Settings_Wallet: String { return self._s[2877]! } + public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2878]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2879]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2880]! } + public var DialogList_AdNoticeAlert: String { return self._s[2881]! } + public var Wallet_Month_GenMay: String { return self._s[2883]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2884]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2885]! } + public var Localization_LanguageCustom: String { return self._s[2886]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2887]! } + public var CallFeedback_Title: String { return self._s[2888]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2891]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2892]! } + public var Wallet_Intro_CreateErrorTitle: String { return self._s[2893]! } + public var Conversation_InfoGroup: String { return self._s[2894]! } + public var Compose_NewMessage: String { return self._s[2895]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2896]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2897]! } + public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2898]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2899]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2896]!, self._r[2896]!, [_0]) + return formatWithArgumentRanges(self._s[2900]!, self._r[2900]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2897]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2898]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2899]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2900]! } - public var Channel_BlackList_Title: String { return self._s[2901]! } - public var UserInfo_PhoneCall: String { return self._s[2902]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2904]! } - public var Wallet_Month_ShortJanuary: String { return self._s[2905]! } - public var State_connecting: String { return self._s[2906]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2907]! } - public var Wallet_Month_GenMarch: String { return self._s[2908]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[2909]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2901]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2902]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2903]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2904]! } + public var Channel_BlackList_Title: String { return self._s[2905]! } + public var UserInfo_PhoneCall: String { return self._s[2906]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2908]! } + public var Wallet_Month_ShortJanuary: String { return self._s[2909]! } + public var State_connecting: String { return self._s[2910]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2911]! } + public var Wallet_Month_GenMarch: String { return self._s[2912]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[2913]! } public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2910]!, self._r[2910]!, [_0]) + return formatWithArgumentRanges(self._s[2914]!, self._r[2914]!, [_0]) } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2911]!, self._r[2911]!, [_0]) + return formatWithArgumentRanges(self._s[2915]!, self._r[2915]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2912]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2913]! } - public var Passport_Identity_EditPassport: String { return self._s[2914]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2916]! } - public var Localization_EnglishLanguageName: String { return self._s[2917]! } - public var Share_AuthDescription: String { return self._s[2918]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2919]! } - public var Passport_Identity_Surname: String { return self._s[2920]! } - public var Compose_TokenListPlaceholder: String { return self._s[2921]! } - public var Wallet_AccessDenied_Camera: String { return self._s[2922]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[2923]! } - public var Settings_AboutEmpty: String { return self._s[2924]! } - public var Conversation_Unmute: String { return self._s[2925]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[2927]! } - public var Wallet_Sending_Text: String { return self._s[2928]! } + public var Notifications_GroupNotifications: String { return self._s[2916]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2917]! } + public var Passport_Identity_EditPassport: String { return self._s[2918]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2920]! } + public var Localization_EnglishLanguageName: String { return self._s[2921]! } + public var Share_AuthDescription: String { return self._s[2922]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2923]! } + public var Passport_Identity_Surname: String { return self._s[2924]! } + public var Compose_TokenListPlaceholder: String { return self._s[2925]! } + public var Wallet_AccessDenied_Camera: String { return self._s[2926]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2927]! } + public var Settings_AboutEmpty: String { return self._s[2928]! } + public var Conversation_Unmute: String { return self._s[2929]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[2931]! } + public var Wallet_Sending_Text: String { return self._s[2932]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2929]!, self._r[2929]!, [_1]) + return formatWithArgumentRanges(self._s[2933]!, self._r[2933]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[2930]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2932]! } - public var ChatSettings_Appearance: String { return self._s[2933]! } - public var ClearCache_StorageUsage: String { return self._s[2934]! } - public var Appearance_PickAccentColor: String { return self._s[2935]! } + public var Login_CodeSentCall: String { return self._s[2934]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2936]! } + public var ChatSettings_Appearance: String { return self._s[2937]! } + public var ClearCache_StorageUsage: String { return self._s[2938]! } + public var Appearance_PickAccentColor: String { return self._s[2939]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2936]!, self._r[2936]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2940]!, self._r[2940]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2937]!, self._r[2937]!, [_1]) + return formatWithArgumentRanges(self._s[2941]!, self._r[2941]!, [_1]) } - public var Notification_CallMissed: String { return self._s[2938]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2939]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2940]! } - public var Wallet_Month_GenOctober: String { return self._s[2942]! } - public var ChatAdmins_AdminLabel: String { return self._s[2943]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2944]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[2946]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2947]! } - public var Month_GenJune: String { return self._s[2948]! } - public var IntentsSettings_MainAccountInfo: String { return self._s[2949]! } - public var Watch_Location_Current: String { return self._s[2950]! } - public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2951]! } - public var Conversation_TitleMute: String { return self._s[2952]! } + public var Notification_CallMissed: String { return self._s[2942]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2943]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2944]! } + public var Wallet_Month_GenOctober: String { return self._s[2946]! } + public var ChatAdmins_AdminLabel: String { return self._s[2947]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2948]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2950]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2951]! } + public var Month_GenJune: String { return self._s[2952]! } + public var IntentsSettings_MainAccountInfo: String { return self._s[2953]! } + public var Watch_Location_Current: String { return self._s[2954]! } + public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2955]! } + public var Conversation_TitleMute: String { return self._s[2956]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2953]!, self._r[2953]!, [_1]) + return formatWithArgumentRanges(self._s[2957]!, self._r[2957]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[2954]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2958]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2955]!, self._r[2955]!, [_0]) + return formatWithArgumentRanges(self._s[2959]!, self._r[2959]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[2956]! } - public var Chat_SlowmodeSendError: String { return self._s[2957]! } - public var MaskStickerSettings_Info: String { return self._s[2958]! } - public var EditTheme_Expand_TopInfo: String { return self._s[2959]! } + public var Call_ReportPlaceholder: String { return self._s[2960]! } + public var Chat_SlowmodeSendError: String { return self._s[2961]! } + public var MaskStickerSettings_Info: String { return self._s[2962]! } + public var EditTheme_Expand_TopInfo: String { return self._s[2963]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2960]!, self._r[2960]!, [_0]) + return formatWithArgumentRanges(self._s[2964]!, self._r[2964]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[2961]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[2963]! } - public var Contacts_ShareTelegram: String { return self._s[2964]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2965]! } - public var Channel_ErrorAccessDenied: String { return self._s[2966]! } - public var UserInfo_ScamBotWarning: String { return self._s[2968]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[2969]! } - public var Call_ConnectionErrorTitle: String { return self._s[2970]! } - public var UserInfo_NotificationsEnable: String { return self._s[2971]! } - public var ArchivedChats_IntroText1: String { return self._s[2972]! } - public var Tour_Text4: String { return self._s[2975]! } - public var WallpaperSearch_Recent: String { return self._s[2976]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[2977]! } - public var Profile_MessageLifetime2s: String { return self._s[2979]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2980]! } - public var Notification_MessageLifetime2s: String { return self._s[2981]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2965]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2967]! } + public var Contacts_ShareTelegram: String { return self._s[2968]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2969]! } + public var Map_AddressOnMap: String { return self._s[2970]! } + public var Channel_ErrorAccessDenied: String { return self._s[2971]! } + public var UserInfo_ScamBotWarning: String { return self._s[2973]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2974]! } + public var Call_ConnectionErrorTitle: String { return self._s[2975]! } + public var UserInfo_NotificationsEnable: String { return self._s[2976]! } + public var ArchivedChats_IntroText1: String { return self._s[2977]! } + public var Tour_Text4: String { return self._s[2980]! } + public var WallpaperSearch_Recent: String { return self._s[2981]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[2982]! } + public var Profile_MessageLifetime2s: String { return self._s[2984]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2985]! } + public var Notification_MessageLifetime2s: String { return self._s[2986]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2982]!, self._r[2982]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2987]!, self._r[2987]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[2983]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[2984]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2985]! } + public var Cache_ClearCache: String { return self._s[2988]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[2989]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2990]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2989]!, self._r[2989]!, [_0]) + return formatWithArgumentRanges(self._s[2994]!, self._r[2994]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2991]!, self._r[2991]!, [_0]) + return formatWithArgumentRanges(self._s[2996]!, self._r[2996]!, [_0]) } - public var LocalGroup_Text: String { return self._s[2992]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2993]! } - public var SocksProxySetup_TypeSocks: String { return self._s[2994]! } - public var ChatList_UnarchiveAction: String { return self._s[2995]! } - public var AutoNightTheme_Title: String { return self._s[2996]! } - public var InstantPage_FeedbackButton: String { return self._s[2997]! } - public var Passport_FieldAddress: String { return self._s[2998]! } + public var LocalGroup_Text: String { return self._s[2997]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2998]! } + public var SocksProxySetup_TypeSocks: String { return self._s[2999]! } + public var ChatList_UnarchiveAction: String { return self._s[3000]! } + public var AutoNightTheme_Title: String { return self._s[3001]! } + public var InstantPage_FeedbackButton: String { return self._s[3002]! } + public var Passport_FieldAddress: String { return self._s[3003]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2999]!, self._r[2999]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3004]!, self._r[3004]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[3000]! } + public var Month_ShortMarch: String { return self._s[3005]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3001]!, self._r[3001]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3006]!, self._r[3006]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3002]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3003]! } - public var Passport_FloodError: String { return self._s[3004]! } - public var SecretGif_Title: String { return self._s[3005]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3006]! } - public var ChatList_Context_UnhideArchive: String { return self._s[3007]! } - public var Passport_Language_th: String { return self._s[3009]! } - public var Passport_Address_Address: String { return self._s[3010]! } - public var Login_InvalidLastNameError: String { return self._s[3011]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[3012]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[3013]! } - public var ChatList_Context_Archive: String { return self._s[3014]! } - public var SettingsSearch_FAQ: String { return self._s[3015]! } - public var ShareMenu_Send: String { return self._s[3016]! } - public var WallpaperSearch_ColorYellow: String { return self._s[3018]! } - public var Month_GenNovember: String { return self._s[3020]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3022]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3007]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3008]! } + public var Passport_FloodError: String { return self._s[3009]! } + public var SecretGif_Title: String { return self._s[3010]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3011]! } + public var ChatList_Context_UnhideArchive: String { return self._s[3012]! } + public var Passport_Language_th: String { return self._s[3014]! } + public var Passport_Address_Address: String { return self._s[3015]! } + public var Login_InvalidLastNameError: String { return self._s[3016]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[3017]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[3018]! } + public var ChatList_Context_Archive: String { return self._s[3019]! } + public var SettingsSearch_FAQ: String { return self._s[3020]! } + public var ShareMenu_Send: String { return self._s[3021]! } + public var WallpaperSearch_ColorYellow: String { return self._s[3023]! } + public var Month_GenNovember: String { return self._s[3025]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3027]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3023]!, self._r[3023]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3028]!, self._r[3028]!, [_1, _2]) } - public var Conversation_SwipeToReplyHintText: String { return self._s[3024]! } - public var Checkout_Email: String { return self._s[3025]! } - public var NotificationsSound_Tritone: String { return self._s[3026]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[3028]! } - public var Wallet_ContextMenuCopy: String { return self._s[3030]! } + public var Conversation_SwipeToReplyHintText: String { return self._s[3029]! } + public var Checkout_Email: String { return self._s[3030]! } + public var NotificationsSound_Tritone: String { return self._s[3031]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[3033]! } + public var Wallet_ContextMenuCopy: String { return self._s[3035]! } public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3032]!, self._r[3032]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3037]!, self._r[3037]!, [_1, _2, _3]) } - public var Appearance_TextSize_Automatic: String { return self._s[3033]! } + public var Appearance_TextSize_Automatic: String { return self._s[3038]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3034]!, self._r[3034]!, [_1]) + return formatWithArgumentRanges(self._s[3039]!, self._r[3039]!, [_1]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[3035]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[3040]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3036]!, self._r[3036]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[3041]!, self._r[3041]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[3037]! } - public var Notification_Exceptions_Add: String { return self._s[3038]! } - public var DialogList_You: String { return self._s[3039]! } - public var MediaPicker_Send: String { return self._s[3042]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3043]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3044]! } - public var Call_AudioRouteSpeaker: String { return self._s[3045]! } - public var Watch_UserInfo_Title: String { return self._s[3046]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[3047]! } - public var Appearance_AccentColor: String { return self._s[3049]! } + public var ChatList_UndoArchiveTitle: String { return self._s[3042]! } + public var Notification_Exceptions_Add: String { return self._s[3043]! } + public var DialogList_You: String { return self._s[3044]! } + public var MediaPicker_Send: String { return self._s[3047]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3048]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3049]! } + public var Call_AudioRouteSpeaker: String { return self._s[3050]! } + public var Watch_UserInfo_Title: String { return self._s[3051]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[3052]! } + public var Appearance_AccentColor: String { return self._s[3054]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3050]!, self._r[3050]!, [_0]) + return formatWithArgumentRanges(self._s[3055]!, self._r[3055]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3051]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3056]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3052]!, self._r[3052]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3057]!, self._r[3057]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[3053]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[3054]! } - public var Notification_CallOutgoing: String { return self._s[3055]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3056]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3057]! } - public var Call_RecordingDisabledMessage: String { return self._s[3058]! } - public var Message_Game: String { return self._s[3059]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[3060]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3061]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3062]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3063]! } - public var Date_DialogDateFormat: String { return self._s[3064]! } - public var WallpaperColors_SetCustomColor: String { return self._s[3065]! } - public var Notifications_InAppNotifications: String { return self._s[3066]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[3058]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[3059]! } + public var Notification_CallOutgoing: String { return self._s[3060]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3061]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3062]! } + public var Call_RecordingDisabledMessage: String { return self._s[3063]! } + public var Message_Game: String { return self._s[3064]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[3065]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3066]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3067]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3068]! } + public var Date_DialogDateFormat: String { return self._s[3069]! } + public var WallpaperColors_SetCustomColor: String { return self._s[3070]! } + public var Notifications_InAppNotifications: String { return self._s[3071]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3067]!, self._r[3067]!, [_0]) + return formatWithArgumentRanges(self._s[3072]!, self._r[3072]!, [_0]) } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3068]!, self._r[3068]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3073]!, self._r[3073]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[3069]! } + public var NewContact_Title: String { return self._s[3074]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3070]!, self._r[3070]!, [_0]) + return formatWithArgumentRanges(self._s[3075]!, self._r[3075]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[3071]! } + public var Conversation_ViewContactDetails: String { return self._s[3076]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3073]!, self._r[3073]!, [_1]) + return formatWithArgumentRanges(self._s[3078]!, self._r[3078]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3074]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[3075]! } - public var PrivacySettings_Title: String { return self._s[3076]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3079]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[3080]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[3081]! } - public var Contacts_PhoneNumber: String { return self._s[3082]! } - public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3084]! } - public var Map_ShowPlaces: String { return self._s[3085]! } - public var ChatAdmins_Title: String { return self._s[3086]! } - public var InstantPage_Reference: String { return self._s[3088]! } - public var Wallet_Info_Updating: String { return self._s[3089]! } - public var ReportGroupLocation_Text: String { return self._s[3090]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3079]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[3080]! } + public var PrivacySettings_Title: String { return self._s[3081]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3084]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[3085]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[3086]! } + public var Contacts_PhoneNumber: String { return self._s[3087]! } + public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3089]! } + public var Map_ShowPlaces: String { return self._s[3090]! } + public var ChatAdmins_Title: String { return self._s[3091]! } + public var InstantPage_Reference: String { return self._s[3093]! } + public var Wallet_Info_Updating: String { return self._s[3094]! } + public var ReportGroupLocation_Text: String { return self._s[3095]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3091]!, self._r[3091]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3096]!, self._r[3096]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[3092]! } - public var Watch_UserInfo_Block: String { return self._s[3093]! } - public var ChatSettings_Stickers: String { return self._s[3094]! } - public var ChatSettings_DownloadInBackground: String { return self._s[3095]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[3096]! } + public var Camera_FlashOff: String { return self._s[3097]! } + public var Watch_UserInfo_Block: String { return self._s[3098]! } + public var ChatSettings_Stickers: String { return self._s[3099]! } + public var ChatSettings_DownloadInBackground: String { return self._s[3100]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[3101]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3097]!, self._r[3097]!, [_0]) + return formatWithArgumentRanges(self._s[3102]!, self._r[3102]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[3098]! } - public var Login_CheckOtherSessionMessages: String { return self._s[3099]! } - public var AutoDownloadSettings_Cellular: String { return self._s[3100]! } - public var Wallet_Created_ExportErrorTitle: String { return self._s[3101]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3102]! } - public var VoiceOver_MessageContextShare: String { return self._s[3103]! } + public var Settings_ViewPhoto: String { return self._s[3103]! } + public var Login_CheckOtherSessionMessages: String { return self._s[3104]! } + public var AutoDownloadSettings_Cellular: String { return self._s[3105]! } + public var Wallet_Created_ExportErrorTitle: String { return self._s[3106]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3107]! } + public var VoiceOver_MessageContextShare: String { return self._s[3108]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3105]!, self._r[3105]!, [_0]) + return formatWithArgumentRanges(self._s[3110]!, self._r[3110]!, [_0]) } - public var Privacy_DeleteDrafts: String { return self._s[3106]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3107]! } + public var Privacy_DeleteDrafts: String { return self._s[3111]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3112]! } public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3108]!, self._r[3108]!, [_0]) + return formatWithArgumentRanges(self._s[3113]!, self._r[3113]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[3109]! } - public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3110]! } - public var DialogList_SavedMessages: String { return self._s[3111]! } - public var GroupInfo_UpgradeButton: String { return self._s[3112]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3114]! } - public var DialogList_Pin: String { return self._s[3115]! } + public var DialogList_SavedMessagesHelp: String { return self._s[3114]! } + public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3115]! } + public var DialogList_SavedMessages: String { return self._s[3116]! } + public var GroupInfo_UpgradeButton: String { return self._s[3117]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3119]! } + public var DialogList_Pin: String { return self._s[3120]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3116]!, self._r[3116]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3121]!, self._r[3121]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3117]!, self._r[3117]!, [_0]) + return formatWithArgumentRanges(self._s[3122]!, self._r[3122]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3118]! } - public var UserInfo_NotificationsDisable: String { return self._s[3119]! } - public var Paint_Outlined: String { return self._s[3120]! } - public var Activity_PlayingGame: String { return self._s[3121]! } - public var SearchImages_NoImagesFound: String { return self._s[3122]! } - public var SocksProxySetup_ProxyType: String { return self._s[3123]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3125]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[3126]! } - public var Settings_AppLanguage: String { return self._s[3127]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3128]! } - public var Common_ChoosePhoto: String { return self._s[3129]! } - public var CallFeedback_ReasonEcho: String { return self._s[3130]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3123]! } + public var UserInfo_NotificationsDisable: String { return self._s[3124]! } + public var Paint_Outlined: String { return self._s[3125]! } + public var Activity_PlayingGame: String { return self._s[3126]! } + public var SearchImages_NoImagesFound: String { return self._s[3127]! } + public var SocksProxySetup_ProxyType: String { return self._s[3128]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3130]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[3131]! } + public var Settings_AppLanguage: String { return self._s[3132]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3133]! } + public var Common_ChoosePhoto: String { return self._s[3134]! } + public var CallFeedback_ReasonEcho: String { return self._s[3135]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3131]!, self._r[3131]!, [_1]) + return formatWithArgumentRanges(self._s[3136]!, self._r[3136]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[3132]! } - public var Activity_UploadingVideo: String { return self._s[3133]! } - public var Conversation_WalletRequiredNotNow: String { return self._s[3134]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3135]! } - public var NetworkUsageSettings_Wifi: String { return self._s[3136]! } - public var VoiceOver_Editing_ClearText: String { return self._s[3137]! } - public var PUSH_SENDER_YOU: String { return self._s[3138]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[3139]! } - public var Checkout_PayWithTouchId: String { return self._s[3140]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3141]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[3137]! } + public var Activity_UploadingVideo: String { return self._s[3138]! } + public var Conversation_WalletRequiredNotNow: String { return self._s[3139]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3140]! } + public var NetworkUsageSettings_Wifi: String { return self._s[3141]! } + public var VoiceOver_Editing_ClearText: String { return self._s[3142]! } + public var PUSH_SENDER_YOU: String { return self._s[3143]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[3144]! } + public var Checkout_PayWithTouchId: String { return self._s[3145]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3146]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3143]!, self._r[3143]!, [_1]) + return formatWithArgumentRanges(self._s[3148]!, self._r[3148]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[3144]! } + public var Notifications_ExceptionsNone: String { return self._s[3149]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3145]!, self._r[3145]!, [_0]) + return formatWithArgumentRanges(self._s[3150]!, self._r[3150]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3146]!, self._r[3146]!, [_1]) + return formatWithArgumentRanges(self._s[3151]!, self._r[3151]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[3148]! } - public var Passport_Address_Region: String { return self._s[3151]! } - public var ChatList_DeleteChat: String { return self._s[3152]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[3153]! } - public var PhotoEditor_TiltShift: String { return self._s[3154]! } - public var Settings_FAQ_URL: String { return self._s[3155]! } - public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3156]! } - public var Passport_Language_sl: String { return self._s[3157]! } - public var Settings_PrivacySettings: String { return self._s[3159]! } - public var SharedMedia_TitleLink: String { return self._s[3160]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[3161]! } - public var Settings_SetProfilePhoto: String { return self._s[3162]! } - public var Channel_About_Help: String { return self._s[3163]! } - public var Contacts_PermissionsEnable: String { return self._s[3164]! } - public var Wallet_Sending_Title: String { return self._s[3165]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3166]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[3167]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3169]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3170]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3171]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3172]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[3173]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[3175]! } - public var Map_OpenInYandexMaps: String { return self._s[3177]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3178]! } - public var VoiceOver_MessageContextReply: String { return self._s[3179]! } - public var PhotoEditor_SaturationTool: String { return self._s[3180]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[3153]! } + public var Passport_Address_Region: String { return self._s[3156]! } + public var ChatList_DeleteChat: String { return self._s[3157]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[3158]! } + public var PhotoEditor_TiltShift: String { return self._s[3159]! } + public var Settings_FAQ_URL: String { return self._s[3160]! } + public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3161]! } + public var Passport_Language_sl: String { return self._s[3162]! } + public var Settings_PrivacySettings: String { return self._s[3164]! } + public var SharedMedia_TitleLink: String { return self._s[3165]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[3166]! } + public var Settings_SetProfilePhoto: String { return self._s[3167]! } + public var Channel_About_Help: String { return self._s[3168]! } + public var Contacts_PermissionsEnable: String { return self._s[3169]! } + public var Wallet_Sending_Title: String { return self._s[3170]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3171]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[3172]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3174]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3175]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3176]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3177]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[3178]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[3180]! } + public var Map_OpenInYandexMaps: String { return self._s[3182]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3183]! } + public var VoiceOver_MessageContextReply: String { return self._s[3184]! } + public var PhotoEditor_SaturationTool: String { return self._s[3185]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3181]!, self._r[3181]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3186]!, self._r[3186]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3182]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3183]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3184]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3187]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3188]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3189]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3185]!, self._r[3185]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3190]!, self._r[3190]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3186]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3188]! } - public var SettingsSearch_Synonyms_Wallet: String { return self._s[3189]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3191]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3193]! } + public var SettingsSearch_Synonyms_Wallet: String { return self._s[3194]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3190]!, self._r[3190]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3195]!, self._r[3195]!, [_1, _2]) } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3191]!, self._r[3191]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3196]!, self._r[3196]!, [_1, _2, _3]) } - public var GroupInfo_PublicLinkAdd: String { return self._s[3192]! } - public var Passport_PassportInformation: String { return self._s[3195]! } - public var Theme_Unsupported: String { return self._s[3196]! } - public var WatchRemote_AlertTitle: String { return self._s[3197]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3198]! } - public var ConvertToSupergroup_HelpText: String { return self._s[3200]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[3197]! } + public var Passport_PassportInformation: String { return self._s[3200]! } + public var Theme_Unsupported: String { return self._s[3201]! } + public var WatchRemote_AlertTitle: String { return self._s[3202]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3203]! } + public var ConvertToSupergroup_HelpText: String { return self._s[3205]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3201]!, self._r[3201]!, [_0]) + return formatWithArgumentRanges(self._s[3206]!, self._r[3206]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3202]!, self._r[3202]!, [_1]) + return formatWithArgumentRanges(self._s[3207]!, self._r[3207]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3203]! } - public var Wallet_Navigation_Done: String { return self._s[3205]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3206]! } - public var AccessDenied_CameraDisabled: String { return self._s[3207]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3208]! } + public var Wallet_Navigation_Done: String { return self._s[3210]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3211]! } + public var AccessDenied_CameraDisabled: String { return self._s[3212]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3208]!, self._r[3208]!, [_0]) + return formatWithArgumentRanges(self._s[3213]!, self._r[3213]!, [_0]) } - public var ClearCache_Forever: String { return self._s[3209]! } - public var PhotoEditor_ContrastTool: String { return self._s[3212]! } + public var ClearCache_Forever: String { return self._s[3214]! } + public var PhotoEditor_ContrastTool: String { return self._s[3217]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3213]!, self._r[3213]!, [_1]) + return formatWithArgumentRanges(self._s[3218]!, self._r[3218]!, [_1]) } - public var DialogList_Draft: String { return self._s[3214]! } - public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3215]! } - public var Privacy_TopPeersDelete: String { return self._s[3217]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[3218]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3219]! } - public var WebSearch_RecentSectionClear: String { return self._s[3220]! } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[3221]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3223]! } - public var Common_Done: String { return self._s[3225]! } - public var Shortcut_SwitchAccount: String { return self._s[3226]! } - public var AuthSessions_EmptyText: String { return self._s[3227]! } - public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3228]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[3229]! } - public var Tour_Title5: String { return self._s[3230]! } - public var Wallet_Settings_Title: String { return self._s[3231]! } + public var DialogList_Draft: String { return self._s[3219]! } + public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3220]! } + public var Privacy_TopPeersDelete: String { return self._s[3222]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[3223]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3224]! } + public var WebSearch_RecentSectionClear: String { return self._s[3225]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[3226]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3228]! } + public var Common_Done: String { return self._s[3230]! } + public var Shortcut_SwitchAccount: String { return self._s[3231]! } + public var AuthSessions_EmptyText: String { return self._s[3232]! } + public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3233]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[3234]! } + public var Tour_Title5: String { return self._s[3235]! } + public var Wallet_Settings_Title: String { return self._s[3236]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3232]!, self._r[3232]!, [_0]) + return formatWithArgumentRanges(self._s[3237]!, self._r[3237]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3233]! } - public var Conversation_LinkDialogSave: String { return self._s[3234]! } - public var GroupInfo_ActionRestrict: String { return self._s[3235]! } - public var Checkout_Title: String { return self._s[3236]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3238]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[3240]! } - public var Notification_RenamedGroup: String { return self._s[3241]! } - public var PeopleNearby_Groups: String { return self._s[3242]! } - public var Checkout_PayWithFaceId: String { return self._s[3243]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3244]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3246]! } - public var Checkout_WebConfirmation_Title: String { return self._s[3247]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[3248]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3238]! } + public var Conversation_LinkDialogSave: String { return self._s[3239]! } + public var GroupInfo_ActionRestrict: String { return self._s[3240]! } + public var Checkout_Title: String { return self._s[3241]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3243]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[3245]! } + public var Notification_RenamedGroup: String { return self._s[3246]! } + public var PeopleNearby_Groups: String { return self._s[3247]! } + public var Checkout_PayWithFaceId: String { return self._s[3248]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3249]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3251]! } + public var Checkout_WebConfirmation_Title: String { return self._s[3252]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[3253]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3249]!, self._r[3249]!, [_0]) + return formatWithArgumentRanges(self._s[3254]!, self._r[3254]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[3251]! } + public var Profile_AddToExisting: String { return self._s[3256]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3252]!, self._r[3252]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3257]!, self._r[3257]!, [_0, _1]) } - public var Cache_Files: String { return self._s[3254]! } - public var Permissions_PrivacyPolicy: String { return self._s[3255]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[3256]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3257]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[3259]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3261]! } - public var Calls_NoCallsPlaceholder: String { return self._s[3262]! } + public var Cache_Files: String { return self._s[3259]! } + public var Permissions_PrivacyPolicy: String { return self._s[3260]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[3261]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3262]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[3264]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3266]! } + public var Calls_NoCallsPlaceholder: String { return self._s[3267]! } public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3263]!, self._r[3263]!, [_0]) + return formatWithArgumentRanges(self._s[3268]!, self._r[3268]!, [_0]) } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3264]! } - public var VoiceOver_AttachMedia: String { return self._s[3266]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3267]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3269]! } + public var VoiceOver_AttachMedia: String { return self._s[3271]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3272]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3268]!, self._r[3268]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3273]!, self._r[3273]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3269]! } - public var Conversation_SetReminder_Title: String { return self._s[3270]! } - public var Passport_FieldAddressHelp: String { return self._s[3271]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3272]! } - public var PUSH_REMINDER_TITLE: String { return self._s[3273]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3274]! } + public var Conversation_SetReminder_Title: String { return self._s[3275]! } + public var Passport_FieldAddressHelp: String { return self._s[3276]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3277]! } + public var PUSH_REMINDER_TITLE: String { return self._s[3278]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3274]!, self._r[3274]!, [_0]) + return formatWithArgumentRanges(self._s[3279]!, self._r[3279]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[3275]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[3276]! } - public var Login_UnknownError: String { return self._s[3277]! } - public var Group_UpgradeNoticeText2: String { return self._s[3280]! } - public var Watch_Compose_AddContact: String { return self._s[3281]! } - public var ClearCache_StorageServiceFiles: String { return self._s[3282]! } - public var Web_Error: String { return self._s[3283]! } - public var Gif_Search: String { return self._s[3284]! } - public var Profile_MessageLifetime1h: String { return self._s[3285]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3286]! } - public var Channel_Username_CheckingUsername: String { return self._s[3287]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[3288]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[3289]! } - public var Channel_AboutItem: String { return self._s[3290]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3292]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[3293]! } - public var GroupInfo_SharedMedia: String { return self._s[3294]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[3280]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[3281]! } + public var Login_UnknownError: String { return self._s[3282]! } + public var Group_UpgradeNoticeText2: String { return self._s[3285]! } + public var Watch_Compose_AddContact: String { return self._s[3286]! } + public var ClearCache_StorageServiceFiles: String { return self._s[3287]! } + public var Web_Error: String { return self._s[3288]! } + public var Gif_Search: String { return self._s[3289]! } + public var Profile_MessageLifetime1h: String { return self._s[3290]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3291]! } + public var Channel_Username_CheckingUsername: String { return self._s[3292]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[3293]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[3294]! } + public var Channel_AboutItem: String { return self._s[3295]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3297]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[3298]! } + public var GroupInfo_SharedMedia: String { return self._s[3299]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3295]!, self._r[3295]!, [_1]) + return formatWithArgumentRanges(self._s[3300]!, self._r[3300]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[3296]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3301]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3297]!, self._r[3297]!, [_1]) + return formatWithArgumentRanges(self._s[3302]!, self._r[3302]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3298]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3299]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3300]! } - public var CreatePoll_AddOption: String { return self._s[3301]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3302]! } - public var Group_UpgradeNoticeHeader: String { return self._s[3303]! } - public var Channel_Management_AddModerator: String { return self._s[3304]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[3305]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[3306]! } - public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3307]! } - public var Theme_Colors_Background: String { return self._s[3308]! } - public var NotificationsSound_Hello: String { return self._s[3310]! } - public var SocksProxySetup_SavedProxies: String { return self._s[3311]! } - public var Channel_Stickers_Placeholder: String { return self._s[3313]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3303]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3304]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3305]! } + public var CreatePoll_AddOption: String { return self._s[3306]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3307]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3308]! } + public var Channel_Management_AddModerator: String { return self._s[3309]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3310]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3311]! } + public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3312]! } + public var Theme_Colors_Background: String { return self._s[3313]! } + public var NotificationsSound_Hello: String { return self._s[3315]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3316]! } + public var Channel_Stickers_Placeholder: String { return self._s[3318]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3314]!, self._r[3314]!, [_0]) + return formatWithArgumentRanges(self._s[3319]!, self._r[3319]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3315]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[3316]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3317]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3318]! } - public var AutoDownloadSettings_Channels: String { return self._s[3319]! } - public var Passport_Language_mn: String { return self._s[3320]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3323]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3324]! } - public var Passport_Language_ja: String { return self._s[3326]! } - public var Settings_About_Title: String { return self._s[3327]! } - public var Settings_NotificationsAndSounds: String { return self._s[3328]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3329]! } - public var Settings_BlockedUsers: String { return self._s[3330]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3320]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3321]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3322]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3323]! } + public var AutoDownloadSettings_Channels: String { return self._s[3324]! } + public var Passport_Language_mn: String { return self._s[3325]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3328]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3329]! } + public var Passport_Language_ja: String { return self._s[3331]! } + public var Settings_About_Title: String { return self._s[3332]! } + public var Settings_NotificationsAndSounds: String { return self._s[3333]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3334]! } + public var Settings_BlockedUsers: String { return self._s[3335]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3331]!, self._r[3331]!, [_0]) + return formatWithArgumentRanges(self._s[3336]!, self._r[3336]!, [_0]) } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3332]! } - public var Wallet_Weekday_Today: String { return self._s[3333]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3334]! } - public var Widget_ApplicationLocked: String { return self._s[3335]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3336]! } - public var Channel_Username_Title: String { return self._s[3337]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3337]! } + public var Wallet_Weekday_Today: String { return self._s[3338]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3339]! } + public var Widget_ApplicationLocked: String { return self._s[3340]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3341]! } + public var Channel_Username_Title: String { return self._s[3342]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3338]!, self._r[3338]!, [_0]) + return formatWithArgumentRanges(self._s[3343]!, self._r[3343]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3340]! } - public var AppleWatch_Title: String { return self._s[3341]! } - public var Activity_RecordingVideoMessage: String { return self._s[3342]! } + public var AttachmentMenu_File: String { return self._s[3345]! } + public var AppleWatch_Title: String { return self._s[3346]! } + public var Activity_RecordingVideoMessage: String { return self._s[3347]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3343]!, self._r[3343]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3348]!, self._r[3348]!, [_1, _2]) } - public var Theme_Colors_Messages: String { return self._s[3344]! } - public var Weekday_Saturday: String { return self._s[3345]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3346]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3347]! } - public var Common_Next: String { return self._s[3349]! } - public var Channel_Stickers_YourStickers: String { return self._s[3351]! } - public var Message_Theme: String { return self._s[3352]! } - public var Call_AudioRouteHeadphones: String { return self._s[3353]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3355]! } - public var Watch_Contacts_NoResults: String { return self._s[3357]! } - public var PhotoEditor_TintTool: String { return self._s[3360]! } - public var LoginPassword_ResetAccount: String { return self._s[3362]! } - public var Settings_SavedMessages: String { return self._s[3363]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3364]! } - public var Bot_GenericSupportStatus: String { return self._s[3365]! } - public var StickerPack_Add: String { return self._s[3366]! } - public var Checkout_TotalAmount: String { return self._s[3367]! } - public var Your_cards_number_is_invalid: String { return self._s[3368]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3369]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3370]! } + public var Theme_Colors_Messages: String { return self._s[3349]! } + public var Weekday_Saturday: String { return self._s[3350]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3351]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3352]! } + public var Common_Next: String { return self._s[3354]! } + public var Channel_Stickers_YourStickers: String { return self._s[3356]! } + public var Message_Theme: String { return self._s[3357]! } + public var Call_AudioRouteHeadphones: String { return self._s[3358]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3360]! } + public var Watch_Contacts_NoResults: String { return self._s[3362]! } + public var PhotoEditor_TintTool: String { return self._s[3365]! } + public var LoginPassword_ResetAccount: String { return self._s[3367]! } + public var Settings_SavedMessages: String { return self._s[3368]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3369]! } + public var Bot_GenericSupportStatus: String { return self._s[3370]! } + public var StickerPack_Add: String { return self._s[3371]! } + public var Checkout_TotalAmount: String { return self._s[3372]! } + public var Your_cards_number_is_invalid: String { return self._s[3373]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3374]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3375]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3371]!, self._r[3371]!, [_0]) - } - public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3372]!, self._r[3372]!, [_1, _2]) - } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3373]! } - public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3375]!, self._r[3375]!, [_1, _2]) - } - public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3376]!, self._r[3376]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3377]! } - public var StickerPack_Share: String { return self._s[3378]! } - public var Passport_DeleteAddress: String { return self._s[3379]! } - public var Settings_Passport: String { return self._s[3380]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3381]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3382]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3383]! } - public var Contacts_PermissionsText: String { return self._s[3384]! } - public var Group_Setup_HistoryVisible: String { return self._s[3385]! } - public var Wallet_Month_ShortDecember: String { return self._s[3387]! } - public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3388]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3389]! } - public var SocksProxySetup_Title: String { return self._s[3390]! } - public var Notification_Mute1h: String { return self._s[3391]! } + public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3377]!, self._r[3377]!, [_1, _2]) + } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3378]! } + public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3380]!, self._r[3380]!, [_1, _2]) + } + public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3381]!, self._r[3381]!, [_0]) + } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3382]! } + public var StickerPack_Share: String { return self._s[3383]! } + public var Passport_DeleteAddress: String { return self._s[3384]! } + public var Settings_Passport: String { return self._s[3385]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3386]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3387]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3388]! } + public var Contacts_PermissionsText: String { return self._s[3389]! } + public var Group_Setup_HistoryVisible: String { return self._s[3390]! } + public var Wallet_Month_ShortDecember: String { return self._s[3392]! } + public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3393]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3394]! } + public var SocksProxySetup_Title: String { return self._s[3395]! } + public var Notification_Mute1h: String { return self._s[3396]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3392]!, self._r[3392]!, [_0]) + return formatWithArgumentRanges(self._s[3397]!, self._r[3397]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3393]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3398]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3394]!, self._r[3394]!, [_1]) + return formatWithArgumentRanges(self._s[3399]!, self._r[3399]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3395]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3398]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3400]! } - public var DialogList_NoMessagesText: String { return self._s[3401]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3402]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3403]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3405]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3406]! } - public var Common_TakePhotoOrVideo: String { return self._s[3407]! } - public var Wallet_Words_Text: String { return self._s[3408]! } - public var Call_StatusBusy: String { return self._s[3409]! } - public var Conversation_PinnedMessage: String { return self._s[3410]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3411]! } - public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3412]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3413]! } - public var Undo_ChatCleared: String { return self._s[3414]! } - public var AppleWatch_ReplyPresets: String { return self._s[3415]! } - public var Passport_DiscardMessageDescription: String { return self._s[3417]! } - public var Login_NetworkError: String { return self._s[3418]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3400]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3403]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3405]! } + public var DialogList_NoMessagesText: String { return self._s[3406]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3407]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3408]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3410]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3411]! } + public var Common_TakePhotoOrVideo: String { return self._s[3412]! } + public var Wallet_Words_Text: String { return self._s[3413]! } + public var Call_StatusBusy: String { return self._s[3414]! } + public var Conversation_PinnedMessage: String { return self._s[3415]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3416]! } + public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3417]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3418]! } + public var Undo_ChatCleared: String { return self._s[3419]! } + public var AppleWatch_ReplyPresets: String { return self._s[3420]! } + public var Passport_DiscardMessageDescription: String { return self._s[3422]! } + public var Login_NetworkError: String { return self._s[3423]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3419]!, self._r[3419]!, [_0]) + return formatWithArgumentRanges(self._s[3424]!, self._r[3424]!, [_0]) } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3420]!, self._r[3420]!, [_0]) + return formatWithArgumentRanges(self._s[3425]!, self._r[3425]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3421]! } - public var Wallet_WordCheck_ViewWords: String { return self._s[3423]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3424]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3426]! } + public var Wallet_WordCheck_ViewWords: String { return self._s[3428]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3429]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3426]!, self._r[3426]!, [_0]) + return formatWithArgumentRanges(self._s[3431]!, self._r[3431]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[3427]! } - public var VoiceOver_Chat_Music: String { return self._s[3428]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3429]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3431]! } - public var ConversationMedia_Title: String { return self._s[3432]! } - public var EncryptionKey_Title: String { return self._s[3434]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3435]! } - public var Notification_Exceptions_AddException: String { return self._s[3436]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3437]! } - public var Profile_MessageLifetime1m: String { return self._s[3438]! } + public var Call_ConnectionErrorMessage: String { return self._s[3432]! } + public var VoiceOver_Chat_Music: String { return self._s[3433]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3434]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3436]! } + public var ConversationMedia_Title: String { return self._s[3437]! } + public var EncryptionKey_Title: String { return self._s[3439]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3440]! } + public var Notification_Exceptions_AddException: String { return self._s[3441]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3442]! } + public var Profile_MessageLifetime1m: String { return self._s[3443]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3439]!, self._r[3439]!, [_1]) + return formatWithArgumentRanges(self._s[3444]!, self._r[3444]!, [_1]) } - public var Month_GenMay: String { return self._s[3440]! } + public var Month_GenMay: String { return self._s[3445]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3441]!, self._r[3441]!, [_0]) + return formatWithArgumentRanges(self._s[3446]!, self._r[3446]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[3442]! } - public var Wallet_Send_AddressInfo: String { return self._s[3443]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3444]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3445]! } + public var PeopleNearby_Users: String { return self._s[3447]! } + public var Wallet_Send_AddressInfo: String { return self._s[3448]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3449]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3450]! } public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3447]!, self._r[3447]!, [_0]) + return formatWithArgumentRanges(self._s[3452]!, self._r[3452]!, [_0]) } - public var Conversation_EmptyPlaceholder: String { return self._s[3448]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3449]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3450]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3451]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3452]! } - public var Channel_JoinChannel: String { return self._s[3454]! } - public var Appearance_Animations: String { return self._s[3457]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3453]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3454]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3455]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3456]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3457]! } + public var Channel_JoinChannel: String { return self._s[3459]! } + public var Appearance_Animations: String { return self._s[3462]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3458]!, self._r[3458]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3463]!, self._r[3463]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[3460]! } - public var Appearance_ShareTheme: String { return self._s[3461]! } - public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3462]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3464]! } - public var Passport_Address_Street: String { return self._s[3465]! } - public var Conversation_AddContact: String { return self._s[3466]! } - public var Login_PhonePlaceholder: String { return self._s[3467]! } - public var Channel_Members_InviteLink: String { return self._s[3469]! } - public var Bot_Stop: String { return self._s[3470]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3472]! } - public var Notification_PassportValueAddress: String { return self._s[3473]! } - public var Month_ShortJuly: String { return self._s[3474]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3475]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3476]! } - public var Passport_Identity_ReverseSide: String { return self._s[3477]! } - public var Watch_Stickers_Recents: String { return self._s[3480]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3482]! } - public var Map_SendThisLocation: String { return self._s[3483]! } + public var Stickers_GroupStickers: String { return self._s[3465]! } + public var Appearance_ShareTheme: String { return self._s[3466]! } + public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3467]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3469]! } + public var Passport_Address_Street: String { return self._s[3470]! } + public var Conversation_AddContact: String { return self._s[3471]! } + public var Login_PhonePlaceholder: String { return self._s[3472]! } + public var Channel_Members_InviteLink: String { return self._s[3474]! } + public var Bot_Stop: String { return self._s[3475]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3477]! } + public var Notification_PassportValueAddress: String { return self._s[3478]! } + public var Month_ShortJuly: String { return self._s[3479]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3480]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3481]! } + public var Passport_Identity_ReverseSide: String { return self._s[3482]! } + public var Watch_Stickers_Recents: String { return self._s[3485]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3487]! } + public var Map_SendThisLocation: String { return self._s[3488]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3484]!, self._r[3484]!, [_0]) + return formatWithArgumentRanges(self._s[3489]!, self._r[3489]!, [_0]) } public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3485]!, self._r[3485]!, [_0]) + return formatWithArgumentRanges(self._s[3490]!, self._r[3490]!, [_0]) } - public var ConvertToSupergroup_Note: String { return self._s[3486]! } - public var Wallet_Intro_NotNow: String { return self._s[3487]! } + public var ConvertToSupergroup_Note: String { return self._s[3491]! } + public var Wallet_Intro_NotNow: String { return self._s[3492]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3488]!, self._r[3488]!, [_0]) + return formatWithArgumentRanges(self._s[3493]!, self._r[3493]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3489]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3494]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3490]!, self._r[3490]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3495]!, self._r[3495]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3492]! } - public var Wallpaper_SearchShort: String { return self._s[3493]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3495]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3496]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3497]! } + public var Login_CallRequestState3: String { return self._s[3497]! } + public var Wallpaper_SearchShort: String { return self._s[3498]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3500]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3501]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3502]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3498]!, self._r[3498]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3503]!, self._r[3503]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3499]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3503]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3504]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3508]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3504]!, self._r[3504]!, [_0]) + return formatWithArgumentRanges(self._s[3509]!, self._r[3509]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[3505]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3506]! } + public var Passport_CorrectErrors: String { return self._s[3510]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3511]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3507]!, self._r[3507]!, [_0]) + return formatWithArgumentRanges(self._s[3512]!, self._r[3512]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[3508]! } - public var Channel_DiscussionGroup: String { return self._s[3509]! } - public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3510]! } + public var Map_SendMyCurrentLocation: String { return self._s[3513]! } + public var Channel_DiscussionGroup: String { return self._s[3514]! } + public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3515]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3511]!, self._r[3511]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3516]!, self._r[3516]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[3512]! } - public var Permissions_NotificationsText_v0: String { return self._s[3513]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3514]! } - public var Appearance_AppIcon: String { return self._s[3515]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3516]! } - public var LoginPassword_FloodError: String { return self._s[3517]! } - public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3519]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3520]! } + public var SharedMedia_SearchNoResults: String { return self._s[3517]! } + public var Permissions_NotificationsText_v0: String { return self._s[3518]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3519]! } + public var Appearance_AppIcon: String { return self._s[3520]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3521]! } + public var LoginPassword_FloodError: String { return self._s[3522]! } + public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3524]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3525]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3521]!, self._r[3521]!, [_0]) - } - public var Passport_Language_bn: String { return self._s[3522]! } - public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3523]!, self._r[3523]!, [_0]) - } - public var ChatList_Context_Pin: String { return self._s[3524]! } - public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3525]!, self._r[3525]!, [_0]) - } - public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3526]!, self._r[3526]!, [_0]) } - public var Wallet_Navigation_Close: String { return self._s[3527]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3531]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3533]! } - public var Wallet_Month_GenDecember: String { return self._s[3534]! } - public var Contacts_PermissionsAllow: String { return self._s[3535]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3536]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3537]! } - public var WallpaperPreview_Pattern: String { return self._s[3538]! } - public var Paint_Duplicate: String { return self._s[3539]! } - public var Passport_Address_Country: String { return self._s[3540]! } - public var Notification_RenamedChannel: String { return self._s[3542]! } - public var ChatList_Context_Unmute: String { return self._s[3543]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3544]! } - public var Group_MessagePhotoUpdated: String { return self._s[3545]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3546]! } - public var Conversation_ContextMenuBan: String { return self._s[3547]! } - public var TwoStepAuth_EmailSent: String { return self._s[3548]! } - public var MessagePoll_NoVotes: String { return self._s[3549]! } - public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3550]! } - public var Passport_Language_is: String { return self._s[3551]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3553]! } - public var Tour_Text5: String { return self._s[3554]! } + public var Passport_Language_bn: String { return self._s[3527]! } + public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3528]!, self._r[3528]!, [_0]) + } + public var ChatList_Context_Pin: String { return self._s[3529]! } + public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3530]!, self._r[3530]!, [_0]) + } + public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3531]!, self._r[3531]!, [_0]) + } + public var Wallet_Navigation_Close: String { return self._s[3532]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3536]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3538]! } + public var Wallet_Month_GenDecember: String { return self._s[3539]! } + public var Contacts_PermissionsAllow: String { return self._s[3540]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3541]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3542]! } + public var WallpaperPreview_Pattern: String { return self._s[3543]! } + public var Paint_Duplicate: String { return self._s[3544]! } + public var Passport_Address_Country: String { return self._s[3545]! } + public var Notification_RenamedChannel: String { return self._s[3547]! } + public var ChatList_Context_Unmute: String { return self._s[3548]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3549]! } + public var Group_MessagePhotoUpdated: String { return self._s[3550]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3551]! } + public var Conversation_ContextMenuBan: String { return self._s[3552]! } + public var TwoStepAuth_EmailSent: String { return self._s[3553]! } + public var MessagePoll_NoVotes: String { return self._s[3554]! } + public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3555]! } + public var Passport_Language_is: String { return self._s[3556]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3558]! } + public var Tour_Text5: String { return self._s[3559]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3556]!, self._r[3556]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3561]!, self._r[3561]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3557]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3558]! } + public var Undo_SecretChatDeleted: String { return self._s[3562]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3563]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3559]!, self._r[3559]!, [_0]) + return formatWithArgumentRanges(self._s[3564]!, self._r[3564]!, [_0]) } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3560]! } - public var Paint_Edit: String { return self._s[3562]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3564]! } - public var Undo_DeletedGroup: String { return self._s[3566]! } - public var LoginPassword_ForgotPassword: String { return self._s[3567]! } - public var Wallet_WordImport_IncorrectTitle: String { return self._s[3568]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3569]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3565]! } + public var Paint_Edit: String { return self._s[3567]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3569]! } + public var Undo_DeletedGroup: String { return self._s[3571]! } + public var LoginPassword_ForgotPassword: String { return self._s[3572]! } + public var Wallet_WordImport_IncorrectTitle: String { return self._s[3573]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3574]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3570]!, self._r[3570]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3575]!, self._r[3575]!, [_0, _1]) } - public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3571]! } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3572]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3573]! } - public var Passport_Language_uz: String { return self._s[3574]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3575]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3576]! } - public var Map_StopLiveLocation: String { return self._s[3578]! } - public var VoiceOver_MessageContextSend: String { return self._s[3580]! } - public var PasscodeSettings_Help: String { return self._s[3581]! } - public var NotificationsSound_Input: String { return self._s[3582]! } - public var Share_Title: String { return self._s[3585]! } - public var LogoutOptions_Title: String { return self._s[3586]! } - public var Wallet_Send_AddressText: String { return self._s[3587]! } - public var Login_TermsOfServiceAgree: String { return self._s[3588]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3589]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3590]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3591]! } - public var EnterPasscode_EnterTitle: String { return self._s[3592]! } + public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3576]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3577]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3578]! } + public var Passport_Language_uz: String { return self._s[3579]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3580]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3581]! } + public var Map_StopLiveLocation: String { return self._s[3583]! } + public var VoiceOver_MessageContextSend: String { return self._s[3585]! } + public var PasscodeSettings_Help: String { return self._s[3586]! } + public var NotificationsSound_Input: String { return self._s[3587]! } + public var Share_Title: String { return self._s[3590]! } + public var LogoutOptions_Title: String { return self._s[3591]! } + public var Wallet_Send_AddressText: String { return self._s[3592]! } + public var Login_TermsOfServiceAgree: String { return self._s[3593]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3594]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3595]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3596]! } + public var EnterPasscode_EnterTitle: String { return self._s[3597]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3593]!, self._r[3593]!, [_0]) - } - public var Settings_CopyPhoneNumber: String { return self._s[3594]! } - public var Conversation_AddToContacts: String { return self._s[3595]! } - public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3596]!, self._r[3596]!, [_0]) - } - public var NotificationsSound_Keys: String { return self._s[3597]! } - public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3598]!, self._r[3598]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3599]! } - public var Message_Video: String { return self._s[3600]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3601]! } - public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3602]!, self._r[3602]!, [_1]) + public var Settings_CopyPhoneNumber: String { return self._s[3599]! } + public var Conversation_AddToContacts: String { return self._s[3600]! } + public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3601]!, self._r[3601]!, [_0]) } - public var Wallet_Receive_AmountInfo: String { return self._s[3605]! } + public var NotificationsSound_Keys: String { return self._s[3602]! } + public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3603]!, self._r[3603]!, [_0]) + } + public var Notification_MessageLifetime1w: String { return self._s[3604]! } + public var Message_Video: String { return self._s[3605]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3606]! } + public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3607]!, self._r[3607]!, [_1]) + } + public var Wallet_Receive_AmountInfo: String { return self._s[3610]! } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3606]!, self._r[3606]!, [_0]) + return formatWithArgumentRanges(self._s[3611]!, self._r[3611]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3607]!, self._r[3607]!, [_0]) + return formatWithArgumentRanges(self._s[3612]!, self._r[3612]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3608]! } + public var Passport_Language_mk: String { return self._s[3613]! } public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3609]!, self._r[3609]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3614]!, self._r[3614]!, [_1, _2, _3]) } - public var CreatePoll_CancelConfirmation: String { return self._s[3610]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3612]! } - public var PrivacyPolicy_Decline: String { return self._s[3613]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3614]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3615]! } - public var Permissions_SiriAllow_v0: String { return self._s[3617]! } - public var Wallet_Month_ShortAugust: String { return self._s[3618]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3619]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3615]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3617]! } + public var PrivacyPolicy_Decline: String { return self._s[3618]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3619]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3620]! } + public var Permissions_SiriAllow_v0: String { return self._s[3622]! } + public var Wallet_Month_ShortAugust: String { return self._s[3623]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3624]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3620]!, self._r[3620]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3625]!, self._r[3625]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3621]!, self._r[3621]!, [_0]) + return formatWithArgumentRanges(self._s[3626]!, self._r[3626]!, [_0]) } - public var Paint_Regular: String { return self._s[3622]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3623]! } - public var SocksProxySetup_ShareLink: String { return self._s[3624]! } - public var Wallet_Qr_Title: String { return self._s[3625]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3626]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3628]! } - public var Wallet_Settings_Configuration: String { return self._s[3629]! } - public var GroupInfo_InviteByLink: String { return self._s[3630]! } - public var MessageTimer_Custom: String { return self._s[3631]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3632]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3634]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3635]! } - public var VoiceOver_Chat_Selected: String { return self._s[3636]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3637]! } - public var Channel_Username_InvalidTaken: String { return self._s[3638]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3639]! } - public var Wallet_WordCheck_TryAgain: String { return self._s[3640]! } - public var Wallet_Info_TransactionPendingHeader: String { return self._s[3641]! } - public var Settings_ChatBackground: String { return self._s[3642]! } - public var Channel_Subscribers_Title: String { return self._s[3643]! } - public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3644]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3645]! } - public var Watch_ConnectionDescription: String { return self._s[3646]! } - public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3649]! } - public var IntentsSettings_SuggestBy: String { return self._s[3651]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3652]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3653]! } - public var Wallet_Send_TransactionInProgress: String { return self._s[3654]! } - public var EditProfile_Title: String { return self._s[3655]! } - public var NotificationsSound_Bamboo: String { return self._s[3657]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3659]! } - public var Login_SmsRequestState2: String { return self._s[3660]! } - public var Passport_Language_ar: String { return self._s[3661]! } + public var Paint_Regular: String { return self._s[3627]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3628]! } + public var SocksProxySetup_ShareLink: String { return self._s[3629]! } + public var Wallet_Qr_Title: String { return self._s[3630]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3631]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3633]! } + public var Wallet_Settings_Configuration: String { return self._s[3634]! } + public var GroupInfo_InviteByLink: String { return self._s[3635]! } + public var MessageTimer_Custom: String { return self._s[3636]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3637]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3639]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3640]! } + public var VoiceOver_Chat_Selected: String { return self._s[3641]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3642]! } + public var Channel_Username_InvalidTaken: String { return self._s[3643]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3644]! } + public var Wallet_WordCheck_TryAgain: String { return self._s[3645]! } + public var Wallet_Info_TransactionPendingHeader: String { return self._s[3646]! } + public var Settings_ChatBackground: String { return self._s[3647]! } + public var Channel_Subscribers_Title: String { return self._s[3648]! } + public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3649]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3650]! } + public var Watch_ConnectionDescription: String { return self._s[3651]! } + public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3654]! } + public var IntentsSettings_SuggestBy: String { return self._s[3656]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3657]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3658]! } + public var Wallet_Send_TransactionInProgress: String { return self._s[3659]! } + public var EditProfile_Title: String { return self._s[3660]! } + public var NotificationsSound_Bamboo: String { return self._s[3662]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3664]! } + public var Login_SmsRequestState2: String { return self._s[3665]! } + public var Passport_Language_ar: String { return self._s[3666]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3662]!, self._r[3662]!, [_0]) + return formatWithArgumentRanges(self._s[3667]!, self._r[3667]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3663]! } - public var Wallet_Created_Text: String { return self._s[3664]! } - public var Conversation_MessageDialogEdit: String { return self._s[3666]! } - public var Wallet_Created_Proceed: String { return self._s[3667]! } - public var Wallet_Words_Done: String { return self._s[3668]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3669]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3668]! } + public var Wallet_Created_Text: String { return self._s[3669]! } + public var Conversation_MessageDialogEdit: String { return self._s[3671]! } + public var Wallet_Created_Proceed: String { return self._s[3672]! } + public var Wallet_Words_Done: String { return self._s[3673]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3674]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3670]!, self._r[3670]!, [_1]) + return formatWithArgumentRanges(self._s[3675]!, self._r[3675]!, [_1]) } - public var Common_Close: String { return self._s[3671]! } - public var GroupInfo_PublicLink: String { return self._s[3672]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3673]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3674]! } + public var Common_Close: String { return self._s[3676]! } + public var GroupInfo_PublicLink: String { return self._s[3677]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3678]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3679]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3678]!, self._r[3678]!, [_0]) + return formatWithArgumentRanges(self._s[3683]!, self._r[3683]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3679]! } + public var UserInfo_About_Placeholder: String { return self._s[3684]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3680]!, self._r[3680]!, [_0]) + return formatWithArgumentRanges(self._s[3685]!, self._r[3685]!, [_0]) } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3681]! } - public var Channel_Info_Banned: String { return self._s[3683]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3686]! } + public var Channel_Info_Banned: String { return self._s[3688]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3684]!, self._r[3684]!, [_0]) + return formatWithArgumentRanges(self._s[3689]!, self._r[3689]!, [_0]) } - public var Appearance_Other: String { return self._s[3685]! } - public var Passport_Language_my: String { return self._s[3686]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3687]! } + public var Appearance_Other: String { return self._s[3690]! } + public var Passport_Language_my: String { return self._s[3691]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3692]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3688]!, self._r[3688]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3693]!, self._r[3693]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3689]! } - public var Preview_CopyAddress: String { return self._s[3690]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3694]! } + public var Preview_CopyAddress: String { return self._s[3695]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3691]!, self._r[3691]!, [_0]) + return formatWithArgumentRanges(self._s[3696]!, self._r[3696]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3692]! } - public var UserInfo_BotSettings: String { return self._s[3693]! } - public var LiveLocation_MenuStopAll: String { return self._s[3695]! } - public var Passport_PasswordCreate: String { return self._s[3696]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3697]! } - public var Message_PinnedLocationMessage: String { return self._s[3698]! } - public var Map_Satellite: String { return self._s[3699]! } - public var Watch_Message_Unsupported: String { return self._s[3700]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3701]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3702]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3697]! } + public var UserInfo_BotSettings: String { return self._s[3698]! } + public var LiveLocation_MenuStopAll: String { return self._s[3700]! } + public var Passport_PasswordCreate: String { return self._s[3701]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3702]! } + public var Message_PinnedLocationMessage: String { return self._s[3703]! } + public var Map_Satellite: String { return self._s[3704]! } + public var Watch_Message_Unsupported: String { return self._s[3705]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3706]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3707]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3703]!, self._r[3703]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3708]!, self._r[3708]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3704]!, self._r[3704]!, [_0]) + return formatWithArgumentRanges(self._s[3709]!, self._r[3709]!, [_0]) } - public var Wallet_WordImport_Continue: String { return self._s[3705]! } + public var Wallet_WordImport_Continue: String { return self._s[3710]! } public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3706]!, self._r[3706]!, [_0]) + return formatWithArgumentRanges(self._s[3711]!, self._r[3711]!, [_0]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3707]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3708]! } - public var NotificationsSound_None: String { return self._s[3709]! } - public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3710]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3712]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3713]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3712]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3713]! } + public var NotificationsSound_None: String { return self._s[3714]! } + public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3715]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3717]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3718]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3714]!, self._r[3714]!, [_1]) + return formatWithArgumentRanges(self._s[3719]!, self._r[3719]!, [_1]) } - public var Cache_Indexing: String { return self._s[3715]! } - public var DialogList_RecentTitlePeople: String { return self._s[3717]! } - public var DialogList_EncryptionRejected: String { return self._s[3718]! } - public var GroupInfo_Administrators: String { return self._s[3719]! } - public var Passport_ScanPassportHelp: String { return self._s[3720]! } - public var Application_Name: String { return self._s[3721]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3722]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3724]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3725]! } + public var Cache_Indexing: String { return self._s[3720]! } + public var DialogList_RecentTitlePeople: String { return self._s[3722]! } + public var DialogList_EncryptionRejected: String { return self._s[3723]! } + public var GroupInfo_Administrators: String { return self._s[3724]! } + public var Passport_ScanPassportHelp: String { return self._s[3725]! } + public var Application_Name: String { return self._s[3726]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3727]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3729]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3730]! } public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3726]!, self._r[3726]!, [_0]) + return formatWithArgumentRanges(self._s[3731]!, self._r[3731]!, [_0]) } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3727]!, self._r[3727]!, [_0]) + return formatWithArgumentRanges(self._s[3732]!, self._r[3732]!, [_0]) } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3728]!, self._r[3728]!, [_0]) + return formatWithArgumentRanges(self._s[3733]!, self._r[3733]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3729]! } - public var Privacy_ChatsTitle: String { return self._s[3730]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3731]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3732]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3733]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3734]! } - public var WebBrowser_Title: String { return self._s[3735]! } - public var Group_LinkedChannel: String { return self._s[3736]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3737]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3738]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3739]! } - public var Appearance_TextSize_UseSystem: String { return self._s[3740]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3741]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3743]! } - public var Channel_Setup_TypePublic: String { return self._s[3745]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3734]! } + public var Privacy_ChatsTitle: String { return self._s[3735]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3736]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3737]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3738]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3739]! } + public var WebBrowser_Title: String { return self._s[3740]! } + public var Group_LinkedChannel: String { return self._s[3741]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3742]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3743]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3744]! } + public var Appearance_TextSize_UseSystem: String { return self._s[3745]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3746]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3748]! } + public var Channel_Setup_TypePublic: String { return self._s[3750]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3746]!, self._r[3746]!, [_0]) + return formatWithArgumentRanges(self._s[3751]!, self._r[3751]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3748]! } - public var Map_OpenInMaps: String { return self._s[3750]! } + public var Channel_TypeSetup_Title: String { return self._s[3753]! } + public var Map_OpenInMaps: String { return self._s[3755]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3751]!, self._r[3751]!, [_1]) + return formatWithArgumentRanges(self._s[3756]!, self._r[3756]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3753]! } + public var NotificationsSound_Tremolo: String { return self._s[3758]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3754]!, self._r[3754]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3759]!, self._r[3759]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3755]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3756]! } - public var Passport_PasswordHelp: String { return self._s[3757]! } - public var Login_CodeExpiredError: String { return self._s[3758]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3759]! } - public var Conversation_TitleUnmute: String { return self._s[3760]! } - public var Passport_Identity_ScansHelp: String { return self._s[3761]! } - public var Passport_Language_lo: String { return self._s[3762]! } - public var Camera_FlashAuto: String { return self._s[3763]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3764]! } - public var Common_Cancel: String { return self._s[3765]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3766]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3767]! } - public var Appearance_TintAllColors: String { return self._s[3768]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3760]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3761]! } + public var Passport_PasswordHelp: String { return self._s[3762]! } + public var Login_CodeExpiredError: String { return self._s[3763]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3764]! } + public var Conversation_TitleUnmute: String { return self._s[3765]! } + public var Passport_Identity_ScansHelp: String { return self._s[3766]! } + public var Passport_Language_lo: String { return self._s[3767]! } + public var Camera_FlashAuto: String { return self._s[3768]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3769]! } + public var Common_Cancel: String { return self._s[3770]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3771]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3772]! } + public var Appearance_TintAllColors: String { return self._s[3773]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3769]!, self._r[3769]!, [_1]) + return formatWithArgumentRanges(self._s[3774]!, self._r[3774]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3770]! } - public var ChatSettings_Title: String { return self._s[3772]! } - public var Passport_PasswordReset: String { return self._s[3773]! } - public var SocksProxySetup_TypeNone: String { return self._s[3774]! } - public var EditTheme_Title: String { return self._s[3776]! } - public var PhoneNumberHelp_Help: String { return self._s[3777]! } - public var Checkout_EnterPassword: String { return self._s[3778]! } - public var Share_AuthTitle: String { return self._s[3780]! } - public var Activity_UploadingDocument: String { return self._s[3781]! } - public var State_Connecting: String { return self._s[3782]! } - public var Profile_MessageLifetime1w: String { return self._s[3783]! } - public var Conversation_ContextMenuReport: String { return self._s[3784]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3785]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3786]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3775]! } + public var ChatSettings_Title: String { return self._s[3777]! } + public var Passport_PasswordReset: String { return self._s[3778]! } + public var SocksProxySetup_TypeNone: String { return self._s[3779]! } + public var EditTheme_Title: String { return self._s[3781]! } + public var PhoneNumberHelp_Help: String { return self._s[3782]! } + public var Checkout_EnterPassword: String { return self._s[3783]! } + public var Share_AuthTitle: String { return self._s[3785]! } + public var Activity_UploadingDocument: String { return self._s[3786]! } + public var State_Connecting: String { return self._s[3787]! } + public var Profile_MessageLifetime1w: String { return self._s[3788]! } + public var Conversation_ContextMenuReport: String { return self._s[3789]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3790]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3791]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3787]!, self._r[3787]!, [_0]) + return formatWithArgumentRanges(self._s[3792]!, self._r[3792]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3788]! } - public var Wallet_WordImport_CanNotRemember: String { return self._s[3789]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3791]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3792]! } - public var PhotoEditor_Set: String { return self._s[3793]! } - public var EmptyGroupInfo_Title: String { return self._s[3794]! } - public var Login_PadPhoneHelp: String { return self._s[3795]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3797]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3799]! } - public var NotificationsSound_Complete: String { return self._s[3800]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3801]! } - public var Group_Info_AdminLog: String { return self._s[3802]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3803]! } + public var AuthSessions_Terminate: String { return self._s[3793]! } + public var Wallet_WordImport_CanNotRemember: String { return self._s[3794]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3796]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3797]! } + public var PhotoEditor_Set: String { return self._s[3798]! } + public var EmptyGroupInfo_Title: String { return self._s[3799]! } + public var Login_PadPhoneHelp: String { return self._s[3800]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3802]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3804]! } + public var NotificationsSound_Complete: String { return self._s[3805]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3806]! } + public var Group_Info_AdminLog: String { return self._s[3807]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3808]! } public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3804]!, self._r[3804]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3809]!, self._r[3809]!, [_1, _2, _3]) } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3805]! } - public var Group_Location_CreateInThisPlace: String { return self._s[3807]! } - public var Conversation_Admin: String { return self._s[3808]! } - public var Conversation_GifTooltip: String { return self._s[3809]! } - public var Passport_NotLoggedInMessage: String { return self._s[3810]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3810]! } + public var Group_Location_CreateInThisPlace: String { return self._s[3812]! } + public var Conversation_Admin: String { return self._s[3813]! } + public var Conversation_GifTooltip: String { return self._s[3814]! } + public var Passport_NotLoggedInMessage: String { return self._s[3815]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3812]!, self._r[3812]!, [_0]) + return formatWithArgumentRanges(self._s[3817]!, self._r[3817]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3813]! } - public var SharedMedia_EmptyTitle: String { return self._s[3815]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3817]! } - public var Username_Help: String { return self._s[3818]! } - public var DialogList_LanguageTooltip: String { return self._s[3820]! } - public var Map_LoadError: String { return self._s[3821]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3822]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3823]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3824]! } - public var Notification_Exceptions_NewException: String { return self._s[3825]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3826]! } - public var WatchRemote_AlertText: String { return self._s[3827]! } + public var Profile_MessageLifetimeForever: String { return self._s[3818]! } + public var SharedMedia_EmptyTitle: String { return self._s[3820]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3822]! } + public var Username_Help: String { return self._s[3823]! } + public var DialogList_LanguageTooltip: String { return self._s[3825]! } + public var Map_LoadError: String { return self._s[3826]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3827]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3828]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3829]! } + public var Notification_Exceptions_NewException: String { return self._s[3830]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3831]! } + public var WatchRemote_AlertText: String { return self._s[3832]! } public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3828]!, self._r[3828]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3833]!, self._r[3833]!, [_1, _2, _3]) } - public var ChatSettings_ConnectionType_Title: String { return self._s[3832]! } - public var WebBrowser_DefaultBrowser: String { return self._s[3833]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3837]! } + public var WebBrowser_DefaultBrowser: String { return self._s[3838]! } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_0]) + return formatWithArgumentRanges(self._s[3839]!, self._r[3839]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3835]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3836]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3840]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3841]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3837]!, self._r[3837]!, [_0]) + return formatWithArgumentRanges(self._s[3842]!, self._r[3842]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3838]!, self._r[3838]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3843]!, self._r[3843]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3839]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3840]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3842]! } - public var Wallet_Created_ExportErrorText: String { return self._s[3843]! } - public var ChatList_UndoArchiveText1: String { return self._s[3844]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3845]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3846]! } - public var Cache_ClearNone: String { return self._s[3847]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3848]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3849]! } + public var Group_AdminLog_EmptyText: String { return self._s[3844]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3845]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3847]! } + public var Wallet_Created_ExportErrorText: String { return self._s[3848]! } + public var ChatList_UndoArchiveText1: String { return self._s[3849]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3850]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3851]! } + public var Cache_ClearNone: String { return self._s[3852]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3853]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3854]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3850]!, self._r[3850]!, [_0]) + return formatWithArgumentRanges(self._s[3855]!, self._r[3855]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[3851]! } + public var Passport_Identity_Country: String { return self._s[3856]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3852]!, self._r[3852]!, [_0]) + return formatWithArgumentRanges(self._s[3857]!, self._r[3857]!, [_0]) } public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3853]!, self._r[3853]!, [_0]) + return formatWithArgumentRanges(self._s[3858]!, self._r[3858]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3854]! } - public var AccessDenied_Settings: String { return self._s[3855]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3856]! } - public var Month_ShortMay: String { return self._s[3857]! } - public var Compose_NewGroup: String { return self._s[3859]! } - public var Group_Setup_TypePrivate: String { return self._s[3861]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3863]! } - public var Appearance_ThemeDayClassic: String { return self._s[3864]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3865]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3866]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3867]! } - public var Conversation_typing: String { return self._s[3869]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[3870]! } - public var Paint_Masks: String { return self._s[3871]! } - public var Contacts_DeselectAll: String { return self._s[3872]! } + public var Exceptions_AddToExceptions: String { return self._s[3859]! } + public var AccessDenied_Settings: String { return self._s[3860]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3861]! } + public var Month_ShortMay: String { return self._s[3862]! } + public var Compose_NewGroup: String { return self._s[3864]! } + public var Group_Setup_TypePrivate: String { return self._s[3866]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3868]! } + public var Appearance_ThemeDayClassic: String { return self._s[3869]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3870]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3871]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3872]! } + public var Conversation_typing: String { return self._s[3874]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[3875]! } + public var Paint_Masks: String { return self._s[3876]! } + public var Contacts_DeselectAll: String { return self._s[3877]! } public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3873]!, self._r[3873]!, [_0]) + return formatWithArgumentRanges(self._s[3878]!, self._r[3878]!, [_0]) } - public var Username_InvalidTaken: String { return self._s[3874]! } - public var Call_StatusNoAnswer: String { return self._s[3875]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3876]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3877]! } - public var Passport_Identity_Selfie: String { return self._s[3878]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3879]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3880]! } - public var Conversation_ClearSecretHistory: String { return self._s[3881]! } - public var PeopleNearby_Description: String { return self._s[3883]! } - public var NetworkUsageSettings_Title: String { return self._s[3884]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3886]! } + public var Username_InvalidTaken: String { return self._s[3879]! } + public var Call_StatusNoAnswer: String { return self._s[3880]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[3881]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3882]! } + public var Passport_Identity_Selfie: String { return self._s[3883]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[3884]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3885]! } + public var Conversation_ClearSecretHistory: String { return self._s[3886]! } + public var PeopleNearby_Description: String { return self._s[3888]! } + public var NetworkUsageSettings_Title: String { return self._s[3889]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3891]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3888]!, self._r[3888]!, [_0]) + return formatWithArgumentRanges(self._s[3893]!, self._r[3893]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3889]!, self._r[3889]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3894]!, self._r[3894]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[3891]! } - public var VoiceOver_Navigation_Search: String { return self._s[3892]! } - public var Map_LiveLocationTitle: String { return self._s[3893]! } - public var Login_InfoAvatarAdd: String { return self._s[3894]! } - public var Passport_Identity_FilesView: String { return self._s[3895]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[3896]! } - public var Privacy_Calls_NeverAllow: String { return self._s[3897]! } - public var VoiceOver_Chat_File: String { return self._s[3898]! } - public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3899]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[3896]! } + public var VoiceOver_Navigation_Search: String { return self._s[3897]! } + public var Map_LiveLocationTitle: String { return self._s[3898]! } + public var Login_InfoAvatarAdd: String { return self._s[3899]! } + public var Passport_Identity_FilesView: String { return self._s[3900]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[3901]! } + public var Privacy_Calls_NeverAllow: String { return self._s[3902]! } + public var VoiceOver_Chat_File: String { return self._s[3903]! } + public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3904]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3900]!, self._r[3900]!, [_0]) + return formatWithArgumentRanges(self._s[3905]!, self._r[3905]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[3901]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[3902]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3903]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[3906]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[3907]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3908]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3904]!, self._r[3904]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3909]!, self._r[3909]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3905]! } - public var Wallet_Intro_CreateErrorText: String { return self._s[3906]! } - public var Tour_Title2: String { return self._s[3907]! } - public var Wallet_Sent_ViewWallet: String { return self._s[3908]! } - public var Conversation_FileOpenIn: String { return self._s[3909]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3910]! } - public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3911]! } - public var Wallpaper_Set: String { return self._s[3912]! } - public var Passport_Identity_Translations: String { return self._s[3914]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3910]! } + public var Wallet_Intro_CreateErrorText: String { return self._s[3911]! } + public var Tour_Title2: String { return self._s[3912]! } + public var Wallet_Sent_ViewWallet: String { return self._s[3913]! } + public var Conversation_FileOpenIn: String { return self._s[3914]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3915]! } + public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3916]! } + public var Wallpaper_Set: String { return self._s[3917]! } + public var Passport_Identity_Translations: String { return self._s[3919]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3915]!, self._r[3915]!, [_0]) + return formatWithArgumentRanges(self._s[3920]!, self._r[3920]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[3916]! } + public var Channel_LeaveChannel: String { return self._s[3921]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3917]!, self._r[3917]!, [_1]) + return formatWithArgumentRanges(self._s[3922]!, self._r[3922]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3919]! } - public var PhotoEditor_HighlightsTint: String { return self._s[3920]! } - public var Passport_Email_Delete: String { return self._s[3921]! } - public var Conversation_Mute: String { return self._s[3923]! } - public var Channel_AddBotAsAdmin: String { return self._s[3924]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[3926]! } - public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[3927]! } - public var Channel_Management_LabelOwner: String { return self._s[3929]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3924]! } + public var PhotoEditor_HighlightsTint: String { return self._s[3925]! } + public var Passport_Email_Delete: String { return self._s[3926]! } + public var Conversation_Mute: String { return self._s[3928]! } + public var Channel_AddBotAsAdmin: String { return self._s[3929]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[3931]! } + public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[3932]! } + public var ChatSettings_IntentsSettings: String { return self._s[3934]! } + public var Channel_Management_LabelOwner: String { return self._s[3935]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3930]!, self._r[3930]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3936]!, self._r[3936]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[3931]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[3932]! } - public var Common_No: String { return self._s[3933]! } - public var Weekday_Sunday: String { return self._s[3934]! } - public var Notification_Reply: String { return self._s[3935]! } - public var Conversation_ViewMessage: String { return self._s[3936]! } + public var Calls_CallTabDescription: String { return self._s[3937]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[3938]! } + public var Common_No: String { return self._s[3939]! } + public var Weekday_Sunday: String { return self._s[3940]! } + public var Notification_Reply: String { return self._s[3941]! } + public var Conversation_ViewMessage: String { return self._s[3942]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3937]!, self._r[3937]!, [_0]) + return formatWithArgumentRanges(self._s[3943]!, self._r[3943]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3938]!, self._r[3938]!, [_0]) + return formatWithArgumentRanges(self._s[3944]!, self._r[3944]!, [_0]) } public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3939]!, self._r[3939]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3945]!, self._r[3945]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3940]! } - public var Wallet_Send_Title: String { return self._s[3941]! } - public var Message_PinnedDocumentMessage: String { return self._s[3942]! } - public var Wallet_Info_RefreshErrorText: String { return self._s[3943]! } - public var DialogList_TabTitle: String { return self._s[3945]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[3946]! } - public var Passport_FieldEmail: String { return self._s[3947]! } - public var Conversation_UnpinMessageAlert: String { return self._s[3948]! } - public var Passport_Address_TypeBankStatement: String { return self._s[3949]! } - public var Wallet_SecureStorageReset_Title: String { return self._s[3950]! } - public var Passport_Identity_ExpiryDate: String { return self._s[3951]! } - public var Privacy_Calls_P2P: String { return self._s[3952]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3946]! } + public var Wallet_Send_Title: String { return self._s[3947]! } + public var Message_PinnedDocumentMessage: String { return self._s[3948]! } + public var Wallet_Info_RefreshErrorText: String { return self._s[3949]! } + public var DialogList_TabTitle: String { return self._s[3951]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[3952]! } + public var Passport_FieldEmail: String { return self._s[3953]! } + public var Conversation_UnpinMessageAlert: String { return self._s[3954]! } + public var Passport_Address_TypeBankStatement: String { return self._s[3955]! } + public var Wallet_SecureStorageReset_Title: String { return self._s[3956]! } + public var Passport_Identity_ExpiryDate: String { return self._s[3957]! } + public var Privacy_Calls_P2P: String { return self._s[3958]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3954]!, self._r[3954]!, [_0]) + return formatWithArgumentRanges(self._s[3960]!, self._r[3960]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[3955]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[3961]! } public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3956]!, self._r[3956]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3962]!, self._r[3962]!, [_1, _2]) } - public var Stickers_ClearRecent: String { return self._s[3957]! } - public var EnterPasscode_ChangeTitle: String { return self._s[3958]! } - public var TwoFactorSetup_Email_Title: String { return self._s[3959]! } - public var Passport_InfoText: String { return self._s[3960]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3961]! } + public var Stickers_ClearRecent: String { return self._s[3963]! } + public var EnterPasscode_ChangeTitle: String { return self._s[3964]! } + public var TwoFactorSetup_Email_Title: String { return self._s[3965]! } + public var Passport_InfoText: String { return self._s[3966]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3967]! } public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3962]!, self._r[3962]!, [_0]) + return formatWithArgumentRanges(self._s[3968]!, self._r[3968]!, [_0]) } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3963]!, self._r[3963]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3969]!, self._r[3969]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3964]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[3965]! } - public var VoiceOver_Navigation_Compose: String { return self._s[3966]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[3967]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[3969]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3970]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3970]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[3971]! } + public var VoiceOver_Navigation_Compose: String { return self._s[3972]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[3973]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[3975]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3976]! } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3971]!, self._r[3971]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3977]!, self._r[3977]!, [_1, _2]) } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3973]! } - public var ChatSettings_OpenLinksIn: String { return self._s[3974]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3979]! } + public var ChatSettings_OpenLinksIn: String { return self._s[3980]! } + public var Map_HomeAndWorkTitle: String { return self._s[3981]! } public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3976]!, self._r[3976]!, [_0]) + return formatWithArgumentRanges(self._s[3983]!, self._r[3983]!, [_0]) } - public var DialogList_Unread: String { return self._s[3977]! } + public var DialogList_Unread: String { return self._s[3984]! } public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3978]!, self._r[3978]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3985]!, self._r[3985]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[3979]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3980]! } + public var User_DeletedAccount: String { return self._s[3986]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3987]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3981]!, self._r[3981]!, [_0]) + return formatWithArgumentRanges(self._s[3988]!, self._r[3988]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[3982]! } - public var SharedMedia_CategoryMedia: String { return self._s[3983]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3984]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3985]! } - public var Watch_ChatList_Compose: String { return self._s[3986]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3987]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[3988]! } - public var Watch_Microphone_Access: String { return self._s[3989]! } - public var Group_Setup_HistoryHeader: String { return self._s[3990]! } - public var Map_SetThisLocation: String { return self._s[3991]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3992]! } - public var Activity_UploadingPhoto: String { return self._s[3993]! } - public var Conversation_Edit: String { return self._s[3995]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[3996]! } - public var Login_TermsOfServiceDecline: String { return self._s[3997]! } - public var Message_PinnedContactMessage: String { return self._s[3998]! } + public var UserInfo_NotificationsDefault: String { return self._s[3989]! } + public var SharedMedia_CategoryMedia: String { return self._s[3990]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3991]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3992]! } + public var Watch_ChatList_Compose: String { return self._s[3993]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3994]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[3995]! } + public var Watch_Microphone_Access: String { return self._s[3996]! } + public var Group_Setup_HistoryHeader: String { return self._s[3997]! } + public var Map_SetThisLocation: String { return self._s[3998]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3999]! } + public var Activity_UploadingPhoto: String { return self._s[4000]! } + public var Conversation_Edit: String { return self._s[4002]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[4003]! } + public var Login_TermsOfServiceDecline: String { return self._s[4004]! } + public var Message_PinnedContactMessage: String { return self._s[4005]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3999]!, self._r[3999]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4006]!, self._r[4006]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4000]!, self._r[4000]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[4007]!, self._r[4007]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[4001]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[4003]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4004]! } + public var Appearance_LargeEmoji: String { return self._s[4008]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[4010]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4011]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4005]!, self._r[4005]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4012]!, self._r[4012]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[4006]! } - public var Message_PinnedPhotoMessage: String { return self._s[4007]! } - public var Passport_FieldPhone: String { return self._s[4008]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4009]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[4010]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[4012]! } - public var Conversation_Call: String { return self._s[4013]! } - public var Common_TakePhoto: String { return self._s[4015]! } - public var Group_EditAdmin_RankTitle: String { return self._s[4016]! } - public var Wallet_Receive_CommentHeader: String { return self._s[4017]! } - public var Channel_NotificationLoading: String { return self._s[4018]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[4013]! } + public var Message_PinnedPhotoMessage: String { return self._s[4014]! } + public var Passport_FieldPhone: String { return self._s[4015]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4016]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[4017]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[4019]! } + public var Conversation_Call: String { return self._s[4020]! } + public var Common_TakePhoto: String { return self._s[4022]! } + public var Group_EditAdmin_RankTitle: String { return self._s[4023]! } + public var Wallet_Receive_CommentHeader: String { return self._s[4024]! } + public var Channel_NotificationLoading: String { return self._s[4025]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4019]!, self._r[4019]!, [_0]) + return formatWithArgumentRanges(self._s[4026]!, self._r[4026]!, [_0]) } public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4020]!, self._r[4020]!, [_0]) + return formatWithArgumentRanges(self._s[4027]!, self._r[4027]!, [_0]) } public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4021]!, self._r[4021]!, [_1]) + return formatWithArgumentRanges(self._s[4028]!, self._r[4028]!, [_1]) } - public var Permissions_SiriTitle_v0: String { return self._s[4022]! } + public var Permissions_SiriTitle_v0: String { return self._s[4029]! } public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4023]!, self._r[4023]!, [_0]) + return formatWithArgumentRanges(self._s[4030]!, self._r[4030]!, [_0]) } public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4024]!, self._r[4024]!, [_0]) + return formatWithArgumentRanges(self._s[4031]!, self._r[4031]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[4025]! } - public var Wallet_Info_ReceiveGrams: String { return self._s[4026]! } - public var ClearCache_FreeSpace: String { return self._s[4027]! } - public var Common_edit: String { return self._s[4028]! } - public var PrivacySettings_AuthSessions: String { return self._s[4029]! } - public var Month_ShortJune: String { return self._s[4030]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4031]! } - public var Call_ReportSend: String { return self._s[4032]! } - public var Watch_LastSeen_JustNow: String { return self._s[4033]! } - public var Notifications_MessageNotifications: String { return self._s[4034]! } - public var WallpaperSearch_ColorGreen: String { return self._s[4035]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[4037]! } - public var Group_Status: String { return self._s[4038]! } + public var Channel_MessagePhotoRemoved: String { return self._s[4032]! } + public var Wallet_Info_ReceiveGrams: String { return self._s[4033]! } + public var ClearCache_FreeSpace: String { return self._s[4034]! } + public var Common_edit: String { return self._s[4035]! } + public var PrivacySettings_AuthSessions: String { return self._s[4036]! } + public var Month_ShortJune: String { return self._s[4037]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4038]! } + public var Call_ReportSend: String { return self._s[4039]! } + public var Watch_LastSeen_JustNow: String { return self._s[4040]! } + public var Notifications_MessageNotifications: String { return self._s[4041]! } + public var WallpaperSearch_ColorGreen: String { return self._s[4042]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[4044]! } + public var Group_Status: String { return self._s[4045]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4039]!, self._r[4039]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4046]!, self._r[4046]!, [_0, _1]) } - public var TextFormat_AddLinkTitle: String { return self._s[4040]! } - public var ShareMenu_ShareTo: String { return self._s[4041]! } - public var Conversation_Moderate_Ban: String { return self._s[4042]! } + public var TextFormat_AddLinkTitle: String { return self._s[4047]! } + public var ShareMenu_ShareTo: String { return self._s[4048]! } + public var Conversation_Moderate_Ban: String { return self._s[4049]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4043]!, self._r[4043]!, [_0]) + return formatWithArgumentRanges(self._s[4050]!, self._r[4050]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[4044]! } - public var Map_LiveLocationFor8Hours: String { return self._s[4045]! } + public var SharedMedia_ViewInChat: String { return self._s[4051]! } + public var Map_LiveLocationFor8Hours: String { return self._s[4052]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4046]!, self._r[4046]!, [_1]) + return formatWithArgumentRanges(self._s[4053]!, self._r[4053]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4047]!, self._r[4047]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4054]!, self._r[4054]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4049]!, self._r[4049]!, [_0]) + return formatWithArgumentRanges(self._s[4056]!, self._r[4056]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[4050]! } - public var Appearance_ReduceMotion: String { return self._s[4051]! } + public var Map_OpenInHereMaps: String { return self._s[4057]! } + public var Appearance_ReduceMotion: String { return self._s[4058]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4052]!, self._r[4052]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4059]!, self._r[4059]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[4053]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[4054]! } - public var PhotoEditor_Skip: String { return self._s[4055]! } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[4060]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[4061]! } + public var PhotoEditor_Skip: String { return self._s[4062]! } + public func ForwardedGifs(_ 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 Conversation_StatusSubscribers(_ value: Int32) -> String { + public func ServiceMessage_GameScoreSelfSimple(_ 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 ForwardedLocations(_ 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 PUSH_MESSAGE_ROUNDS(_ 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 PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, _1, _2) } 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[3 * 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[4 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Theme_UsersCount(_ 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 PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func AttachmentMenu_SendVideo(_ 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 MuteExpires_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 Conversation_StatusMembers(_ 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 ServiceMessage_GameScoreExtended(_ 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_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[11 * 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[12 * 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[13 * 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[14 * 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[15 * 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[16 * 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[17 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_MinutesAgo(_ 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 LastSeen_HoursAgo(_ 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 PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedPolls(_ 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 ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func LiveLocation_MenuChatsCount(_ 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 MessageTimer_Days(_ 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 MuteFor_Hours(_ 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 StickerPack_AddMaskCount(_ 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 Call_ShortSeconds(_ 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 MessageTimer_ShortWeeks(_ 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 SharedMedia_Photo(_ 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 MessageTimer_ShortDays(_ 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 Chat_DeleteMessagesConfirmation(_ 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 SharedMedia_Video(_ 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 MessageTimer_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedMessages(_ 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) - } - public func Media_ShareItem(_ 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) - } - 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 ForwardedStickers(_ 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 ServiceMessage_GameScoreSimple(_ 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_FWDS(_ 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 PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Conversation_SelectedMessages(_ 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 MuteFor_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 ForwardedAudios(_ 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) + return String(format: self._ps[4 * 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[45 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) } public func Notification_GameScoreSelfExtended(_ 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 MessageTimer_Years(_ 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 ForwardedFiles(_ 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 Call_ShortMinutes(_ 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 VoiceOver_Chat_PollVotes(_ 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 PasscodeSettings_FailedAttempts(_ 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 Map_ETAHours(_ 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) - } - public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[54 * 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[55 * 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[56 * 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[57 * 6 + Int(form.rawValue)]!, _1, _2) - } - 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[58 * 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[59 * 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[60 * 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[61 * 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[62 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedGifs(_ 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 MessageTimer_Months(_ 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 PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[66 * 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[67 * 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[68 * 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[69 * 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[70 * 6 + Int(form.rawValue)]!, stringValue) - } - public func GroupInfo_ShowMoreMembers(_ 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 Notification_GameScoreSimple(_ 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_SendGif(_ 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_ShortHours(_ 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 ChatList_DeletedChats(_ 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 PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) } public func MessageTimer_ShortMinutes(_ 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 LiveLocationUpdated_MinutesAgo(_ 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 ForwardedVideoMessages(_ 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 ServiceMessage_GameScoreSelfSimple(_ 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 ForwardedPhotos(_ 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) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) } public func UserCount(_ 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) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Seconds(_ 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[83 * 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[84 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Hours(_ 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 Notification_GameScoreExtended(_ 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 PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_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 Media_ShareVideo(_ 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 SharedMedia_Generic(_ 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 Notifications_Exceptions(_ 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 Media_SharePhoto(_ 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 ServiceMessage_GameScoreSelfExtended(_ 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 MessagePoll_VotedCount(_ 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[9 * 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[96 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[10 * 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[97 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func SharedMedia_Link(_ 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[98 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) } - public func Call_Minutes(_ value: Int32) -> String { + public func Notification_GameScoreExtended(_ 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 Map_ETAMinutes(_ 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 Call_Seconds(_ 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 Conversation_LiveLocationMembersCount(_ 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 PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Notification_GameScoreSelfSimple(_ 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 SharedMedia_File(_ 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 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) - } - public func AttachmentMenu_SendPhoto(_ 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 MuteExpires_Hours(_ 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) - } - public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[12 * 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[110 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) } - public func StickerPack_RemoveMaskCount(_ 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[111 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[14 * 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[15 * 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[16 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedContacts(_ 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 DialogList_LiveLocationChatsCount(_ 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 Chat_DeleteMessagesConfirmation(_ 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 PrivacyLastSeenSettings_AddUsers(_ 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 ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, _0, _1) + } + 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[23 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortSeconds(_ 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 ChatList_DeleteConfirmation(_ 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 Call_Seconds(_ 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 PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, _1, _2) } public func MuteExpires_Minutes(_ 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) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) } - public func Invitation_Members(_ 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[113 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) } - public func Passport_Scans(_ value: Int32) -> String { + public func Map_ETAHours(_ 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) + return String(format: self._ps[31 * 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[32 * 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[33 * 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[34 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_LiveLocationMembersCount(_ 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) + } + public func MessageTimer_Seconds(_ 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) + } + public func StickerPack_AddMaskCount(_ 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 Conversation_SelectedMessages(_ 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 MessageTimer_Days(_ 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_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ChatList_SelectedChats(_ 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 VoiceOver_Chat_ContactEmailCount(_ 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 StickerPack_AddStickerCount(_ 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) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: 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[44 * 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[45 * 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[46 * 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[47 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ 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) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func AttachmentMenu_SendItem(_ 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 VoiceOver_Chat_PollVotes(_ 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 VoiceOver_Chat_ContactPhoneNumberCount(_ 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 MessageTimer_Hours(_ 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 StickerPack_RemoveMaskCount(_ 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) + } + 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[54 * 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[55 * 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[56 * 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[57 * 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[58 * 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[59 * 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[60 * 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[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Link(_ 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 Forward_ConfirmMultipleFiles(_ 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 SharedMedia_Video(_ 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 MuteExpires_Days(_ 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 Passport_Scans(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[66 * 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[67 * 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[68 * 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[69 * 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[70 * 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[71 * 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[72 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + 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[73 * 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[74 * 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[75 * 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[76 * 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[77 * 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[78 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusSubscribers(_ 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 MessageTimer_ShortDays(_ 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 AttachmentMenu_SendGif(_ 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 InviteText_ContactsCountText(_ 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 LastSeen_MinutesAgo(_ 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 Call_ShortMinutes(_ 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 MessageTimer_Weeks(_ 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 MessagePoll_VotedCount(_ 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 ServiceMessage_GameScoreSelfExtended(_ 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 Watch_UserInfo_Mute(_ 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 StickerPack_RemoveStickerCount(_ 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 AttachmentMenu_SendVideo(_ 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 Notifications_Exceptions(_ 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_FWDS(_ 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 ForwardedPolls(_ 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 PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedVideoMessages(_ 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 SharedMedia_DeleteItemsConfirmation(_ 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 ForwardedLocations(_ 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 MessageTimer_Months(_ 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 MessageTimer_Years(_ 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 Wallpaper_DeleteConfirmation(_ 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 Notification_GameScoreSelfSimple(_ 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 AttachmentMenu_SendPhoto(_ 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 PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MuteExpires_Hours(_ 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 PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func LastSeen_HoursAgo(_ 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 QuickSend_Photos(_ 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) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[109 * 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[110 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_File(_ 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 ForwardedMessages(_ 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 MessageTimer_Minutes(_ 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 PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func SharedMedia_Photo(_ 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 MuteFor_Days(_ 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 Invitation_Members(_ 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) diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift index c88d476fa3..a28f4bebc2 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift @@ -354,13 +354,14 @@ public final class PresentationThemeList { public let itemCheckColors: PresentationThemeFillStrokeForeground public let controlSecondaryColor: UIColor public let freeInputField: PresentationInputFieldTheme + public let freePlainInputField: PresentationInputFieldTheme public let mediaPlaceholderColor: UIColor public let scrollIndicatorColor: UIColor public let pageIndicatorInactiveColor: UIColor public let inputClearButtonColor: UIColor public let itemBarChart: PresentationThemeItemBarChart - public init(blocksBackgroundColor: UIColor, plainBackgroundColor: UIColor, itemPrimaryTextColor: UIColor, itemSecondaryTextColor: UIColor, itemDisabledTextColor: UIColor, itemAccentColor: UIColor, itemHighlightedColor: UIColor, itemDestructiveColor: UIColor, itemPlaceholderTextColor: UIColor, itemBlocksBackgroundColor: UIColor, itemHighlightedBackgroundColor: UIColor, itemBlocksSeparatorColor: UIColor, itemPlainSeparatorColor: UIColor, disclosureArrowColor: UIColor, sectionHeaderTextColor: UIColor, freeTextColor: UIColor, freeTextErrorColor: UIColor, freeTextSuccessColor: UIColor, freeMonoIconColor: UIColor, itemSwitchColors: PresentationThemeSwitch, itemDisclosureActions: PresentationThemeItemDisclosureActions, itemCheckColors: PresentationThemeFillStrokeForeground, controlSecondaryColor: UIColor, freeInputField: PresentationInputFieldTheme, mediaPlaceholderColor: UIColor, scrollIndicatorColor: UIColor, pageIndicatorInactiveColor: UIColor, inputClearButtonColor: UIColor, itemBarChart: PresentationThemeItemBarChart) { + public init(blocksBackgroundColor: UIColor, plainBackgroundColor: UIColor, itemPrimaryTextColor: UIColor, itemSecondaryTextColor: UIColor, itemDisabledTextColor: UIColor, itemAccentColor: UIColor, itemHighlightedColor: UIColor, itemDestructiveColor: UIColor, itemPlaceholderTextColor: UIColor, itemBlocksBackgroundColor: UIColor, itemHighlightedBackgroundColor: UIColor, itemBlocksSeparatorColor: UIColor, itemPlainSeparatorColor: UIColor, disclosureArrowColor: UIColor, sectionHeaderTextColor: UIColor, freeTextColor: UIColor, freeTextErrorColor: UIColor, freeTextSuccessColor: UIColor, freeMonoIconColor: UIColor, itemSwitchColors: PresentationThemeSwitch, itemDisclosureActions: PresentationThemeItemDisclosureActions, itemCheckColors: PresentationThemeFillStrokeForeground, controlSecondaryColor: UIColor, freeInputField: PresentationInputFieldTheme, freePlainInputField: PresentationInputFieldTheme, mediaPlaceholderColor: UIColor, scrollIndicatorColor: UIColor, pageIndicatorInactiveColor: UIColor, inputClearButtonColor: UIColor, itemBarChart: PresentationThemeItemBarChart) { self.blocksBackgroundColor = blocksBackgroundColor self.plainBackgroundColor = plainBackgroundColor self.itemPrimaryTextColor = itemPrimaryTextColor @@ -385,6 +386,7 @@ public final class PresentationThemeList { self.itemCheckColors = itemCheckColors self.controlSecondaryColor = controlSecondaryColor self.freeInputField = freeInputField + self.freePlainInputField = freePlainInputField self.mediaPlaceholderColor = mediaPlaceholderColor self.scrollIndicatorColor = scrollIndicatorColor self.pageIndicatorInactiveColor = pageIndicatorInactiveColor diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift index 3bfc076f0e..38439f7dab 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift @@ -714,6 +714,7 @@ extension PresentationThemeList: Codable { case check case controlSecondary case freeInputField + case freePlainInputField case mediaPlaceholder case scrollIndicator case pageIndicatorInactive @@ -723,35 +724,46 @@ extension PresentationThemeList: Codable { public convenience init(from decoder: Decoder) throws { let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(blocksBackgroundColor: try decodeColor(values, .blocksBg), - plainBackgroundColor: try decodeColor(values, .plainBg), - itemPrimaryTextColor: try decodeColor(values, .primaryText), - itemSecondaryTextColor: try decodeColor(values, .secondaryText), - itemDisabledTextColor: try decodeColor(values, .disabledText), - itemAccentColor: try decodeColor(values, .accent), - itemHighlightedColor: try decodeColor(values, .highlighted), - itemDestructiveColor: try decodeColor(values, .destructive), - itemPlaceholderTextColor: try decodeColor(values, .placeholderText), - itemBlocksBackgroundColor: try decodeColor(values, .itemBlocksBg), - itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBg), - itemBlocksSeparatorColor: try decodeColor(values, .blocksSeparator), - itemPlainSeparatorColor: try decodeColor(values, .plainSeparator), - disclosureArrowColor: try decodeColor(values, .disclosureArrow), - sectionHeaderTextColor: try decodeColor(values, .sectionHeaderText), - freeTextColor: try decodeColor(values, .freeText), - freeTextErrorColor: try decodeColor(values, .freeTextError), - freeTextSuccessColor: try decodeColor(values, .freeTextSuccess), - freeMonoIconColor: try decodeColor(values, .freeMonoIcon), - itemSwitchColors: try values.decode(PresentationThemeSwitch.self, forKey: .switch), - itemDisclosureActions: try values.decode(PresentationThemeItemDisclosureActions.self, forKey: .disclosureActions), - itemCheckColors: try values.decode(PresentationThemeFillStrokeForeground.self, forKey: .check), - controlSecondaryColor: try decodeColor(values, .controlSecondary), - freeInputField: try values.decode(PresentationInputFieldTheme.self, forKey: .freeInputField), - mediaPlaceholderColor: try decodeColor(values, .mediaPlaceholder), - scrollIndicatorColor: try decodeColor(values, .scrollIndicator), - pageIndicatorInactiveColor: try decodeColor(values, .pageIndicatorInactive), - inputClearButtonColor: try decodeColor(values, .inputClearButton), - itemBarChart: try values.decode(PresentationThemeItemBarChart.self, forKey: .itemBarChart)) + + let freePlainInputField: PresentationInputFieldTheme + if let value = try? values.decode(PresentationInputFieldTheme.self, forKey: .freePlainInputField) { + freePlainInputField = value + } else { + freePlainInputField = try values.decode(PresentationInputFieldTheme.self, forKey: .freeInputField) + } + + self.init( + blocksBackgroundColor: try decodeColor(values, .blocksBg), + plainBackgroundColor: try decodeColor(values, .plainBg), + itemPrimaryTextColor: try decodeColor(values, .primaryText), + itemSecondaryTextColor: try decodeColor(values, .secondaryText), + itemDisabledTextColor: try decodeColor(values, .disabledText), + itemAccentColor: try decodeColor(values, .accent), + itemHighlightedColor: try decodeColor(values, .highlighted), + itemDestructiveColor: try decodeColor(values, .destructive), + itemPlaceholderTextColor: try decodeColor(values, .placeholderText), + itemBlocksBackgroundColor: try decodeColor(values, .itemBlocksBg), + itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBg), + itemBlocksSeparatorColor: try decodeColor(values, .blocksSeparator), + itemPlainSeparatorColor: try decodeColor(values, .plainSeparator), + disclosureArrowColor: try decodeColor(values, .disclosureArrow), + sectionHeaderTextColor: try decodeColor(values, .sectionHeaderText), + freeTextColor: try decodeColor(values, .freeText), + freeTextErrorColor: try decodeColor(values, .freeTextError), + freeTextSuccessColor: try decodeColor(values, .freeTextSuccess), + freeMonoIconColor: try decodeColor(values, .freeMonoIcon), + itemSwitchColors: try values.decode(PresentationThemeSwitch.self, forKey: .switch), + itemDisclosureActions: try values.decode(PresentationThemeItemDisclosureActions.self, forKey: .disclosureActions), + itemCheckColors: try values.decode(PresentationThemeFillStrokeForeground.self, forKey: .check), + controlSecondaryColor: try decodeColor(values, .controlSecondary), + freeInputField: try values.decode(PresentationInputFieldTheme.self, forKey: .freeInputField), + freePlainInputField: freePlainInputField, + mediaPlaceholderColor: try decodeColor(values, .mediaPlaceholder), + scrollIndicatorColor: try decodeColor(values, .scrollIndicator), + pageIndicatorInactiveColor: try decodeColor(values, .pageIndicatorInactive), + inputClearButtonColor: try decodeColor(values, .inputClearButton), + itemBarChart: try values.decode(PresentationThemeItemBarChart.self, forKey: .itemBarChart) + ) } public func encode(to encoder: Encoder) throws { diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift index 149f95ed03..fd799d341e 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift @@ -206,20 +206,20 @@ public final class PrincipalThemeEssentialGraphics { let emptyImage = UIImage() if preview { self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(incoming: true, fillColor: UIColor.black, strokeColor: UIColor.clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) + self.chatMessageBackgroundIncomingImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.checkBubbleFullImage = generateCheckImage(partial: false, color: theme.message.outgoingCheckColor, width: 11.0)! self.checkBubblePartialImage = generateCheckImage(partial: true, color: theme.message.outgoingCheckColor, width: 11.0)! self.chatMessageBackgroundIncomingHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedTopMaskImage = emptyImage - self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) + self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) self.chatMessageBackgroundIncomingMergedTopHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideMaskImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedBottomMaskImage = emptyImage - self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) + self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedBothMaskImage = emptyImage self.chatMessageBackgroundIncomingMergedBothImage = emptyImage @@ -229,16 +229,16 @@ public final class PrincipalThemeEssentialGraphics { self.chatMessageBackgroundIncomingMergedSideHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .white, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedSideMaskImage = emptyImage self.chatMessageBackgroundOutgoingMergedSideImage = emptyImage @@ -265,43 +265,43 @@ public final class PrincipalThemeEssentialGraphics { self.radialIndicatorFileIconOutgoing = emptyImage } else { self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) - self.chatMessageBackgroundIncomingHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) + self.chatMessageBackgroundIncomingImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) self.chatMessageBackgroundIncomingMergedTopMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) - self.chatMessageBackgroundIncomingMergedTopHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) + self.chatMessageBackgroundIncomingMergedTopHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) self.chatMessageBackgroundIncomingMergedTopSideMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopSideImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) - self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) + self.chatMessageBackgroundIncomingMergedTopSideImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) self.chatMessageBackgroundIncomingMergedBottomMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) - self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) + self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) self.chatMessageBackgroundIncomingMergedBothMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBothImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) - self.chatMessageBackgroundIncomingMergedBothHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout) + self.chatMessageBackgroundIncomingMergedBothImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBothHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) - self.chatMessageBackgroundOutgoingHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) - self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopSideImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) - self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingMergedTopSideImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .white, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) - self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) - self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundIncomingMergedSideMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedSideImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundIncomingMergedSideImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.chatMessageBackgroundOutgoingMergedSideMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedSideImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) - self.chatMessageBackgroundIncomingMergedSideHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) - self.chatMessageBackgroundOutgoingMergedSideHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout) + self.chatMessageBackgroundOutgoingMergedSideImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedSideHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedSideHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.checkBubbleFullImage = generateCheckImage(partial: false, color: theme.message.outgoingCheckColor, width: 11.0)! self.checkBubblePartialImage = generateCheckImage(partial: true, color: theme.message.outgoingCheckColor, width: 11.0)! @@ -332,8 +332,8 @@ public final class PrincipalThemeEssentialGraphics { self.mediaImpressionIcon = generateTintedImage(image: impressionCountImage, color: .white)! self.freeImpressionIcon = generateTintedImage(image: impressionCountImage, color: serviceColor.primaryText)! - self.radialIndicatorFileIconIncoming = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/RadialProgressIconDocument"), color: theme.message.incoming.mediaControlInnerBackgroundColor)! - self.radialIndicatorFileIconOutgoing = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/RadialProgressIconDocument"), color: theme.message.outgoing.mediaControlInnerBackgroundColor)! + self.radialIndicatorFileIconIncoming = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/RadialProgressIconDocument"), color: .black)! + self.radialIndicatorFileIconOutgoing = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/RadialProgressIconDocument"), color: .black)! } let chatDateSize: CGFloat = 20.0 diff --git a/submodules/TelegramUI/Images.xcassets/Location/HomeIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Location/HomeIcon.imageset/Contents.json new file mode 100644 index 0000000000..f8498abac3 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Location/HomeIcon.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_maphome.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Location/HomeIcon.imageset/ic_maphome.pdf b/submodules/TelegramUI/Images.xcassets/Location/HomeIcon.imageset/ic_maphome.pdf new file mode 100644 index 0000000000..1cae1ad6c6 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Location/HomeIcon.imageset/ic_maphome.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Location/WorkIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Location/WorkIcon.imageset/Contents.json new file mode 100644 index 0000000000..9739d32002 --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Location/WorkIcon.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_mapwork.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Location/WorkIcon.imageset/ic_mapwork.pdf b/submodules/TelegramUI/Images.xcassets/Location/WorkIcon.imageset/ic_mapwork.pdf new file mode 100644 index 0000000000..0150099b3e Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Location/WorkIcon.imageset/ic_mapwork.pdf differ diff --git a/submodules/TelegramUI/TelegramUI/ApplicationContext.swift b/submodules/TelegramUI/TelegramUI/ApplicationContext.swift index a6c622efdc..b4475e127c 100644 --- a/submodules/TelegramUI/TelegramUI/ApplicationContext.swift +++ b/submodules/TelegramUI/TelegramUI/ApplicationContext.swift @@ -339,8 +339,8 @@ final class AuthorizedApplicationContext { let chatController = ChatControllerImpl(context: strongSelf.context, chatLocation: .peer(firstMessage.id.peerId), mode: .overlay) //chatController.navigation_setNavigationController(strongSelf.rootController) chatController.presentationArguments = ChatControllerOverlayPresentationData(expandData: expandData()) - strongSelf.rootController.pushViewController(chatController) - //(strongSelf.rootController.viewControllers.last as? ViewController)?.present(chatController, in: .window(.root), with: ChatControllerOverlayPresentationData(expandData: expandData())) + //strongSelf.rootController.pushViewController(chatController) + (strongSelf.rootController.viewControllers.last as? ViewController)?.present(chatController, in: .window(.root), with: ChatControllerOverlayPresentationData(expandData: expandData())) } })) } diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 4f4b954278..7c430943f9 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -361,12 +361,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } super.init(context: context, navigationBarPresentationData: navigationBarPresentationData, mediaAccessoryPanelVisibility: mediaAccessoryPanelVisibility, locationBroadcastPanelSource: locationBroadcastPanelSource) - switch mode { + /*switch mode { case .overlay: self.navigationPresentation = .standaloneModal default: break - } + }*/ self.blocksBackgroundWhenInOverlay = true @@ -590,7 +590,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if Namespaces.Message.allScheduled.contains(message.id.namespace) { reactionItems = [] } - let controller = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: message)), items: .single(actions), reactionItems: reactionItems, recognizer: recognizer) + 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) strongSelf.currentContextController = controller controller.reactionSelected = { [weak controller] value in guard let strongSelf = self, let message = updatedMessages.first else { @@ -1180,7 +1180,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } else if canOpenIn { openText = strongSelf.presentationData.strings.Conversation_FileOpenIn } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: cleanUrl)) @@ -1222,7 +1222,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.chatDisplayNode.dismissInput() strongSelf.present(actionSheet, in: .window(.root)) case let .peerMention(peerId, mention): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] if !mention.isEmpty { items.append(ActionSheetTextItem(title: mention)) @@ -1247,7 +1247,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.chatDisplayNode.dismissInput() strongSelf.present(actionSheet, in: .window(.root)) case let .mention(mention): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: mention), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in @@ -1268,7 +1268,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.chatDisplayNode.dismissInput() strongSelf.present(actionSheet, in: .window(.root)) case let .command(command): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: command)) if canSendMessagesToChat(strongSelf.presentationInterfaceState) { @@ -1291,7 +1291,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.chatDisplayNode.dismissInput() strongSelf.present(actionSheet, in: .window(.root)) case let .hashtag(hashtag): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: hashtag), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in @@ -1328,7 +1328,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G guard let message = message else { return } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: text), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in @@ -1424,7 +1424,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } }))) - let controller = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: message)), items: .single(actions), reactionItems: [], recognizer: nil) + let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: message)), items: .single(actions), reactionItems: [], recognizer: nil) strongSelf.currentContextController = controller strongSelf.window?.presentInGlobalOverlay(controller) }) @@ -1495,7 +1495,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G f(.dismissWithoutContent) }))) - let controller = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: topMessage)), items: .single(actions), reactionItems: [], recognizer: nil) + let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: topMessage)), items: .single(actions), reactionItems: [], recognizer: nil) strongSelf.currentContextController = controller strongSelf.window?.presentInGlobalOverlay(controller) }) @@ -1572,7 +1572,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let strongSelf = self { if let node = node { strongSelf.messageTooltipController?.dismiss() - let tooltipController = TooltipController(content: .text(text), dismissByTapOutside: true, dismissImmediatelyOnLayoutUpdate: true) + let tooltipController = TooltipController(content: .text(text), baseFontSize: strongSelf.presentationData.fontSize.baseDisplaySize, dismissByTapOutside: true, dismissImmediatelyOnLayoutUpdate: true) strongSelf.messageTooltipController = tooltipController tooltipController.dismissed = { [weak tooltipController] _ in if let strongSelf = self, let tooltipController = tooltipController, strongSelf.messageTooltipController === tooltipController { @@ -1782,7 +1782,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self?.navigationButtonAction(.openChatInfo) })) ] - let contextController = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: galleryController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) + let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: galleryController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) strongSelf.presentInGlobalOverlay(contextController) } chatInfoButtonItem = UIBarButtonItem(customDisplayNode: avatarNode)! @@ -2400,7 +2400,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return state }) - self.currentContextController?.updateTheme(theme: self.presentationData.theme) + self.currentContextController?.updateTheme(presentationData: self.presentationData) } override public func loadDisplayNode() { @@ -2688,7 +2688,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let message = strongSelf.chatDisplayNode.historyNode.messageInCurrentHistoryView(index.id) { let highlightedState = ChatInterfaceHighlightedState(messageStableId: message.stableId) controllerInteraction.highlightedState = highlightedState - strongSelf.updateItemNodesHighlightedStates(animated: true) + strongSelf.updateItemNodesHighlightedStates(animated: false) strongSelf.messageContextDisposable.set((Signal.complete() |> delay(0.7, queue: Queue.mainQueue())).start(completed: { if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction { @@ -2931,7 +2931,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G guard let strongSelf = self else { return } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetButtonItem(title: strongSelf.presentationData.strings.WebSearch_RecentSectionClear, color: .accent, action: { [weak actionSheet] in actionSheet?.dismissAnimated() @@ -3222,27 +3222,34 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G })) } }, beginMessageSearch: { [weak self] domain, query in - if let strongSelf = self { - strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { current in - return current.updatedTitlePanelContext { - if let index = $0.firstIndex(where: { - switch $0 { - case .chatInfo: - return true - default: - return false - } - }) { - var updatedContexts = $0 - updatedContexts.remove(at: index) - return updatedContexts - } else { - return $0 - } - }.updatedSearch(current.search == nil ? ChatSearchData(domain: domain).withUpdatedQuery(query) : current.search?.withUpdatedDomain(domain).withUpdatedQuery(query)) - }) - strongSelf.updateItemNodesSearchTextHighlightStates() + guard let strongSelf = self else { + return } + var interactive = true + if strongSelf.chatDisplayNode.isInputViewFocused { + interactive = false + strongSelf.context.sharedContext.mainWindow?.doNotAnimateLikelyKeyboardAutocorrectionSwitch() + } + + strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: interactive, { current in + return current.updatedTitlePanelContext { + if let index = $0.firstIndex(where: { + switch $0 { + case .chatInfo: + return true + default: + return false + } + }) { + var updatedContexts = $0 + updatedContexts.remove(at: index) + return updatedContexts + } else { + return $0 + } + }.updatedSearch(current.search == nil ? ChatSearchData(domain: domain).withUpdatedQuery(query) : current.search?.withUpdatedDomain(domain).withUpdatedQuery(query)) + }) + strongSelf.updateItemNodesSearchTextHighlightStates() }, dismissMessageSearch: { [weak self] in if let strongSelf = self { strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { current in @@ -3358,7 +3365,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let strongSelf = self, case let .peer(peerId) = strongSelf.chatLocation { strongSelf.chatDisplayNode.dismissInput() - let controller = ChatDateSelectionSheet(theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, completion: { timestamp in + let controller = ChatDateSelectionSheet(presentationData: strongSelf.presentationData, completion: { timestamp in if let strongSelf = self { strongSelf.loadingMessage.set(true) strongSelf.messageIndexDisposable.set((searchMessageIdByTimestamp(account: strongSelf.context.account, peerId: peerId, timestamp: timestamp) |> deliverOnMainQueue).start(next: { messageId in @@ -3606,7 +3613,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G tooltipController.updateContent(.text(banDescription), animated: true, extendTimer: true) } else if let rect = rect { strongSelf.mediaRestrictedTooltipController?.dismiss() - let tooltipController = TooltipController(content: .text(banDescription)) + let tooltipController = TooltipController(content: .text(banDescription), baseFontSize: strongSelf.presentationData.fontSize.baseDisplaySize) strongSelf.mediaRestrictedTooltipController = tooltipController strongSelf.mediaRestrictedTooltipControllerMode = isStickers tooltipController.dismissed = { [weak tooltipController] _ in @@ -3642,7 +3649,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } if let location = location, let icon = icon { strongSelf.videoUnmuteTooltipController?.dismiss() - let tooltipController = TooltipController(content: .iconAndText(icon, strongSelf.presentationInterfaceState.strings.Conversation_PressVolumeButtonForSound), timeout: 3.5, dismissByTapOutside: true, dismissImmediatelyOnLayoutUpdate: true) + let tooltipController = TooltipController(content: .iconAndText(icon, strongSelf.presentationInterfaceState.strings.Conversation_PressVolumeButtonForSound), baseFontSize: strongSelf.presentationData.fontSize.baseDisplaySize, timeout: 3.5, dismissByTapOutside: true, dismissImmediatelyOnLayoutUpdate: true) strongSelf.videoUnmuteTooltipController = tooltipController tooltipController.dismissed = { [weak tooltipController] _ in if let strongSelf = self, let tooltipController = tooltipController, strongSelf.videoUnmuteTooltipController === tooltipController { @@ -3897,7 +3904,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let tooltipController = strongSelf.silentPostTooltipController { tooltipController.updateContent(.text(text), animated: true, extendTimer: true) } else if let rect = rect { - let tooltipController = TooltipController(content: .text(text)) + let tooltipController = TooltipController(content: .text(text), baseFontSize: strongSelf.presentationData.fontSize.baseDisplaySize) strongSelf.silentPostTooltipController = tooltipController tooltipController.dismissed = { [weak tooltipController] _ in if let strongSelf = self, let tooltipController = tooltipController, strongSelf.silentPostTooltipController === tooltipController { @@ -3947,7 +3954,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: strongSelf.presentationData.strings.Conversation_StopPollConfirmationTitle), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_StopPollConfirmation, color: .destructive, action: { [weak self, weak actionSheet] in @@ -4090,7 +4097,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.slowmodeTooltipController = nil slowmodeTooltipController.dismiss() } - let slowmodeTooltipController = ChatSlowmodeHintController(strings: strongSelf.presentationData.strings, slowmodeState: + let slowmodeTooltipController = ChatSlowmodeHintController(presentationData: strongSelf.presentationData, slowmodeState: slowmodeState) slowmodeTooltipController.presentationArguments = TooltipControllerPresentationArguments(sourceNodeAndRect: { if let strongSelf = self { @@ -4131,7 +4138,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G }, displaySearchResultsTooltip: { [weak self] node, nodeRect in if let strongSelf = self { strongSelf.searchResultsTooltipController?.dismiss() - let tooltipController = TooltipController(content: .text(strongSelf.presentationData.strings.ChatSearch_ResultsTooltip), dismissByTapOutside: true, dismissImmediatelyOnLayoutUpdate: true) + let tooltipController = TooltipController(content: .text(strongSelf.presentationData.strings.ChatSearch_ResultsTooltip), baseFontSize: strongSelf.presentationData.fontSize.baseDisplaySize, dismissByTapOutside: true, dismissImmediatelyOnLayoutUpdate: true) strongSelf.searchResultsTooltipController = tooltipController tooltipController.dismissed = { [weak tooltipController] _ in if let strongSelf = self, let tooltipController = tooltipController, strongSelf.searchResultsTooltipController === tooltipController { @@ -4384,7 +4391,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return a && b }) - self.chatDisplayNode.loadInputPanels(theme: self.presentationInterfaceState.theme, strings: self.presentationInterfaceState.strings) + self.chatDisplayNode.loadInputPanels(theme: self.presentationInterfaceState.theme, strings: self.presentationInterfaceState.strings, fontSize: self.presentationInterfaceState.fontSize) self.recentlyUsedInlineBotsDisposable = (recentlyUsedInlineBots(postbox: self.context.account.postbox) |> deliverOnMainQueue).start(next: { [weak self] peers in self?.recentlyUsedInlineBotsValue = peers.filter({ $0.1 >= 0.14 }).map({ $0.0 }) @@ -4598,7 +4605,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G case .standard, .inline: break case .overlay: - if layout.safeInsets.top.isZero { + if case .Ignore = self.statusBar.statusBarStyle { + } else if layout.safeInsets.top.isZero { self.statusBar.statusBarStyle = .Hide } else { self.statusBar.statusBarStyle = .Ignore @@ -5060,7 +5068,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G }), in: .current) } - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) var items: [ActionSheetItem] = [] if self.presentationInterfaceState.isScheduledMessages { @@ -5175,7 +5183,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return } let presentationData = strongSelf.presentationData - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -5420,7 +5428,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G banDescription = strongSelf.presentationInterfaceState.strings.Conversation_DefaultRestrictedMedia } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: banDescription)) items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_Location, color: .accent, action: { [weak actionSheet] in @@ -5595,7 +5603,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } private func presentFileMediaPickerOptions(editingMessage: Bool) { - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetButtonItem(title: self.presentationData.strings.Conversation_FilePhotoOrVideo, action: { [weak self, weak actionSheet] in actionSheet?.dismissAnimated() @@ -6529,18 +6537,27 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(messageId.peerId), subject: .message(messageId), keepStack: .always)) } } else if case let .peer(peerId) = self.chatLocation, (messageLocation.peerId == peerId || forceInCurrentChat) { + if let _ = fromId, let fromIndex = fromIndex, rememberInStack { + self.historyNavigationStack.add(fromIndex) + } + + let scrollFromIndex: MessageIndex? if let fromIndex = fromIndex { - if let _ = fromId, rememberInStack { - self.historyNavigationStack.add(fromIndex) - } - + scrollFromIndex = fromIndex + } else if let message = self.chatDisplayNode.historyNode.lastVisbleMesssage() { + scrollFromIndex = message.index + } else { + scrollFromIndex = nil + } + + if let scrollFromIndex = scrollFromIndex { if let messageId = messageLocation.messageId, let message = self.chatDisplayNode.historyNode.messageInCurrentHistoryView(messageId) { self.loadingMessage.set(false) self.messageIndexDisposable.set(nil) - self.chatDisplayNode.historyNode.scrollToMessage(from: fromIndex, to: message.index, animated: animated, scrollPosition: scrollPosition) + self.chatDisplayNode.historyNode.scrollToMessage(from: scrollFromIndex, to: message.index, animated: animated, scrollPosition: scrollPosition) completion?() } else if case let .index(index) = messageLocation, index.id.id == 0 && index.timestamp > 0, self.presentationInterfaceState.isScheduledMessages { - self.chatDisplayNode.historyNode.scrollToMessage(from: fromIndex, to: index, animated: animated, scrollPosition: scrollPosition) + self.chatDisplayNode.historyNode.scrollToMessage(from: scrollFromIndex, to: index, animated: animated, scrollPosition: scrollPosition) } else { self.loadingMessage.set(true) let searchLocation: ChatHistoryInitialSearchLocation @@ -6606,12 +6623,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } |> deliverOnMainQueue).start(next: { [weak self] index in if let strongSelf = self, let index = index.0 { - strongSelf.chatDisplayNode.historyNode.scrollToMessage(from: fromIndex, to: index, animated: animated, scrollPosition: scrollPosition) + strongSelf.chatDisplayNode.historyNode.scrollToMessage(from: scrollFromIndex, to: index, animated: animated, scrollPosition: scrollPosition) completion?() } else if index.1 { if !progressStarted { progressStarted = true - progressDisposable.set(progressSignal.start()) + progressDisposable.set(progressSignal.start()) } } }, completed: { [weak self] in @@ -6981,7 +6998,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.chatDisplayNode.dismissInput() if let peer = peer as? TelegramChannel, let username = peer.username, !username.isEmpty { - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetButtonItem(title: self.presentationData.strings.Conversation_ReportSpamAndLeave, color: .destructive, action: { [weak self, weak actionSheet] in @@ -7009,7 +7026,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G }), in: .window(.root))*/ } else if let _ = peer as? TelegramUser { let presentationData = self.presentationData - let controller = ActionSheetController(presentationTheme: presentationData.theme) + let controller = ActionSheetController(presentationData: presentationData) let dismissAction: () -> Void = { [weak controller] in controller?.dismissAnimated() } @@ -7075,7 +7092,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G title = self.presentationData.strings.Conversation_ReportSpam infoString = self.presentationData.strings.Conversation_ReportSpamConfirmation } - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) var items: [ActionSheetItem] = [] if let infoString = infoString { @@ -7110,7 +7127,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: strongSelf.presentationData.strings.Conversation_ShareMyPhoneNumberConfirmation(formatPhoneNumber(phoneNumber), peer.compactDisplayTitle).0)) items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_ShareMyPhoneNumber, action: { [weak actionSheet] in @@ -7579,7 +7596,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let strongSelf = self { let canBan = participant?.canBeBannedBy(peerId: accountPeerId) ?? true - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] var actions = Set([0]) @@ -7655,7 +7672,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } private func presentDeleteMessageOptions(messageIds: Set, options: ChatAvailableMessageActionOptions, contextController: ContextController?, completion: @escaping (ContextMenuActionResult) -> Void) { - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) var items: [ActionSheetItem] = [] var personalPeerName: String? var isChannel = false @@ -7762,7 +7779,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } self.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState({ $0.withoutSelectionState() }) }) - let actionSheet = ActionSheetController(presentationTheme: self.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: self.presentationData) var items: [ActionSheetItem] = [] items.append(DeleteChatPeerActionSheetItem(context: self.context, peer: peer, chatPeer: peer, action: .clearCacheSuggestion, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder)) @@ -7846,7 +7863,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G if let tooltipController = self.mediaRecordingModeTooltipController { tooltipController.updateContent(.text(text), animated: true, extendTimer: true) } else if let rect = rect { - let tooltipController = TooltipController(content: .text(text)) + let tooltipController = TooltipController(content: .text(text), baseFontSize: self.presentationData.fontSize.baseDisplaySize) self.mediaRecordingModeTooltipController = tooltipController tooltipController.dismissed = { [weak self, weak tooltipController] _ in if let strongSelf = self, let tooltipController = tooltipController, strongSelf.mediaRecordingModeTooltipController === tooltipController { @@ -7867,7 +7884,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G return } self.sendingOptionsTooltipController?.dismiss() - let tooltipController = TooltipController(content: .text(self.presentationData.strings.Conversation_SendingOptionsTooltip), timeout: 3.0, dismissByTapOutside: true, dismissImmediatelyOnLayoutUpdate: true) + let tooltipController = TooltipController(content: .text(self.presentationData.strings.Conversation_SendingOptionsTooltip), baseFontSize: self.presentationData.fontSize.baseDisplaySize, timeout: 3.0, dismissByTapOutside: true, dismissImmediatelyOnLayoutUpdate: true) self.sendingOptionsTooltipController = tooltipController tooltipController.dismissed = { [weak self, weak tooltipController] _ in if let strongSelf = self, let tooltipController = tooltipController, strongSelf.sendingOptionsTooltipController === tooltipController { diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift index ba0db387c8..141d18e59d 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift @@ -97,6 +97,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { private var titleAccessoryPanelNode: ChatTitleAccessoryPanelNode? private var inputPanelNode: ChatInputPanelNode? + private weak var currentDismissedInputPanelNode: ASDisplayNode? private var secondaryInputPanelNode: ChatInputPanelNode? private var accessoryPanelNode: AccessoryPanelNode? private var inputContextPanelNode: ChatInputContextPanelNode? @@ -1105,7 +1106,12 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { inputPanelNode.frame = apparentInputPanelFrame.offsetBy(dx: 0.0, dy: apparentInputPanelFrame.height + previousInputPanelBackgroundFrame.maxY - apparentInputBackgroundFrame.maxY) inputPanelNode.alpha = 0.0 } - + if !transition.isAnimated { + inputPanelNode.layer.removeAllAnimations() + if let currentDismissedInputPanelNode = self.currentDismissedInputPanelNode, inputPanelNode is ChatSearchInputPanelNode { + currentDismissedInputPanelNode.layer.removeAllAnimations() + } + } transition.updateFrame(node: inputPanelNode, frame: apparentInputPanelFrame) transition.updateAlpha(node: inputPanelNode, alpha: 1.0) } @@ -1197,12 +1203,19 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { if let dismissedInputPanelNode = dismissedInputPanelNode, dismissedInputPanelNode !== self.secondaryInputPanelNode { var frameCompleted = false var alphaCompleted = false + self.currentDismissedInputPanelNode = dismissedInputPanelNode let completed = { [weak self, weak dismissedInputPanelNode] in - if let strongSelf = self, let dismissedInputPanelNode = dismissedInputPanelNode, strongSelf.inputPanelNode === dismissedInputPanelNode { + guard let strongSelf = self, let dismissedInputPanelNode = dismissedInputPanelNode else { + return + } + if strongSelf.currentDismissedInputPanelNode === dismissedInputPanelNode { + strongSelf.currentDismissedInputPanelNode = nil + } + if strongSelf.inputPanelNode === dismissedInputPanelNode { return } if frameCompleted && alphaCompleted { - dismissedInputPanelNode?.removeFromSupernode() + dismissedInputPanelNode.removeFromSupernode() } } let transitionTargetY = layout.size.height - insets.bottom @@ -1638,13 +1651,13 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { self.setNeedsLayout() } - func loadInputPanels(theme: PresentationTheme, strings: PresentationStrings) { + func loadInputPanels(theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize) { if self.inputMediaNode == nil { var peerId: PeerId? if case let .peer(id) = self.chatPresentationInterfaceState.chatLocation { peerId = id } - let inputNode = ChatMediaInputNode(context: self.context, peerId: peerId, controllerInteraction: self.controllerInteraction, theme: theme, strings: strings, gifPaneIsActiveUpdated: { [weak self] value in + let inputNode = ChatMediaInputNode(context: self.context, peerId: peerId, controllerInteraction: self.controllerInteraction, theme: theme, strings: strings, fontSize: fontSize, gifPaneIsActiveUpdated: { [weak self] value in if let strongSelf = self, let interfaceInteraction = strongSelf.interfaceInteraction { interfaceInteraction.updateInputModeAndDismissedButtonKeyboardMessageId { state in if case let .media(_, expanded) = state.inputMode { @@ -2258,4 +2271,8 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { completion?() }) } + + func setEnablePredictiveTextInput(_ value: Bool) { + self.textInputPanelNode?.enablePredictiveInput = value + } } diff --git a/submodules/TelegramUI/TelegramUI/ChatDateSelectionSheet.swift b/submodules/TelegramUI/TelegramUI/ChatDateSelectionSheet.swift index 8d2dd7a994..36a3ef2686 100644 --- a/submodules/TelegramUI/TelegramUI/ChatDateSelectionSheet.swift +++ b/submodules/TelegramUI/TelegramUI/ChatDateSelectionSheet.swift @@ -15,20 +15,20 @@ final class ChatDateSelectionSheet: ActionSheetController { return self._ready } - init(theme: PresentationTheme, strings: PresentationStrings, completion: @escaping (Int32) -> Void) { - self.strings = strings + init(presentationData: PresentationData, completion: @escaping (Int32) -> Void) { + self.strings = presentationData.strings - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self._ready.set(.single(true)) var updatedValue: Int32? self.setItemGroups([ ActionSheetItemGroup(items: [ - ChatDateSelectorItem(strings: strings, valueChanged: { value in + ChatDateSelectorItem(strings: self.strings, valueChanged: { value in updatedValue = value }), - ActionSheetButtonItem(title: strings.Common_Search, action: { [weak self] in + ActionSheetButtonItem(title: self.strings.Common_Search, action: { [weak self] in self?.dismissAnimated() if let updatedValue = updatedValue { completion(updatedValue) @@ -36,7 +36,7 @@ final class ChatDateSelectionSheet: ActionSheetController { }) ]), ActionSheetItemGroup(items: [ - ActionSheetButtonItem(title: strings.Common_Cancel, action: { [weak self] in + ActionSheetButtonItem(title: self.strings.Common_Cancel, action: { [weak self] in self?.dismissAnimated() }), ]) diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index 26b472281d..06be57e178 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -1435,6 +1435,28 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { } } + func lastVisbleMesssage() -> Message? { + var currentMessage: Message? + if let historyView = self.historyView { + if let visibleRange = self.displayedItemRange.visibleRange { + var index = 0 + loop: for entry in historyView.filteredEntries.reversed() { + if index >= visibleRange.firstIndex && index <= visibleRange.lastIndex { + if case let .MessageEntry(message, _, _, _, _, _) = entry { + currentMessage = message + break loop + } else if case let .MessageGroupEntry(_, messages, _) = entry { + currentMessage = messages.first?.0 + break loop + } + } + index += 1 + } + } + } + return currentMessage + } + func immediateScrollState() -> ChatInterfaceHistoryScrollState? { var currentMessage: Message? if let historyView = self.historyView { diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceInputNodes.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceInputNodes.swift index 5aefaec90a..27389e1cba 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceInputNodes.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceInputNodes.swift @@ -21,7 +21,7 @@ func inputNodeForChatPresentationIntefaceState(_ chatPresentationInterfaceState: if case let .peer(id) = chatPresentationInterfaceState.chatLocation { peerId = id } - let inputNode = ChatMediaInputNode(context: context, peerId: peerId, controllerInteraction: controllerInteraction, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, gifPaneIsActiveUpdated: { [weak interfaceInteraction] value in + let inputNode = ChatMediaInputNode(context: context, peerId: peerId, controllerInteraction: controllerInteraction, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize, gifPaneIsActiveUpdated: { [weak interfaceInteraction] value in if let interfaceInteraction = interfaceInteraction { interfaceInteraction.updateInputModeAndDismissedButtonKeyboardMessageId { state in if case let .media(_, expanded) = state.inputMode { diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputNode.swift b/submodules/TelegramUI/TelegramUI/ChatMediaInputNode.swift index cf68f5bb3a..ea1b72b82d 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMediaInputNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMediaInputNode.swift @@ -7,6 +7,7 @@ import TelegramCore import SyncCore import SwiftSignalKit import TelegramPresentationData +import TelegramUIPreferences import MergeLists import AccountContext import StickerPackPreviewUI @@ -434,6 +435,7 @@ final class ChatMediaInputNode: ChatInputNode { private var theme: PresentationTheme private var strings: PresentationStrings + private var fontSize: PresentationFontSize private let themeAndStringsPromise: Promise<(PresentationTheme, PresentationStrings)> private let _ready = Promise() @@ -442,12 +444,13 @@ final class ChatMediaInputNode: ChatInputNode { return self._ready.get() } - init(context: AccountContext, peerId: PeerId?, controllerInteraction: ChatControllerInteraction, theme: PresentationTheme, strings: PresentationStrings, gifPaneIsActiveUpdated: @escaping (Bool) -> Void) { + init(context: AccountContext, peerId: PeerId?, controllerInteraction: ChatControllerInteraction, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize, gifPaneIsActiveUpdated: @escaping (Bool) -> Void) { self.context = context self.peerId = peerId self.controllerInteraction = controllerInteraction self.theme = theme self.strings = strings + self.fontSize = fontSize self.gifPaneIsActiveUpdated = gifPaneIsActiveUpdated self.themeAndStringsPromise = Promise((theme, strings)) @@ -589,7 +592,7 @@ final class ChatMediaInputNode: ChatInputNode { self?.dismissPeerSpecificPackSetup() }, clearRecentlyUsedStickers: { [weak self] in if let strongSelf = self { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.theme) + let actionSheet = ActionSheetController(theme: ActionSheetControllerTheme(presentationTheme: strongSelf.theme, fontSize: strongSelf.fontSize)) var items: [ActionSheetItem] = [] items.append(ActionSheetButtonItem(title: strongSelf.strings.Stickers_ClearRecent, color: .destructive, action: { [weak actionSheet] in actionSheet?.dismissAnimated() @@ -839,7 +842,7 @@ final class ChatMediaInputNode: ChatInputNode { let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 } - let contextController = ContextController(account: strongSelf.context.account, theme: presentationData.theme, strings: presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: gallery, sourceNode: sourceNode, sourceRect: sourceRect)), items: .single(items), reactionItems: [], gesture: gesture) + let contextController = ContextController(account: strongSelf.context.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: gallery, sourceNode: sourceNode, sourceRect: sourceRect)), items: .single(items), reactionItems: [], gesture: gesture) strongSelf.controllerInteraction.presentGlobalOverlayController(contextController, nil) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift index fbbec1aeae..bf45a9ac5b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift @@ -145,11 +145,11 @@ class ChatMessageBackground: ASDisplayNode { if let previousType = previousType, previousType != .none, type == .none { if transition.isAnimated { let tempLayer = CALayer() - tempLayer.contents = self.layer.contents - tempLayer.contentsScale = self.layer.contentsScale - tempLayer.rasterizationScale = self.layer.rasterizationScale - tempLayer.contentsGravity = self.layer.contentsGravity - tempLayer.contentsCenter = self.layer.contentsCenter + tempLayer.contents = self.imageNode.layer.contents + tempLayer.contentsScale = self.imageNode.layer.contentsScale + tempLayer.rasterizationScale = self.imageNode.layer.rasterizationScale + tempLayer.contentsGravity = self.imageNode.layer.contentsGravity + tempLayer.contentsCenter = self.imageNode.layer.contentsCenter tempLayer.frame = self.bounds self.layer.addSublayer(tempLayer) @@ -157,6 +157,10 @@ class ChatMessageBackground: ASDisplayNode { tempLayer?.removeFromSuperlayer() }) } + } else if transition.isAnimated { + if let previousContents = self.imageNode.layer.contents, let image = image { + self.imageNode.layer.animate(from: previousContents as AnyObject, to: image.cgImage! as AnyObject, keyPath: "contents", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.42) + } } self.imageNode.image = image diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift index 4597efff8c..b6c2890b57 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift @@ -4,7 +4,7 @@ import Display import Postbox import TelegramPresentationData -private let maskInset: CGFloat = UIScreenPixel +private let maskInset: CGFloat = 0.0 final class ChatMessageBubbleBackdrop: ASDisplayNode { private let backgroundContent: ASDisplayNode diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift index ee779d5229..3e9ce21790 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift @@ -2716,19 +2716,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode if let backgroundType = self.backgroundType { let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) - if highlighted { - self.backgroundNode.setType(type: backgroundType, highlighted: true, graphics: graphics, maskMode: self.contextSourceNode.isExtractedToContextPreview, transition: .immediate) - } else { - if let previousContents = self.backgroundNode.layer.contents, animated { - self.backgroundNode.setType(type: backgroundType, highlighted: false, graphics: graphics, maskMode: self.contextSourceNode.isExtractedToContextPreview, transition: .immediate) - - if let updatedContents = self.backgroundNode.layer.contents { - self.backgroundNode.layer.animate(from: previousContents as AnyObject, to: updatedContents as AnyObject, keyPath: "contents", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.42) - } - } else { - self.backgroundNode.setType(type: backgroundType, highlighted: false, graphics: graphics, maskMode: self.contextSourceNode.isExtractedToContextPreview, transition: .immediate) - } - } + self.backgroundNode.setType(type: backgroundType, highlighted: highlighted, graphics: graphics, maskMode: self.contextSourceNode.isExtractedToContextPreview, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate) } } } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift index a41d7dbf94..43bdfbba29 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift @@ -397,7 +397,7 @@ class ChatMessageDateAndStatusNode: ASDisplayNode { strongSelf.impressionIcon = currentImpressionIcon strongSelf.addSubnode(currentImpressionIcon) } - currentImpressionIcon.frame = CGRect(origin: CGPoint(x: leftInset + backgroundInsets.left, y: backgroundInsets.top + 3.0 + offset), size: impressionSize) + currentImpressionIcon.frame = CGRect(origin: CGPoint(x: leftInset + backgroundInsets.left, y: backgroundInsets.top + 1.0 + offset + floor((date.size.height - impressionSize.height) / 2.0)), size: impressionSize) } else if let impressionIcon = strongSelf.impressionIcon { impressionIcon.removeFromSupernode() strongSelf.impressionIcon = nil diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift b/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift index 55a5b9ff7f..f612189569 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift @@ -59,8 +59,6 @@ final class ChatMessageDateHeader: ListViewItemHeader { } } -private let titleFont = Font.medium(13.0) - private func monthAtIndex(_ index: Int, strings: PresentationStrings) -> String { switch index { case 0: @@ -172,6 +170,8 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode { self.addSubnode(self.backgroundNode) self.addSubnode(self.labelNode) + let titleFont = Font.medium(min(18.0, floor(presentationData.fontSize.baseDisplaySize * 13.0 / 17.0))) + let attributedString = NSAttributedString(string: text, font: titleFont, textColor: bubbleVariableColor(variableColor: presentationData.theme.theme.chat.serviceMessage.dateTextColor, wallpaper: presentationData.theme.wallpaper)) let labelLayout = TextNode.asyncLayout(self.labelNode) @@ -192,6 +192,8 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode { self.backgroundNode.image = graphics.dateStaticBackground self.stickBackgroundNode.image = graphics.dateFloatingBackground + let titleFont = Font.medium(min(18.0, floor(presentationData.fontSize.baseDisplaySize * 13.0 / 17.0))) + let attributedString = NSAttributedString(string: self.text, font: titleFont, textColor: bubbleVariableColor(variableColor: presentationData.theme.theme.chat.serviceMessage.dateTextColor, wallpaper: presentationData.theme.wallpaper)) let labelLayout = TextNode.asyncLayout(self.labelNode) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift index 9066975417..19717b8816 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift @@ -523,8 +523,12 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio if file.isVideo && !isSecretMedia && automaticPlayback && !uploading { updateVideoFile = file if hasCurrentVideoNode { - if let currentFile = currentMedia as? TelegramMediaFile, currentFile.resource is EmptyMediaResource { - replaceVideoNode = true + if let currentFile = currentMedia as? TelegramMediaFile { + if currentFile.resource is EmptyMediaResource { + replaceVideoNode = true + } else if currentFile.fileId.namespace == Namespaces.Media.CloudFile && file.fileId.namespace == Namespaces.Media.CloudFile && currentFile.fileId != file.fileId { + replaceVideoNode = true + } } } else if !(file.resource is LocalFileVideoMediaResource) { replaceVideoNode = true diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift index d7c1303b7f..593c6cc003 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageReplyInfoNode.swift @@ -111,10 +111,26 @@ class ChatMessageReplyInfoNode: ASDisplayNode { } } + var imageTextInset: CGFloat = 0.0 + if let _ = imageDimensions { + imageTextInset += floor(presentationData.fontSize.baseDisplaySize * 32.0 / 17.0) + } + + let maximumTextWidth = max(0.0, constrainedSize.width - imageTextInset) + + let contrainedTextSize = CGSize(width: maximumTextWidth, height: constrainedSize.height) + + let textInsets = UIEdgeInsets(top: 3.0, left: 0.0, bottom: 3.0, right: 0.0) + + let (titleLayout, titleApply) = titleNodeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: titleString, font: titleFont, textColor: titleColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: contrainedTextSize, alignment: .natural, cutout: nil, insets: textInsets)) + let (textLayout, textApply) = textNodeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: textString, font: textFont, textColor: textColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: contrainedTextSize, alignment: .natural, cutout: nil, insets: textInsets)) + + let imageSide = titleLayout.size.height + textLayout.size.height - 16.0 + var applyImage: (() -> TransformImageNode)? if let imageDimensions = imageDimensions { - leftInset += 32.0 - let boundingSize = CGSize(width: 30.0, height: 30.0) + let boundingSize = CGSize(width: imageSide, height: imageSide) + leftInset += imageSide + 2.0 var radius: CGFloat = 2.0 var imageSize = imageDimensions.aspectFilled(boundingSize) if hasRoundImage { @@ -145,15 +161,6 @@ class ChatMessageReplyInfoNode: ASDisplayNode { } } - let maximumTextWidth = max(0.0, constrainedSize.width - leftInset) - - let contrainedTextSize = CGSize(width: maximumTextWidth, height: constrainedSize.height) - - let textInsets = UIEdgeInsets(top: 3.0, left: 0.0, bottom: 3.0, right: 0.0) - - let (titleLayout, titleApply) = titleNodeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: titleString, font: titleFont, textColor: titleColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: contrainedTextSize, alignment: .natural, cutout: nil, insets: textInsets)) - let (textLayout, textApply) = textNodeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: textString, font: textFont, textColor: textColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: contrainedTextSize, alignment: .natural, cutout: nil, insets: textInsets)) - let size = CGSize(width: max(titleLayout.size.width - textInsets.left - textInsets.right, textLayout.size.width - textInsets.left - textInsets.right) + leftInset, height: titleLayout.size.height + textLayout.size.height - 2 * (textInsets.top + textInsets.bottom) + 2 * spacing) return (size, { @@ -191,7 +198,7 @@ class ChatMessageReplyInfoNode: ASDisplayNode { node.addSubnode(imageNode) node.imageNode = imageNode } - imageNode.frame = CGRect(origin: CGPoint(x: 8.0, y: 4.0 + UIScreenPixel), size: CGSize(width: 30.0, height: 30.0)) + imageNode.frame = CGRect(origin: CGPoint(x: 8.0, y: 4.0 + UIScreenPixel), size: CGSize(width: imageSide, height: imageSide)) if let updateImageSignal = updateImageSignal { imageNode.setSignal(updateImageSignal) diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift index 48e6906735..ad7e3cf4ff 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift @@ -262,7 +262,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { } else if canOpenIn { openText = strongSelf.presentationData.strings.Conversation_FileOpenIn } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] items.append(ActionSheetTextItem(title: cleanUrl)) @@ -291,7 +291,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { ])]) strongSelf.presentController(actionSheet, nil) case let .peerMention(peerId, mention): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] if !mention.isEmpty { items.append(ActionSheetTextItem(title: mention)) @@ -315,7 +315,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { ])]) strongSelf.presentController(actionSheet, nil) case let .mention(mention): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: mention), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in @@ -335,7 +335,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { ])]) strongSelf.presentController(actionSheet, nil) case let .command(command): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: command), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogCopy, color: .accent, action: { [weak actionSheet] in @@ -349,7 +349,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { ])]) strongSelf.presentController(actionSheet, nil) case let .hashtag(hashtag): - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: hashtag), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in @@ -373,7 +373,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { guard let message = message else { return } - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: text), ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift index 1d1523fc78..9a504c8862 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSearchNavigationContentNode.swift @@ -8,6 +8,7 @@ import SyncCore import TelegramPresentationData import SearchBarNode import LocalizedPeerData +import SwiftSignalKit private let searchBarFont = Font.regular(17.0) @@ -19,6 +20,8 @@ final class ChatSearchNavigationContentNode: NavigationBarContentNode { private let searchBar: SearchBarNode private let interaction: ChatPanelInterfaceInteraction + private var searchingActivityDisposable: Disposable? + init(theme: PresentationTheme, strings: PresentationStrings, chatLocation: ChatLocation, interaction: ChatPanelInterfaceInteraction) { self.theme = theme self.strings = strings @@ -51,6 +54,17 @@ final class ChatSearchNavigationContentNode: NavigationBarContentNode { self.searchBar.clearPrefix = { [weak self] in self?.interaction.toggleMembersSearch(false) } + + if let statuses = interaction.statuses { + self.searchingActivityDisposable = (statuses.searching + |> deliverOnMainQueue).start(next: { [weak self] value in + self?.searchBar.activity = value + }) + } + } + + deinit { + self.searchingActivityDisposable?.dispose() } override var nominalHeight: CGFloat { diff --git a/submodules/TelegramUI/TelegramUI/ChatSecretAutoremoveTimerActionSheet.swift b/submodules/TelegramUI/TelegramUI/ChatSecretAutoremoveTimerActionSheet.swift index c51fa40377..367006984c 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSecretAutoremoveTimerActionSheet.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSecretAutoremoveTimerActionSheet.swift @@ -23,11 +23,11 @@ final class ChatSecretAutoremoveTimerActionSheetController: ActionSheetControlle let theme = presentationData.theme let strings = presentationData.strings - super.init(theme: ActionSheetControllerTheme(presentationTheme: theme)) + super.init(theme: ActionSheetControllerTheme(presentationData: presentationData)) self.presentationDisposable = context.sharedContext.presentationData.start(next: { [weak self] presentationData in if let strongSelf = self { - strongSelf.theme = ActionSheetControllerTheme(presentationTheme: presentationData.theme) + strongSelf.theme = ActionSheetControllerTheme(presentationData: presentationData) } }) diff --git a/submodules/TelegramUI/TelegramUI/ChatSlowmodeHintController.swift b/submodules/TelegramUI/TelegramUI/ChatSlowmodeHintController.swift index fad91ee725..5e3b12567d 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSlowmodeHintController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSlowmodeHintController.swift @@ -21,10 +21,10 @@ final class ChatSlowmodeHintController: TooltipController { private var timer: SwiftSignalKit.Timer? - init(strings: PresentationStrings, slowmodeState: ChatSlowmodeState) { - self.strings = strings + init(presentationData: PresentationData, slowmodeState: ChatSlowmodeState) { + self.strings = presentationData.strings self.slowmodeState = slowmodeState - super.init(content: .text(timeoutValue(strings: strings, slowmodeState: slowmodeState)), timeout: 2.0, dismissByTapOutside: false, dismissByTapOutsideSource: true) + super.init(content: .text(timeoutValue(strings: presentationData.strings, slowmodeState: slowmodeState)), baseFontSize: presentationData.fontSize.baseDisplaySize, timeout: 2.0, dismissByTapOutside: false, dismissByTapOutsideSource: true) } required init(coder aDecoder: NSCoder) { diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputPanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatTextInputPanelNode.swift index 2b44953eab..6a36ceb492 100644 --- a/submodules/TelegramUI/TelegramUI/ChatTextInputPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatTextInputPanelNode.swift @@ -267,6 +267,14 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate { } } + var enablePredictiveInput: Bool = true { + didSet { + if let textInputNode = self.textInputNode { + textInputNode.textView.autocorrectionType = self.enablePredictiveInput ? .default : .no + } + } + } + override var context: AccountContext? { didSet { self.actionButtons.micButton.account = self.context?.account diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift index 054cd7b321..32b916f6e1 100644 --- a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift +++ b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionController.swift @@ -149,7 +149,7 @@ public class PeerMediaCollectionController: TelegramBaseController { if let strongSelf = self, strongSelf.isNodeLoaded { if let message = strongSelf.mediaCollectionDisplayNode.messageForGallery(message.id)?.message { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetButtonItem] = [] items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.SharedMedia_ViewInChat, color: .accent, action: { [weak actionSheet] in @@ -282,7 +282,7 @@ public class PeerMediaCollectionController: TelegramBaseController { switch previewData { case let .gallery(gallery): gallery.setHintWillBePresentedInPreviewingContext(true) - let contextController = ContextController(account: strongSelf.context.account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, source: .controller(ContextControllerContentSourceImpl(controller: gallery, sourceNode: node)), items: items, reactionItems: [], gesture: gesture) + let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: gallery, sourceNode: node)), items: items, reactionItems: [], gesture: gesture) strongSelf.presentInGlobalOverlay(contextController) case .instantPage: break @@ -363,7 +363,7 @@ public class PeerMediaCollectionController: TelegramBaseController { case let .url(url): let canOpenIn = availableOpenInOptions(context: strongSelf.context, item: .url(url: url)).count > 1 let openText = canOpenIn ? strongSelf.presentationData.strings.Conversation_FileOpenIn : strongSelf.presentationData.strings.Conversation_LinkDialogOpen - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: url), ActionSheetButtonItem(title: openText, color: .accent, action: { [weak actionSheet] in @@ -870,7 +870,7 @@ public class PeerMediaCollectionController: TelegramBaseController { if !messageIds.isEmpty { self.messageContextDisposable.set((combineLatest(self.context.sharedContext.chatAvailableMessageActions(postbox: self.context.account.postbox, accountPeerId: self.context.account.peerId, messageIds: messageIds), self.peer.get() |> take(1)) |> deliverOnMainQueue).start(next: { [weak self] actions, peer in if let strongSelf = self, let peer = peer, !actions.options.isEmpty { - let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) + let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData) var items: [ActionSheetItem] = [] var personalPeerName: String? var isChannel = false diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 779d303926..7b3259dfd0 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/TextLinkHandling.swift b/submodules/TelegramUI/TelegramUI/TextLinkHandling.swift index fae6469493..e440f40f72 100644 --- a/submodules/TelegramUI/TelegramUI/TextLinkHandling.swift +++ b/submodules/TelegramUI/TelegramUI/TextLinkHandling.swift @@ -105,7 +105,7 @@ func handleTextLinkActionImpl(context: AccountContext, peerId: PeerId?, navigate case let .url(url): let canOpenIn = availableOpenInOptions(context: context, item: .url(url: url)).count > 1 let openText = canOpenIn ? presentationData.strings.Conversation_FileOpenIn : presentationData.strings.Conversation_LinkDialogOpen - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: url), ActionSheetButtonItem(title: openText, color: .accent, action: { [weak actionSheet] in @@ -129,7 +129,7 @@ func handleTextLinkActionImpl(context: AccountContext, peerId: PeerId?, navigate ])]) controller.present(actionSheet, in: .window(.root)) case let .mention(mention): - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: mention), ActionSheetButtonItem(title: presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in @@ -147,7 +147,7 @@ func handleTextLinkActionImpl(context: AccountContext, peerId: PeerId?, navigate ])]) controller.present(actionSheet, in: .window(.root)) case let .hashtag(_, hashtag): - let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) + let actionSheet = ActionSheetController(presentationData: presentationData) actionSheet.setItemGroups([ActionSheetItemGroup(items: [ ActionSheetTextItem(title: hashtag), ActionSheetButtonItem(title: presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in diff --git a/submodules/TelegramUI/TelegramUI/WalletContextImpl.swift b/submodules/TelegramUI/TelegramUI/WalletContextImpl.swift index b57bb672ca..d3ecede9b6 100644 --- a/submodules/TelegramUI/TelegramUI/WalletContextImpl.swift +++ b/submodules/TelegramUI/TelegramUI/WalletContextImpl.swift @@ -200,7 +200,7 @@ final class WalletContextImpl: WalletContext { navigationBar: navigationBarData.theme, keyboardAppearance: theme.rootController.keyboardColor.keyboardAppearance, alert: AlertControllerTheme(presentationData: presentationData), - actionSheet: ActionSheetControllerTheme(presentationTheme: theme) + actionSheet: ActionSheetControllerTheme(presentationData: presentationData) ), strings: WalletStrings( primaryComponent: WalletStringsComponent( languageCode: strings.primaryComponent.languageCode, diff --git a/submodules/TelegramUIPreferences/Sources/IntentsSettings.swift b/submodules/TelegramUIPreferences/Sources/IntentsSettings.swift index c1e8bc5fb9..5683fac254 100644 --- a/submodules/TelegramUIPreferences/Sources/IntentsSettings.swift +++ b/submodules/TelegramUIPreferences/Sources/IntentsSettings.swift @@ -78,11 +78,11 @@ public struct IntentsSettings: PreferencesEntry, Equatable { return IntentsSettings(initiallyReset: self.initiallyReset, account: self.account, contacts: self.contacts, privateChats: self.privateChats, savedMessages: savedMessages, groups: self.groups, onlyShared: self.onlyShared) } - public func withUpdatedGroups(_ savedMessages: Bool) -> IntentsSettings { + public func withUpdatedGroups(_ groups: Bool) -> IntentsSettings { return IntentsSettings(initiallyReset: self.initiallyReset, account: self.account, contacts: self.contacts, privateChats: self.privateChats, savedMessages: self.savedMessages, groups: groups, onlyShared: self.onlyShared) } - public func withUpdatedOnlyShared(_ savedMessages: Bool) -> IntentsSettings { + public func withUpdatedOnlyShared(_ onlyShared: Bool) -> IntentsSettings { return IntentsSettings(initiallyReset: self.initiallyReset, account: self.account, contacts: self.contacts, privateChats: self.privateChats, savedMessages: self.savedMessages, groups: self.groups, onlyShared: onlyShared) } } diff --git a/submodules/TextFormat/Sources/ChatTextInputAttributes.swift b/submodules/TextFormat/Sources/ChatTextInputAttributes.swift index 82cc311a45..33aa43790d 100644 --- a/submodules/TextFormat/Sources/ChatTextInputAttributes.swift +++ b/submodules/TextFormat/Sources/ChatTextInputAttributes.swift @@ -560,14 +560,14 @@ public func trimChatInputText(_ text: NSAttributedString) -> NSAttributedString } public func breakChatInputText(_ text: NSAttributedString) -> [NSAttributedString] { - if text.length <= 4000 { + if text.length <= 4096 { return [text] } else { let rawText: NSString = text.string as NSString var result: [NSAttributedString] = [] var offset = 0 while offset < text.length { - var range = NSRange(location: offset, length: min(text.length - offset, 4000)) + var range = NSRange(location: offset, length: min(text.length - offset, 4096)) if range.upperBound < text.length { inner: for i in (range.lowerBound ..< range.upperBound).reversed() { let c = rawText.character(at: i) diff --git a/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift b/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift index 12b9061deb..d09e8f2097 100644 --- a/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift +++ b/submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift @@ -239,7 +239,7 @@ final class WalletTransactionInfoScreen: ViewController { } else { text = NSAttributedString(string: strongSelf.context.presentationData.strings.Wallet_TransactionInfo_StorageFeeInfo, font: Font.regular(14.0), textColor: .white, paragraphAlignment: .center) } - let controller = TooltipController(content: .attributedText(text), timeout: 3.0, dismissByTapOutside: true, dismissByTapOutsideSource: false, dismissImmediatelyOnLayoutUpdate: false, arrowOnBottom: false) + let controller = TooltipController(content: .attributedText(text), baseFontSize: 17.0, timeout: 3.0, dismissByTapOutside: true, dismissByTapOutsideSource: false, dismissImmediatelyOnLayoutUpdate: false, arrowOnBottom: false) controller.dismissed = { [weak self] tappedInside in if let strongSelf = self, tappedInside { if let feeInfoUrl = strongSelf.context.feeInfoUrl {