diff --git a/SiriIntents/IntentMessages.swift b/SiriIntents/IntentMessages.swift index 8724f79f8e..8f419a8cc2 100644 --- a/SiriIntents/IntentMessages.swift +++ b/SiriIntents/IntentMessages.swift @@ -55,7 +55,7 @@ func unreadMessages(account: Account) -> Signal<[INMessage], NoError> { } if !isMuted && hasUnread { - signals.append(account.postbox.aroundMessageHistoryViewForLocation(.peer(index.messageIndex.id.peerId), anchor: .upperBound, count: 10, fixedCombinedReadStates: fixedCombinedReadStates, topTaggedMessageIdNamespaces: Set(), tagMask: nil, namespaces: .not([Namespaces.Message.ScheduledCloud, Namespaces.Message.ScheduledLocal]), orderStatistics: .combinedLocation) + signals.append(account.postbox.aroundMessageHistoryViewForLocation(.peer(index.messageIndex.id.peerId), anchor: .upperBound, count: 10, fixedCombinedReadStates: fixedCombinedReadStates, topTaggedMessageIdNamespaces: Set(), tagMask: nil, namespaces: .not(Namespaces.Message.allScheduled), orderStatistics: .combinedLocation) |> take(1) |> map { view -> [INMessage] in var messages: [INMessage] = [] diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj index 9f14295fee..22fa50dc7d 100644 --- a/Telegram-iOS.xcodeproj/project.pbxproj +++ b/Telegram-iOS.xcodeproj/project.pbxproj @@ -5626,18 +5626,12 @@ CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)", - "$(PROJECT_DIR)/third-party", - ); + FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Watch/Bridge"; INFOPLIST_FILE = "Telegram-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", @@ -5670,18 +5664,12 @@ CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = 6N38VWS5BX; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)", - "$(PROJECT_DIR)/third-party", - ); + FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Watch/Bridge"; INFOPLIST_FILE = "Telegram-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ( "-ObjC", "-lz", @@ -5766,18 +5754,12 @@ CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)", - "$(PROJECT_DIR)/third-party", - ); + FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Watch/Bridge"; INFOPLIST_FILE = "Telegram-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ( "-ObjC", "-lz", @@ -6783,18 +6765,12 @@ CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = 6N38VWS5BX; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)", - "$(PROJECT_DIR)/third-party", - ); + FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Watch/Bridge"; INFOPLIST_FILE = "Telegram-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ( "-ObjC", "-lz", @@ -6930,18 +6906,12 @@ CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)", - "$(PROJECT_DIR)/third-party", - ); + FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Watch/Bridge"; INFOPLIST_FILE = "Telegram-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ( "-ObjC", "-lz", @@ -7086,18 +7056,12 @@ CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = C67CF9S4VU; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)", - "$(PROJECT_DIR)/third-party", - ); + FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Watch/Bridge"; INFOPLIST_FILE = "Telegram-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ( "-ObjC", "-lz", @@ -7651,18 +7615,12 @@ CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = C67CF9S4VU; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(BUILT_PRODUCTS_DIR)", - "$(PROJECT_DIR)/third-party", - ); + FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/Watch/Bridge"; INFOPLIST_FILE = "Telegram-iOS/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/submodules/TelegramUI/third-party/opus/lib", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = ( "-ObjC", "-lz", diff --git a/Telegram-iOS.xcworkspace/xcshareddata/xcschemes/Telegram-iOS-Hockeyapp-Internal.xcscheme b/Telegram-iOS.xcworkspace/xcshareddata/xcschemes/Telegram-iOS-Hockeyapp-Internal.xcscheme index 7152c964ab..9eca0c5a86 100644 --- a/Telegram-iOS.xcworkspace/xcshareddata/xcschemes/Telegram-iOS-Hockeyapp-Internal.xcscheme +++ b/Telegram-iOS.xcworkspace/xcshareddata/xcschemes/Telegram-iOS-Hockeyapp-Internal.xcscheme @@ -41,6 +41,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -63,17 +72,6 @@ - - - - - - @@ -105,8 +104,6 @@ isEnabled = "YES"> - - , override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { var updatedInsets = layout.intrinsicInsets updatedInsets.bottom += BotCheckoutActionButton.diameter + 20.0 - super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition) + super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition) let actionButtonFrame = CGRect(origin: CGPoint(x: 10.0, y: layout.size.height - 10.0 - BotCheckoutActionButton.diameter - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width - 20.0, height: BotCheckoutActionButton.diameter)) transition.updateFrame(node: self.actionButton, frame: actionButtonFrame) diff --git a/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift index ea2de2edc9..b1acd3946a 100644 --- a/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift +++ b/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift @@ -301,7 +301,7 @@ final class BotReceiptControllerNode: ItemListControllerNode { override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { var updatedInsets = layout.intrinsicInsets updatedInsets.bottom += BotCheckoutActionButton.diameter + 20.0 - super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition) + super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition) let actionButtonFrame = CGRect(origin: CGPoint(x: 10.0, y: layout.size.height - 10.0 - BotCheckoutActionButton.diameter - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width - 20.0, height: BotCheckoutActionButton.diameter)) transition.updateFrame(node: self.actionButton, frame: actionButtonFrame) diff --git a/submodules/CallListUI/Sources/CallListCallItem.swift b/submodules/CallListUI/Sources/CallListCallItem.swift index c21381da8e..63da73e68c 100644 --- a/submodules/CallListUI/Sources/CallListCallItem.swift +++ b/submodules/CallListUI/Sources/CallListCallItem.swift @@ -474,14 +474,16 @@ class CallListCallItemNode: ItemListRevealOptionsItemNode { switch item.style { case .plain: - if strongSelf.backgroundNode.supernode != nil { - strongSelf.backgroundNode.removeFromSupernode() + if strongSelf.backgroundNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0) } if strongSelf.topStripeNode.supernode != nil { strongSelf.topStripeNode.removeFromSupernode() } - if strongSelf.bottomStripeNode.supernode == nil { - strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 0) + if !last && strongSelf.bottomStripeNode.supernode == nil { + strongSelf.insertSubnode(strongSelf.bottomStripeNode, at: 1) + } else if last && strongSelf.bottomStripeNode.supernode != nil { + strongSelf.bottomStripeNode.removeFromSupernode() } transition.updateFrameAdditive(node: strongSelf.bottomStripeNode, frame: CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight))) diff --git a/submodules/ChatListSearchItemNode/Sources/ChatListSearchItem.swift b/submodules/ChatListSearchItemNode/Sources/ChatListSearchItem.swift index 792fab75f0..b3a6df7f8b 100644 --- a/submodules/ChatListSearchItemNode/Sources/ChatListSearchItem.swift +++ b/submodules/ChatListSearchItemNode/Sources/ChatListSearchItem.swift @@ -115,7 +115,7 @@ public class ChatListSearchItemNode: ListViewItemNode { let baseWidth = params.width - params.leftInset - params.rightInset let backgroundColor = nextIsPinned ? item.theme.chatList.pinnedItemBackgroundColor : item.theme.chatList.itemBackgroundColor - let placeholderColor = item.theme.rootController.navigationSearchBar.inputPlaceholderTextColor + let placeholderColor = item.theme.list.itemSecondaryTextColor let (_, searchBarApply) = searchBarNodeLayout(NSAttributedString(string: placeholder ?? "", font: searchBarFont, textColor: placeholderColor), CGSize(width: baseWidth - 20.0, height: 36.0), 1.0, placeholderColor, nextIsPinned ? item.theme.chatList.pinnedSearchBarColor : item.theme.chatList.regularSearchBarColor, backgroundColor, .immediate) diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift index 434d90d411..8058f1e7ba 100644 --- a/submodules/ChatListUI/Sources/ChatListController.swift +++ b/submodules/ChatListUI/Sources/ChatListController.swift @@ -1201,18 +1201,18 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, } func previewingController(from sourceView: UIView, for location: CGPoint) -> (UIViewController, CGRect)? { - guard let layout = self.validLayout, case .compact = layout.metrics.widthClass else { + guard let layout = self.validLayout, case .phone = layout.deviceMetrics.type else { return nil } let boundsSize = self.view.bounds.size let contentSize: CGSize - if let metrics = DeviceMetrics.forScreenSize(layout.size) { - contentSize = metrics.previewingContentSize(inLandscape: boundsSize.width > boundsSize.height) - } else { + if case .unknown = layout.deviceMetrics { contentSize = boundsSize + } else { + contentSize = layout.deviceMetrics.previewingContentSize(inLandscape: boundsSize.width > boundsSize.height) } - + if let searchController = self.chatListDisplayNode.searchDisplayController { if let (view, bounds, action) = searchController.previewViewAndActionAtLocation(location) { if let peerId = action as? PeerId, peerId.namespace != Namespaces.Peer.SecretChat { @@ -1222,7 +1222,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, let chatController = self.context.sharedContext.makeChatController(context: self.context, chatLocation: .peer(peerId), subject: nil, botStart: nil, mode: .standard(previewing: true)) chatController.canReadHistory.set(false) - chatController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + chatController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) return (chatController, sourceRect) } else if let messageId = action as? MessageId, messageId.peerId.namespace != Namespaces.Peer.SecretChat { var sourceRect = view.superview!.convert(view.frame, to: sourceView) @@ -1231,7 +1231,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, let chatController = self.context.sharedContext.makeChatController(context: self.context, chatLocation: .peer(messageId.peerId), subject: .message(messageId), botStart: nil, mode: .standard(previewing: true)) chatController.canReadHistory.set(false) - chatController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + chatController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) return (chatController, sourceRect) } } @@ -1254,14 +1254,14 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController, if peer.peerId.namespace != Namespaces.Peer.SecretChat { let chatController = self.context.sharedContext.makeChatController(context: self.context, chatLocation: .peer(peer.peerId), subject: nil, botStart: nil, mode: .standard(previewing: true)) chatController.canReadHistory.set(false) - chatController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + chatController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) return (chatController, sourceRect) } else { return nil } case let .groupReference(groupId, _, _, _, _): let chatListController = ChatListControllerImpl(context: self.context, groupId: groupId, controlsHistoryPreload: false, enableDebugActions: false) - chatListController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + chatListController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) return (chatListController, sourceRect) } } else { diff --git a/submodules/ContactListUI/Sources/ContactsController.swift b/submodules/ContactListUI/Sources/ContactsController.swift index 138c67ec4b..17c4a536a9 100644 --- a/submodules/ContactListUI/Sources/ContactsController.swift +++ b/submodules/ContactListUI/Sources/ContactsController.swift @@ -388,18 +388,18 @@ public class ContactsController: ViewController { } func previewingController(from sourceView: UIView, for location: CGPoint) -> (UIViewController, CGRect)? { - guard let layout = self.validLayout, case .compact = layout.metrics.widthClass else { + guard let layout = self.validLayout, case .phone = layout.deviceMetrics.type else { return nil } let boundsSize = self.view.bounds.size let contentSize: CGSize - if let metrics = DeviceMetrics.forScreenSize(layout.size) { - contentSize = metrics.previewingContentSize(inLandscape: boundsSize.width > boundsSize.height) - } else { + if case .unknown = layout.deviceMetrics { contentSize = boundsSize + } else { + contentSize = layout.deviceMetrics.previewingContentSize(inLandscape: boundsSize.width > boundsSize.height) } - + var selectedNode: ContactsPeerItemNode? if let searchController = self.contactsNode.searchDisplayController { @@ -435,7 +435,7 @@ public class ContactsController: ViewController { if peer.id.namespace != Namespaces.Peer.SecretChat { 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) - chatController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + chatController.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) return (chatController, sourceRect) } else { return nil diff --git a/submodules/ContactListUI/Sources/ContactsControllerNode.swift b/submodules/ContactListUI/Sources/ContactsControllerNode.swift index 8bfd38edcd..10f988b75f 100644 --- a/submodules/ContactListUI/Sources/ContactsControllerNode.swift +++ b/submodules/ContactListUI/Sources/ContactsControllerNode.swift @@ -144,7 +144,7 @@ final class ContactsControllerNode: ASDisplayNode { searchDisplayController.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition) } - self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) + self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) self.contactListNode.frame = CGRect(origin: CGPoint(), size: layout.size) } diff --git a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift index ba7081411c..a12d158d4b 100644 --- a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift +++ b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift @@ -825,7 +825,7 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode { super.updateRevealOffset(offset: offset, transition: transition) if let item = self.item, let params = self.layoutParams?.1 { - var leftInset: CGFloat = 65.0 + var leftInset: CGFloat = 65.0 + params.leftInset switch item.selection { case .none: diff --git a/submodules/Display/Display/CAAnimationUtils.swift b/submodules/Display/Display/CAAnimationUtils.swift index 2ce42887a3..8246010784 100644 --- a/submodules/Display/Display/CAAnimationUtils.swift +++ b/submodules/Display/Display/CAAnimationUtils.swift @@ -32,7 +32,7 @@ private let completionKey = "CAAnimationUtils_completion" public let kCAMediaTimingFunctionSpring = "CAAnimationUtilsSpringCurve" public extension CAAnimation { - public var completion: ((Bool) -> Void)? { + var completion: ((Bool) -> Void)? { get { if let delegate = self.delegate as? CALayerAnimationDelegate { return delegate.completion @@ -50,7 +50,7 @@ public extension CAAnimation { } public extension CALayer { - public func makeAnimation(from: AnyObject, to: AnyObject, keyPath: String, timingFunction: String, duration: Double, delay: Double = 0.0, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) -> CAAnimation { + func makeAnimation(from: AnyObject, to: AnyObject, keyPath: String, timingFunction: String, duration: Double, delay: Double = 0.0, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) -> CAAnimation { if timingFunction == kCAMediaTimingFunctionSpring { let animation = makeSpringAnimation(keyPath) animation.fromValue = from @@ -109,12 +109,12 @@ public extension CALayer { } } - public func animate(from: AnyObject, to: AnyObject, keyPath: String, timingFunction: String, duration: Double, delay: Double = 0.0, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) { + func animate(from: AnyObject, to: AnyObject, keyPath: String, timingFunction: String, duration: Double, delay: Double = 0.0, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) { let animation = self.makeAnimation(from: from, to: to, keyPath: keyPath, timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: additive, completion: completion) self.add(animation, forKey: additive ? nil : keyPath) } - public func animateGroup(_ animations: [CAAnimation], key: String) { + func animateGroup(_ animations: [CAAnimation], key: String) { let animationGroup = CAAnimationGroup() var timeOffset = 0.0 for animation in animations { @@ -126,7 +126,7 @@ public extension CALayer { self.add(animationGroup, forKey: key) } - public func animateKeyframes(values: [AnyObject], duration: Double, keyPath: String, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) { + func animateKeyframes(values: [AnyObject], duration: Double, keyPath: String, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) { let k = Float(UIView.animationDurationFactor()) var speed: Float = 1.0 if k != 0 && k != 1 { @@ -156,7 +156,7 @@ public extension CALayer { self.add(animation, forKey: keyPath) } - public func animateSpring(from: AnyObject, to: AnyObject, keyPath: String, duration: Double, delay: Double = 0.0, initialVelocity: CGFloat = 0.0, damping: CGFloat = 88.0, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) { + func animateSpring(from: AnyObject, to: AnyObject, keyPath: String, duration: Double, delay: Double = 0.0, initialVelocity: CGFloat = 0.0, damping: CGFloat = 88.0, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) { let animation: CABasicAnimation if #available(iOS 9.0, *) { animation = makeSpringBounceAnimation(keyPath, initialVelocity, damping) @@ -188,7 +188,7 @@ public extension CALayer { self.add(animation, forKey: keyPath) } - public func animateAdditive(from: NSValue, to: NSValue, keyPath: String, key: String, timingFunction: String, mediaTimingFunction: CAMediaTimingFunction? = nil, duration: Double, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { + func animateAdditive(from: NSValue, to: NSValue, keyPath: String, key: String, timingFunction: String, mediaTimingFunction: CAMediaTimingFunction? = nil, duration: Double, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { let k = Float(UIView.animationDurationFactor()) var speed: Float = 1.0 if k != 0 && k != 1 { @@ -215,15 +215,15 @@ public extension CALayer { self.add(animation, forKey: key) } - public func animateAlpha(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> ())? = nil) { + func animateAlpha(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> ())? = nil) { self.animate(from: NSNumber(value: Float(from)), to: NSNumber(value: Float(to)), keyPath: "opacity", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, completion: completion) } - public func animateScale(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { + func animateScale(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { self.animate(from: NSNumber(value: Float(from)), to: NSNumber(value: Float(to)), keyPath: "transform.scale", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, completion: completion) } - public func animateRotation(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { + func animateRotation(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { self.animate(from: NSNumber(value: Float(from)), to: NSNumber(value: Float(to)), keyPath: "transform.rotation.z", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, completion: completion) } @@ -247,27 +247,27 @@ public extension CALayer { self.animate(from: NSValue(cgRect: from), to: NSValue(cgRect: to), keyPath: "bounds", timingFunction: timingFunction, duration: duration, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: additive, completion: completion) } - public func animateBoundsOriginXAdditive(from: CGFloat, to: CGFloat, duration: Double, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { + func animateBoundsOriginXAdditive(from: CGFloat, to: CGFloat, duration: Double, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { self.animate(from: from as NSNumber, to: to as NSNumber, keyPath: "bounds.origin.x", timingFunction: timingFunction, duration: duration, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: completion) } - public func animateBoundsOriginYAdditive(from: CGFloat, to: CGFloat, duration: Double, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { + func animateBoundsOriginYAdditive(from: CGFloat, to: CGFloat, duration: Double, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { self.animate(from: from as NSNumber, to: to as NSNumber, keyPath: "bounds.origin.y", timingFunction: timingFunction, duration: duration, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: completion) } - public func animateBoundsOriginXAdditive(from: CGFloat, to: CGFloat, duration: Double, mediaTimingFunction: CAMediaTimingFunction) { + func animateBoundsOriginXAdditive(from: CGFloat, to: CGFloat, duration: Double, mediaTimingFunction: CAMediaTimingFunction) { self.animate(from: from as NSNumber, to: to as NSNumber, keyPath: "bounds.origin.x", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: duration, mediaTimingFunction: mediaTimingFunction, additive: true) } - public func animateBoundsOriginYAdditive(from: CGFloat, to: CGFloat, duration: Double, mediaTimingFunction: CAMediaTimingFunction) { + func animateBoundsOriginYAdditive(from: CGFloat, to: CGFloat, duration: Double, mediaTimingFunction: CAMediaTimingFunction) { self.animate(from: from as NSNumber, to: to as NSNumber, keyPath: "bounds.origin.y", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: duration, mediaTimingFunction: mediaTimingFunction, additive: true) } - public func animatePositionKeyframes(values: [CGPoint], duration: Double, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { + func animatePositionKeyframes(values: [CGPoint], duration: Double, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) { self.animateKeyframes(values: values.map { NSValue(cgPoint: $0) }, duration: duration, keyPath: "position") } - public func animateFrame(from: CGRect, to: CGRect, duration: Double, timingFunction: String, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, force: Bool = false, completion: ((Bool) -> Void)? = nil) { + func animateFrame(from: CGRect, to: CGRect, duration: Double, timingFunction: String, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, force: Bool = false, completion: ((Bool) -> Void)? = nil) { if from == to && !force { if let completion = completion { completion(true) @@ -317,7 +317,7 @@ public extension CALayer { }) } - public func cancelAnimationsRecursive(key: String) { + func cancelAnimationsRecursive(key: String) { self.removeAnimation(forKey: key) if let sublayers = self.sublayers { for layer in sublayers { diff --git a/submodules/Display/Display/ContainedViewLayoutTransition.swift b/submodules/Display/Display/ContainedViewLayoutTransition.swift index 147c8e762a..78812f3540 100644 --- a/submodules/Display/Display/ContainedViewLayoutTransition.swift +++ b/submodules/Display/Display/ContainedViewLayoutTransition.swift @@ -776,7 +776,7 @@ public extension ContainedViewLayoutTransition { #if os(iOS) public extension ContainedViewLayoutTransition { - public func animateView(_ f: @escaping () -> Void) { + func animateView(_ f: @escaping () -> Void) { switch self { case .immediate: f() diff --git a/submodules/Display/Display/ContainerViewLayout.swift b/submodules/Display/Display/ContainerViewLayout.swift index e68126a809..559ae45b58 100644 --- a/submodules/Display/Display/ContainerViewLayout.swift +++ b/submodules/Display/Display/ContainerViewLayout.swift @@ -35,32 +35,55 @@ public struct LayoutMetrics: Equatable { } } +public enum LayoutOrientation { + case portrait + case landscape +} + public struct ContainerViewLayout: Equatable { public var size: CGSize public var metrics: LayoutMetrics + public var deviceMetrics: DeviceMetrics public var intrinsicInsets: UIEdgeInsets public var safeInsets: UIEdgeInsets public var statusBarHeight: CGFloat? public var inputHeight: CGFloat? - public var standardInputHeight: CGFloat public var inputHeightIsInteractivellyChanging: Bool public var inVoiceOver: Bool - public init(size: CGSize, metrics: LayoutMetrics, intrinsicInsets: UIEdgeInsets, safeInsets: UIEdgeInsets, statusBarHeight: CGFloat?, inputHeight: CGFloat?, standardInputHeight: CGFloat, inputHeightIsInteractivellyChanging: Bool, inVoiceOver: Bool) { + public init(size: CGSize, metrics: LayoutMetrics, deviceMetrics: DeviceMetrics, intrinsicInsets: UIEdgeInsets, safeInsets: UIEdgeInsets, statusBarHeight: CGFloat?, inputHeight: CGFloat?, inputHeightIsInteractivellyChanging: Bool, inVoiceOver: Bool) { self.size = size self.metrics = metrics + self.deviceMetrics = deviceMetrics self.intrinsicInsets = intrinsicInsets self.safeInsets = safeInsets self.statusBarHeight = statusBarHeight self.inputHeight = inputHeight - self.standardInputHeight = standardInputHeight self.inputHeightIsInteractivellyChanging = inputHeightIsInteractivellyChanging self.inVoiceOver = inVoiceOver } - public func insets(options: ContainerViewLayoutInsetOptions) -> UIEdgeInsets { + public func addedInsets(insets: UIEdgeInsets) -> ContainerViewLayout { + return ContainerViewLayout(size: self.size, metrics: self.metrics, deviceMetrics: self.deviceMetrics, intrinsicInsets: UIEdgeInsets(top: self.intrinsicInsets.top + insets.top, left: self.intrinsicInsets.left + insets.left, bottom: self.intrinsicInsets.bottom + insets.bottom, right: self.intrinsicInsets.right + insets.right), safeInsets: self.safeInsets, statusBarHeight: self.statusBarHeight, inputHeight: self.inputHeight, inputHeightIsInteractivellyChanging: self.inputHeightIsInteractivellyChanging, inVoiceOver: self.inVoiceOver) + } + + public func withUpdatedSize(_ size: CGSize) -> ContainerViewLayout { + return ContainerViewLayout(size: size, metrics: self.metrics, deviceMetrics: self.deviceMetrics, intrinsicInsets: self.intrinsicInsets, safeInsets: self.safeInsets, statusBarHeight: self.statusBarHeight, inputHeight: self.inputHeight, inputHeightIsInteractivellyChanging: self.inputHeightIsInteractivellyChanging, inVoiceOver: self.inVoiceOver) + } + + public func withUpdatedInputHeight(_ inputHeight: CGFloat?) -> ContainerViewLayout { + return ContainerViewLayout(size: self.size, metrics: self.metrics, deviceMetrics: self.deviceMetrics, intrinsicInsets: self.intrinsicInsets, safeInsets: self.safeInsets, statusBarHeight: self.statusBarHeight, inputHeight: inputHeight, inputHeightIsInteractivellyChanging: self.inputHeightIsInteractivellyChanging, inVoiceOver: self.inVoiceOver) + } + + public func withUpdatedMetrics(_ metrics: LayoutMetrics) -> ContainerViewLayout { + return ContainerViewLayout(size: self.size, metrics: metrics, deviceMetrics: self.deviceMetrics, intrinsicInsets: self.intrinsicInsets, safeInsets: self.safeInsets, statusBarHeight: self.statusBarHeight, inputHeight: self.inputHeight, inputHeightIsInteractivellyChanging: self.inputHeightIsInteractivellyChanging, inVoiceOver: self.inVoiceOver) + } +} + +public extension ContainerViewLayout { + func insets(options: ContainerViewLayoutInsetOptions) -> UIEdgeInsets { var insets = self.intrinsicInsets - if let statusBarHeight = self.statusBarHeight , options.contains(.statusBar) { + if let statusBarHeight = self.statusBarHeight, options.contains(.statusBar) { insets.top += statusBarHeight } if let inputHeight = self.inputHeight, options.contains(.input) { @@ -69,19 +92,55 @@ public struct ContainerViewLayout: Equatable { return insets } - public func addedInsets(insets: UIEdgeInsets) -> ContainerViewLayout { - return ContainerViewLayout(size: self.size, metrics: self.metrics, intrinsicInsets: UIEdgeInsets(top: self.intrinsicInsets.top + insets.top, left: self.intrinsicInsets.left + insets.left, bottom: self.intrinsicInsets.bottom + insets.bottom, right: self.intrinsicInsets.right + insets.right), safeInsets: self.safeInsets, statusBarHeight: self.statusBarHeight, inputHeight: self.inputHeight, standardInputHeight: self.standardInputHeight, inputHeightIsInteractivellyChanging: self.inputHeightIsInteractivellyChanging, inVoiceOver: self.inVoiceOver) + var isNonExclusive: Bool { + if case .tablet = self.deviceMetrics.type { + if case .compact = self.metrics.widthClass { + return true + } + if case .compact = self.metrics.heightClass { + return true + } + } + return false } - public func withUpdatedSize(_ size: CGSize) -> ContainerViewLayout { - return ContainerViewLayout(size: size, metrics: self.metrics, intrinsicInsets: self.intrinsicInsets, safeInsets: self.safeInsets, statusBarHeight: self.statusBarHeight, inputHeight: self.inputHeight, standardInputHeight: self.standardInputHeight, inputHeightIsInteractivellyChanging: self.inputHeightIsInteractivellyChanging, inVoiceOver: self.inVoiceOver) + var inSplitView: Bool { + var maybeSplitView = false + if case .tablet = self.deviceMetrics.type { + if case .compact = self.metrics.widthClass { + maybeSplitView = true + } + if case .compact = self.metrics.heightClass { + maybeSplitView = true + } + } + if maybeSplitView && abs(max(self.size.width, self.size.height) - self.deviceMetrics.screenSize.height) < 1.0 { + return true + } + return false } - public func withUpdatedInputHeight(_ inputHeight: CGFloat?) -> ContainerViewLayout { - return ContainerViewLayout(size: self.size, metrics: self.metrics, intrinsicInsets: self.intrinsicInsets, safeInsets: self.safeInsets, statusBarHeight: self.statusBarHeight, inputHeight: inputHeight, standardInputHeight: self.standardInputHeight, inputHeightIsInteractivellyChanging: self.inputHeightIsInteractivellyChanging, inVoiceOver: self.inVoiceOver) + var inSlideOver: Bool { + var maybeSlideOver = false + if case .tablet = self.deviceMetrics.type { + if case .compact = self.metrics.widthClass { + maybeSlideOver = true + } + if case .compact = self.metrics.heightClass { + maybeSlideOver = true + } + } + if maybeSlideOver && abs(max(self.size.width, self.size.height) - self.deviceMetrics.screenSize.height) > 10.0 { + return true + } + return false } - public func withUpdatedMetrics(_ metrics: LayoutMetrics) -> ContainerViewLayout { - return ContainerViewLayout(size: self.size, metrics: metrics, intrinsicInsets: self.intrinsicInsets, safeInsets: self.safeInsets, statusBarHeight: self.statusBarHeight, inputHeight: self.inputHeight, standardInputHeight: self.standardInputHeight, inputHeightIsInteractivellyChanging: self.inputHeightIsInteractivellyChanging, inVoiceOver: self.inVoiceOver) + var orientation: LayoutOrientation { + return self.size.width > self.size.height ? .landscape : .portrait + } + + var standardInputHeight: CGFloat { + return self.deviceMetrics.keyboardHeight(inLandscape: self.orientation == .landscape) + self.deviceMetrics.predictiveInputHeight(inLandscape: self.orientation == .landscape) } } diff --git a/submodules/Display/Display/DeviceMetrics.swift b/submodules/Display/Display/DeviceMetrics.swift index 7e7f03e235..3ff81fcfe3 100644 --- a/submodules/Display/Display/DeviceMetrics.swift +++ b/submodules/Display/Display/DeviceMetrics.swift @@ -1,6 +1,11 @@ import UIKit -public enum DeviceMetrics: CaseIterable { +public enum DeviceType { + case phone + case tablet +} + +public enum DeviceMetrics: CaseIterable, Equatable { case iPhone4 case iPhone5 case iPhone6 @@ -12,23 +17,44 @@ public enum DeviceMetrics: CaseIterable { case iPadPro11Inch case iPadPro case iPadPro3rdGen + case unknown(screenSize: CGSize, statusBarHeight: CGFloat, onScreenNavigationHeight: CGFloat?) - public static func forScreenSize(_ size: CGSize, hintHasOnScreenNavigation: Bool = false) -> DeviceMetrics? { - let additionalSize = CGSize(width: size.width, height: size.height + 20.0) - for device in DeviceMetrics.allCases { - let width = device.screenSize.width - let height = device.screenSize.height - - if ((size.width.isEqual(to: width) && size.height.isEqual(to: height)) || size.height.isEqual(to: width) && size.width.isEqual(to: height)) || ((additionalSize.width.isEqual(to: width) && additionalSize.height.isEqual(to: height)) || additionalSize.height.isEqual(to: width) && additionalSize.width.isEqual(to: height)) { - if hintHasOnScreenNavigation && device.onScreenNavigationHeight(inLandscape: false) == nil { - continue - } - return device - } + public static var allCases: [DeviceMetrics] { + return [.iPhone4, .iPhone5, .iPhone6, .iPhone6Plus, .iPhoneX, .iPhoneXSMax, + .iPad, .iPadPro10Inch, .iPadPro11Inch, .iPadPro, .iPadPro3rdGen] + } + + public init(screenSize: CGSize, statusBarHeight: CGFloat, onScreenNavigationHeight: CGFloat?) { + var screenSize = screenSize + if screenSize.width > screenSize.height { + screenSize = CGSize(width: screenSize.height, height: screenSize.width) } - - return nil + let additionalSize = CGSize(width: screenSize.width, height: screenSize.height + 20.0) + for device in DeviceMetrics.allCases { + if let _ = onScreenNavigationHeight, device.onScreenNavigationHeight(inLandscape: false) == nil { + continue + } + + let width = device.screenSize.width + let height = device.screenSize.height + if ((screenSize.width.isEqual(to: width) && screenSize.height.isEqual(to: height)) || (additionalSize.width.isEqual(to: width) && additionalSize.height.isEqual(to: height))) { + self = device + return + } + } + self = .unknown(screenSize: screenSize, statusBarHeight: statusBarHeight, onScreenNavigationHeight: onScreenNavigationHeight) + } + + public var type: DeviceType { + switch self { + case .iPad, .iPadPro10Inch, .iPadPro11Inch, .iPadPro, .iPadPro3rdGen: + return .tablet + case let .unknown(screenSize, _, _) where screenSize.width >= 768.0 && screenSize.height >= 1024.0: + return .tablet + default: + return .phone + } } var screenSize: CGSize { @@ -53,10 +79,12 @@ public enum DeviceMetrics: CaseIterable { return CGSize(width: 834.0, height: 1194.0) case .iPadPro, .iPadPro3rdGen: return CGSize(width: 1024.0, height: 1366.0) + case let .unknown(screenSize, _, _): + return screenSize } } - func safeAreaInsets(inLandscape: Bool) -> UIEdgeInsets { + func safeInsets(inLandscape: Bool) -> UIEdgeInsets { switch self { case .iPhoneX, .iPhoneXSMax: return inLandscape ? UIEdgeInsets(top: 0.0, left: 44.0, bottom: 0.0, right: 44.0) : UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0) @@ -71,6 +99,8 @@ public enum DeviceMetrics: CaseIterable { return inLandscape ? 21.0 : 34.0 case .iPadPro3rdGen, .iPadPro11Inch: return 21.0 + case let .unknown(_, _, onScreenNavigationHeight): + return onScreenNavigationHeight default: return nil } @@ -82,12 +112,14 @@ public enum DeviceMetrics: CaseIterable { return 44.0 case .iPadPro11Inch, .iPadPro3rdGen: return 24.0 + case let .unknown(_, statusBarHeight, _): + return statusBarHeight default: return 20.0 } } - public func standardInputHeight(inLandscape: Bool) -> CGFloat { + public func keyboardHeight(inLandscape: Bool) -> CGFloat { if inLandscape { switch self { case .iPhone4, .iPhone5: @@ -104,6 +136,8 @@ public enum DeviceMetrics: CaseIterable { return 421.0 case .iPadPro3rdGen: return 441.0 + case .unknown: + return 216.0 } } else { switch self { @@ -123,6 +157,8 @@ public enum DeviceMetrics: CaseIterable { return 328.0 case .iPadPro3rdGen: return 348.0 + case .unknown: + return 216.0 } } } @@ -134,6 +170,8 @@ public enum DeviceMetrics: CaseIterable { return 37.0 case .iPad, .iPadPro10Inch, .iPadPro11Inch, .iPadPro, .iPadPro3rdGen: return 50.0 + case .unknown: + return 37.0 } } else { switch self { @@ -143,6 +181,8 @@ public enum DeviceMetrics: CaseIterable { return 44.0 case .iPad, .iPadPro10Inch, .iPadPro11Inch, .iPadPro, .iPadPro3rdGen: return 50.0 + case .unknown: + return 44.0 } } } @@ -181,4 +221,13 @@ public enum DeviceMetrics: CaseIterable { } } } + + public var hasTopNotch: Bool { + switch self { + case .iPhoneX, .iPhoneXSMax: + return true + default: + return false + } + } } diff --git a/submodules/Display/Display/EditableTextNode.swift b/submodules/Display/Display/EditableTextNode.swift index b10ea9b24a..f5be807bf5 100644 --- a/submodules/Display/Display/EditableTextNode.swift +++ b/submodules/Display/Display/EditableTextNode.swift @@ -15,6 +15,22 @@ public class EditableTextNode: ASEditableTextNode { self.textView.reloadInputViews() } } + + public var isRTL: Bool { + if let text = self.textView.text, !text.isEmpty { + let tagger = NSLinguisticTagger(tagSchemes: [.language], options: 0) + tagger.string = text + + let lang = tagger.tag(at: 0, scheme: .language, tokenRange: nil, sentenceRange: nil) + if let lang = lang?.rawValue, lang.contains("he") || lang.contains("ar") || lang.contains("fa") { + return true + } else { + return false + } + } else { + return false + } + } } public extension UITextView { diff --git a/submodules/Display/Display/NavigationController.swift b/submodules/Display/Display/NavigationController.swift index b8690daa3c..11799d6f45 100644 --- a/submodules/Display/Display/NavigationController.swift +++ b/submodules/Display/Display/NavigationController.swift @@ -267,10 +267,10 @@ open class NavigationController: UINavigationController, ContainableController, let masterWidth: CGFloat = max(320.0, floor(layout.size.width / 3.0)) let detailWidth: CGFloat = layout.size.width - masterWidth if index == 0 { - return (CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: masterWidth, height: layout.size.height)), ContainerViewLayout(size: CGSize(width: masterWidth, height: layout.size.height), metrics: layout.metrics, intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver)) + return (CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: masterWidth, height: layout.size.height)), ContainerViewLayout(size: CGSize(width: masterWidth, height: layout.size.height), metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver)) } else { let detailFrame = CGRect(origin: CGPoint(x: masterWidth, y: 0.0), size: CGSize(width: detailWidth, height: layout.size.height)) - return (CGRect(origin: CGPoint(), size: detailFrame.size), ContainerViewLayout(size: CGSize(width: detailWidth, height: layout.size.height), metrics: LayoutMetrics(widthClass: .regular, heightClass: .regular), intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver)) + return (CGRect(origin: CGPoint(), size: detailFrame.size), ContainerViewLayout(size: CGSize(width: detailWidth, height: layout.size.height), metrics: LayoutMetrics(widthClass: .regular, heightClass: .regular), deviceMetrics: layout.deviceMetrics, intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver)) } case .single: var heightClass: ContainerViewLayoutSizeClass @@ -280,7 +280,7 @@ open class NavigationController: UINavigationController, ContainableController, heightClass = .compact } - return (CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: layout.size.height)), ContainerViewLayout(size: CGSize(width: layout.size.width, height: layout.size.height), metrics: LayoutMetrics(widthClass: .compact, heightClass: heightClass), intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver)) + return (CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: layout.size.height)), ContainerViewLayout(size: CGSize(width: layout.size.width, height: layout.size.height), metrics: LayoutMetrics(widthClass: .compact, heightClass: heightClass), deviceMetrics: layout.deviceMetrics, intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver)) } } @@ -434,6 +434,10 @@ open class NavigationController: UINavigationController, ContainableController, if self.controllerView.sharedStatusBar.view.superview != nil { self.controllerView.sharedStatusBar.removeFromSupernode() self.controllerView.containerView.layer.setTraceableInfo(nil) + + if layout.deviceMetrics.type == .tablet { + self.controllerView.containerView.layer.setTraceableInfo(CATracingLayerInfo(shouldBeAdjustedToInverseTransform: true, userData: self, tracingTag: 0, disableChildrenTracingTags: WindowTracingTags.statusBar | WindowTracingTags.keyboard)) + } } case .masterDetail: if self.controllerView.sharedStatusBar.view.superview == nil { @@ -716,7 +720,7 @@ open class NavigationController: UINavigationController, ContainableController, self.updateControllerLayouts(previousControllers: self._viewControllers, layout: layout, transition: transition) if let presentedViewController = self.presentedViewController { - let containedLayout = ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver) + let containedLayout = ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver) if let presentedViewController = presentedViewController as? ContainableController { presentedViewController.containerLayoutUpdated(containedLayout, transition: transition) @@ -861,7 +865,6 @@ open class NavigationController: UINavigationController, ContainableController, let translation = recognizer.translation(in: self.view).x let progress = max(0.0, min(1.0, translation / self.view.frame.width)) navigationTransitionCoordinator.progress = progress - } case .ended: if let navigationTransitionCoordinator = self.navigationTransitionCoordinator, !navigationTransitionCoordinator.animatingCompletion { diff --git a/submodules/Display/Display/ShakeAnimation.swift b/submodules/Display/Display/ShakeAnimation.swift index 1e36696312..8ee18b44ab 100644 --- a/submodules/Display/Display/ShakeAnimation.swift +++ b/submodules/Display/Display/ShakeAnimation.swift @@ -2,7 +2,7 @@ import Foundation import UIKit public extension CALayer { - public func addShakeAnimation(amplitude: CGFloat = 3.0, duration: Double = 0.3, count: Int = 4, decay: Bool = false) { + func addShakeAnimation(amplitude: CGFloat = 3.0, duration: Double = 0.3, count: Int = 4, decay: Bool = false) { let k = Float(UIView.animationDurationFactor()) var speed: Float = 1.0 if k != 0 && k != 1 { diff --git a/submodules/Display/Display/TabBarController.swift b/submodules/Display/Display/TabBarController.swift index afa7923f09..6eeab64030 100644 --- a/submodules/Display/Display/TabBarController.swift +++ b/submodules/Display/Display/TabBarController.swift @@ -191,7 +191,6 @@ open class TabBarController: ViewController { } updatedLayout.intrinsicInsets.bottom = tabBarHeight - strongSelf.controllers[index].containerLayoutUpdated(updatedLayout, transition: .immediate) } let startTime = CFAbsoluteTimeGetCurrent() @@ -302,7 +301,6 @@ open class TabBarController: ViewController { } updatedLayout.intrinsicInsets.bottom = tabBarHeight - currentController.containerLayoutUpdated(updatedLayout, transition: transition) } } diff --git a/submodules/Display/Display/UIKitUtils.swift b/submodules/Display/Display/UIKitUtils.swift index 9faf783388..a1eeb93118 100644 --- a/submodules/Display/Display/UIKitUtils.swift +++ b/submodules/Display/Display/UIKitUtils.swift @@ -188,7 +188,7 @@ public extension UIColor { } public extension CGSize { - public func fitted(_ size: CGSize) -> CGSize { + func fitted(_ size: CGSize) -> CGSize { var fittedSize = self if fittedSize.width > size.width { fittedSize = CGSize(width: size.width, height: floor((fittedSize.height * size.width / max(fittedSize.width, 1.0)))) @@ -199,11 +199,11 @@ public extension CGSize { return fittedSize } - public func cropped(_ size: CGSize) -> CGSize { + func cropped(_ size: CGSize) -> CGSize { return CGSize(width: min(size.width, self.width), height: min(size.height, self.height)) } - public func fittedToArea(_ area: CGFloat) -> CGSize { + func fittedToArea(_ area: CGFloat) -> CGSize { if self.height < 1.0 || self.width < 1.0 { return CGSize() } @@ -213,22 +213,22 @@ public extension CGSize { return CGSize(width: floor(width), height: floor(height)) } - public func aspectFilled(_ size: CGSize) -> CGSize { + func aspectFilled(_ size: CGSize) -> CGSize { let scale = max(size.width / max(1.0, self.width), size.height / max(1.0, self.height)) return CGSize(width: floor(self.width * scale), height: floor(self.height * scale)) } - public func aspectFitted(_ size: CGSize) -> CGSize { + func aspectFitted(_ size: CGSize) -> CGSize { let scale = min(size.width / max(1.0, self.width), size.height / max(1.0, self.height)) return CGSize(width: floor(self.width * scale), height: floor(self.height * scale)) } - public func aspectFittedOrSmaller(_ size: CGSize) -> CGSize { + func aspectFittedOrSmaller(_ size: CGSize) -> CGSize { let scale = min(1.0, min(size.width / max(1.0, self.width), size.height / max(1.0, self.height))) return CGSize(width: floor(self.width * scale), height: floor(self.height * scale)) } - public func aspectFittedWithOverflow(_ size: CGSize, leeway: CGFloat) -> CGSize { + func aspectFittedWithOverflow(_ size: CGSize, leeway: CGFloat) -> CGSize { let scale = min(size.width / max(1.0, self.width), size.height / max(1.0, self.height)) var result = CGSize(width: floor(self.width * scale), height: floor(self.height * scale)) if result.width < size.width && result.width > size.width - leeway { @@ -242,22 +242,22 @@ public extension CGSize { return result } - public func fittedToWidthOrSmaller(_ width: CGFloat) -> CGSize { + func fittedToWidthOrSmaller(_ width: CGFloat) -> CGSize { let scale = min(1.0, width / max(1.0, self.width)) return CGSize(width: floor(self.width * scale), height: floor(self.height * scale)) } - public func multipliedByScreenScale() -> CGSize { + func multipliedByScreenScale() -> CGSize { let scale = UIScreenScale return CGSize(width: self.width * scale, height: self.height * scale) } - public func dividedByScreenScale() -> CGSize { + func dividedByScreenScale() -> CGSize { let scale = UIScreenScale return CGSize(width: self.width / scale, height: self.height / scale) } - public var integralFloor: CGSize { + var integralFloor: CGSize { return CGSize(width: floor(self.width), height: floor(self.height)) } } @@ -272,7 +272,7 @@ public extension UIImage { self.draw(at: CGPoint()) let result = UIGraphicsGetImageFromCurrentImageContext()! UIGraphicsEndImageContext() - if !UIEdgeInsetsEqualToEdgeInsets(self.capInsets, UIEdgeInsets()) { + if self.capInsets != UIEdgeInsets() { return result.resizableImage(withCapInsets: self.capInsets, resizingMode: self.resizingMode) } return result @@ -350,7 +350,7 @@ private func makeLayerSubtreeSnapshot(layer: CALayer) -> CALayer? { } public extension UIView { - public func snapshotContentTree(unhide: Bool = false, keepTransform: Bool = false) -> UIView? { + func snapshotContentTree(unhide: Bool = false, keepTransform: Bool = false) -> UIView? { let wasHidden = self.isHidden if unhide && wasHidden { self.isHidden = false @@ -370,7 +370,7 @@ public extension UIView { } public extension CALayer { - public func snapshotContentTree(unhide: Bool = false) -> CALayer? { + func snapshotContentTree(unhide: Bool = false) -> CALayer? { let wasHidden = self.isHidden if unhide && wasHidden { self.isHidden = false @@ -390,29 +390,29 @@ public extension CALayer { } public extension CGRect { - public var topLeft: CGPoint { + var topLeft: CGPoint { return self.origin } - public var topRight: CGPoint { + var topRight: CGPoint { return CGPoint(x: self.maxX, y: self.minY) } - public var bottomLeft: CGPoint { + var bottomLeft: CGPoint { return CGPoint(x: self.minX, y: self.maxY) } - public var bottomRight: CGPoint { + var bottomRight: CGPoint { return CGPoint(x: self.maxX, y: self.maxY) } - public var center: CGPoint { + var center: CGPoint { return CGPoint(x: self.midX, y: self.midY) } } public extension CGPoint { - public func offsetBy(dx: CGFloat, dy: CGFloat) -> CGPoint { + func offsetBy(dx: CGFloat, dy: CGFloat) -> CGPoint { return CGPoint(x: self.x + dx, y: self.y + dy) } } diff --git a/submodules/Display/Display/ViewControllerPreviewing.swift b/submodules/Display/Display/ViewControllerPreviewing.swift index 765c269107..aa5c8e9937 100644 --- a/submodules/Display/Display/ViewControllerPreviewing.swift +++ b/submodules/Display/Display/ViewControllerPreviewing.swift @@ -65,14 +65,14 @@ private final class ViewControllerPeekContentNode: ASDisplayNode, PeekController if !self.hasValidLayout { self.hasValidLayout = true self.controller.view.frame = CGRect(origin: CGPoint(), size: size) - self.controller.containerLayoutUpdated(ContainerViewLayout(size: size, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + self.controller.containerLayoutUpdated(ContainerViewLayout(size: size, metrics: LayoutMetrics(), deviceMetrics: .unknown(screenSize: size, statusBarHeight: 20.0, onScreenNavigationHeight: nil), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) self.controller.setIgnoreAppearanceMethodInvocations(true) self.view.addSubview(self.controller.view) self.controller.setIgnoreAppearanceMethodInvocations(false) self.controller.viewWillAppear(false) self.controller.viewDidAppear(false) } else { - self.controller.containerLayoutUpdated(ContainerViewLayout(size: size, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: transition) + self.controller.containerLayoutUpdated(ContainerViewLayout(size: size, metrics: LayoutMetrics(), deviceMetrics: .unknown(screenSize: size, statusBarHeight: 20.0, onScreenNavigationHeight: nil), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: transition) } return size diff --git a/submodules/Display/Display/WindowContent.swift b/submodules/Display/Display/WindowContent.swift index aa81800ae6..369f4ac5d5 100644 --- a/submodules/Display/Display/WindowContent.swift +++ b/submodules/Display/Display/WindowContent.swift @@ -81,6 +81,7 @@ private struct UpdatingLayout { } } +private let defaultStatusBarHeight: CGFloat = 20.0 private let statusBarHiddenInLandscape: Bool = UIDevice.current.userInterfaceIdiom == .phone private func inputHeightOffsetForLayout(_ layout: WindowLayout) -> CGFloat { @@ -90,7 +91,7 @@ private func inputHeightOffsetForLayout(_ layout: WindowLayout) -> CGFloat { return 0.0 } -private func containedLayoutForWindowLayout(_ layout: WindowLayout, hasOnScreenNavigation: Bool) -> ContainerViewLayout { +private func containedLayoutForWindowLayout(_ layout: WindowLayout, deviceMetrics: DeviceMetrics) -> ContainerViewLayout { let resolvedStatusBarHeight: CGFloat? if let statusBarHeight = layout.statusBarHeight { if layout.forceInCallStatusBarText != nil { @@ -107,25 +108,13 @@ private func containedLayoutForWindowLayout(_ layout: WindowLayout, hasOnScreenN updatedInputHeight = inputHeight - inputHeightOffsetForLayout(layout) } + let isLandscape = layout.size.width > layout.size.height var resolvedSafeInsets = layout.safeInsets - var standardInputHeight: CGFloat = 216.0 - var predictiveHeight: CGFloat = 42.0 - - if let metrics = DeviceMetrics.forScreenSize(layout.size, hintHasOnScreenNavigation: hasOnScreenNavigation) { - let isLandscape = layout.size.width > layout.size.height - let safeAreaInsets = metrics.safeAreaInsets(inLandscape: isLandscape) - if !safeAreaInsets.left.isZero { - resolvedSafeInsets.left = safeAreaInsets.left - resolvedSafeInsets.right = safeAreaInsets.right - } - - standardInputHeight = metrics.standardInputHeight(inLandscape: isLandscape) - predictiveHeight = metrics.predictiveInputHeight(inLandscape: isLandscape) + if layout.safeInsets.left.isZero { + resolvedSafeInsets = deviceMetrics.safeInsets(inLandscape: isLandscape) } - standardInputHeight += predictiveHeight - - return ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: layout.onScreenNavigationHeight ?? 00, right: 0.0), safeInsets: resolvedSafeInsets, statusBarHeight: resolvedStatusBarHeight, inputHeight: updatedInputHeight, standardInputHeight: standardInputHeight, inputHeightIsInteractivellyChanging: layout.upperKeyboardInputPositionBound != nil && layout.upperKeyboardInputPositionBound != layout.size.height && layout.inputHeight != nil, inVoiceOver: layout.inVoiceOver) + return ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: deviceMetrics, intrinsicInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: layout.onScreenNavigationHeight ?? 0.0, right: 0.0), safeInsets: resolvedSafeInsets, statusBarHeight: resolvedStatusBarHeight, inputHeight: updatedInputHeight, inputHeightIsInteractivellyChanging: layout.upperKeyboardInputPositionBound != nil && layout.upperKeyboardInputPositionBound != layout.size.height && layout.inputHeight != nil, inVoiceOver: layout.inVoiceOver) } private func encodeText(_ string: String, _ key: Int) -> String { @@ -243,11 +232,11 @@ public final class WindowHostView { self.updatePreferNavigationUIHidden = updatePreferNavigationUIHidden } - var hasOnScreenNavigation: Bool { - if #available(iOSApplicationExtension 11.0, iOS 11.0, *) { - return !self.eventView.safeAreaInsets.bottom.isZero + fileprivate var onScreenNavigationHeight: CGFloat? { + if #available(iOSApplicationExtension 11.0, *) { + return self.eventView.safeAreaInsets.bottom.isLessThanOrEqualTo(0.0) ? nil : self.eventView.safeAreaInsets.bottom } else { - return false + return nil } } } @@ -275,10 +264,6 @@ private func layoutMetricsForScreenSize(_ size: CGSize) -> LayoutMetrics { } } -private func safeInsetsForScreenSize(_ size: CGSize, hasOnScreenNavigation: Bool) -> UIEdgeInsets { - return DeviceMetrics.forScreenSize(size, hintHasOnScreenNavigation: hasOnScreenNavigation)?.safeAreaInsets(inLandscape: size.width > size.height) ?? UIEdgeInsets.zero -} - public final class WindowKeyboardGestureRecognizerDelegate: NSObject, UIGestureRecognizerDelegate { public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool { return true @@ -292,6 +277,8 @@ public final class WindowKeyboardGestureRecognizerDelegate: NSObject, UIGestureR public class Window1 { public let hostView: WindowHostView + private var deviceMetrics: DeviceMetrics + private let statusBarHost: StatusBarHost? private let statusBarManager: StatusBarManager? private let keyboardManager: KeyboardManager? @@ -352,7 +339,7 @@ public class Window1 { self.volumeControlStatusBarNode.isHidden = true let boundsSize = self.hostView.eventView.bounds.size - let deviceMetrics = DeviceMetrics.forScreenSize(boundsSize, hintHasOnScreenNavigation: self.hostView.hasOnScreenNavigation) + self.deviceMetrics = DeviceMetrics(screenSize: UIScreen.main.bounds.size, statusBarHeight: statusBarHost?.statusBarFrame.height ?? defaultStatusBarHeight, onScreenNavigationHeight: self.hostView.onScreenNavigationHeight) self.statusBarHost = statusBarHost let statusBarHeight: CGFloat @@ -361,14 +348,16 @@ public class Window1 { self.statusBarManager = StatusBarManager(host: statusBarHost, volumeControlStatusBar: self.volumeControlStatusBar, volumeControlStatusBarNode: self.volumeControlStatusBarNode) self.keyboardManager = KeyboardManager(host: statusBarHost) } else { - statusBarHeight = deviceMetrics?.statusBarHeight ?? 20.0 + statusBarHeight = self.deviceMetrics.statusBarHeight self.statusBarManager = nil self.keyboardManager = nil } - let onScreenNavigationHeight = deviceMetrics?.onScreenNavigationHeight(inLandscape: boundsSize.width > boundsSize.height) + let isLandscape = boundsSize.width > boundsSize.height + let safeInsets = self.deviceMetrics.safeInsets(inLandscape: isLandscape) + let onScreenNavigationHeight = self.deviceMetrics.onScreenNavigationHeight(inLandscape: isLandscape) - self.windowLayout = WindowLayout(size: boundsSize, metrics: layoutMetricsForScreenSize(boundsSize), statusBarHeight: statusBarHeight, forceInCallStatusBarText: self.forceInCallStatusBarText, inputHeight: 0.0, safeInsets: safeInsetsForScreenSize(boundsSize, hasOnScreenNavigation: self.hostView.hasOnScreenNavigation), onScreenNavigationHeight: onScreenNavigationHeight, upperKeyboardInputPositionBound: nil, inVoiceOver: UIAccessibility.isVoiceOverRunning) + self.windowLayout = WindowLayout(size: boundsSize, metrics: layoutMetricsForScreenSize(boundsSize), statusBarHeight: statusBarHeight, forceInCallStatusBarText: self.forceInCallStatusBarText, inputHeight: 0.0, safeInsets: safeInsets, onScreenNavigationHeight: onScreenNavigationHeight, upperKeyboardInputPositionBound: nil, inVoiceOver: UIAccessibility.isVoiceOverRunning) self.updatingLayout = UpdatingLayout(layout: self.windowLayout, transition: .immediate) self.presentationContext = PresentationContext() self.overlayPresentationContext = GlobalOverlayPresentationContext(statusBarHost: statusBarHost, parentView: self.hostView.aboveStatusBarView) @@ -442,12 +431,12 @@ public class Window1 { self.presentationContext.view = self.hostView.containerView self.presentationContext.volumeControlStatusBarNodeView = self.volumeControlStatusBarNode.view - self.presentationContext.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, hasOnScreenNavigation: self.hostView.hasOnScreenNavigation), transition: .immediate) - self.overlayPresentationContext.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, hasOnScreenNavigation: self.hostView.hasOnScreenNavigation), transition: .immediate) + self.presentationContext.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics), transition: .immediate) + self.overlayPresentationContext.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics), transition: .immediate) self.statusBarChangeObserver = NotificationCenter.default.addObserver(forName: UIApplication.willChangeStatusBarFrameNotification, object: nil, queue: OperationQueue.main, using: { [weak self] notification in if let strongSelf = self { - let statusBarHeight: CGFloat = max(20.0, (notification.userInfo?[UIApplication.statusBarFrameUserInfoKey] as? NSValue)?.cgRectValue.height ?? 20.0) + let statusBarHeight: CGFloat = max(defaultStatusBarHeight, (notification.userInfo?[UIApplication.statusBarFrameUserInfoKey] as? NSValue)?.cgRectValue.height ?? defaultStatusBarHeight) let transition: ContainedViewLayoutTransition = .animated(duration: 0.35, curve: .easeInOut) strongSelf.updateLayout { $0.update(statusBarHeight: statusBarHeight, transition: transition, overrideTransition: false) } @@ -458,7 +447,10 @@ public class Window1 { if !strongSelf.hostView.isUpdatingOrientationLayout { return } - let keyboardHeight = max(0.0, strongSelf.keyboardManager?.getCurrentKeyboardHeight() ?? 0.0) + var keyboardHeight = max(0.0, strongSelf.keyboardManager?.getCurrentKeyboardHeight() ?? 0.0) + if strongSelf.deviceMetrics.type == .tablet, abs(strongSelf.windowLayout.size.height - UIScreen.main.bounds.height) > 41.0 { + keyboardHeight = max(0.0, keyboardHeight - 24.0) + } var duration: Double = (notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber)?.doubleValue ?? 0.0 if duration > Double.ulpOfOne { duration = 0.5 @@ -481,10 +473,11 @@ public class Window1 { let keyboardFrame: CGRect = (notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue ?? CGRect() let screenHeight: CGFloat - + var inPopover = false if keyboardFrame.width.isEqual(to: UIScreen.main.bounds.width) { if abs(strongSelf.windowLayout.size.height - UIScreen.main.bounds.height) > 41.0 { screenHeight = UIScreen.main.bounds.height + inPopover = true } else { screenHeight = strongSelf.windowLayout.size.height } @@ -492,7 +485,11 @@ public class Window1 { screenHeight = UIScreen.main.bounds.width } - let keyboardHeight = max(0.0, screenHeight - keyboardFrame.minY) + var keyboardHeight = max(0.0, screenHeight - keyboardFrame.minY) + if inPopover { + keyboardHeight = max(0.0, keyboardHeight - 48.0) + } + var duration: Double = (notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? NSNumber)?.doubleValue ?? 0.0 if duration > Double.ulpOfOne { duration = 0.5 @@ -525,7 +522,10 @@ public class Window1 { } if let keyboardManager = strongSelf.keyboardManager { - let updatedKeyboardHeight = keyboardManager.getCurrentKeyboardHeight() + var updatedKeyboardHeight = keyboardManager.getCurrentKeyboardHeight() + if strongSelf.deviceMetrics.type == .tablet, abs(strongSelf.windowLayout.size.height - UIScreen.main.bounds.height) > 41.0 { + updatedKeyboardHeight = max(0.0, updatedKeyboardHeight - 24.0) + } if !updatedKeyboardHeight.isEqual(to: initialInputHeight) { strongSelf.updateLayout({ $0.update(inputHeight: updatedKeyboardHeight, transition: .immediate, overrideTransition: false) }) } @@ -551,6 +551,7 @@ public class Window1 { recognizer.delaysTouchesBegan = false recognizer.delaysTouchesEnded = false recognizer.delegate = self.keyboardGestureRecognizerDelegate + recognizer.isEnabled = self.deviceMetrics.type == .phone recognizer.began = { [weak self] point in self?.panGestureBegan(location: point) } @@ -677,7 +678,7 @@ public class Window1 { } else { transition = .immediate } - self.updateLayout { $0.update(size: value, metrics: layoutMetricsForScreenSize(value), safeInsets: safeInsetsForScreenSize(value, hasOnScreenNavigation: self.hostView.hasOnScreenNavigation), forceInCallStatusBarText: self.forceInCallStatusBarText, transition: transition, overrideTransition: true) } + self.updateLayout { $0.update(size: value, metrics: layoutMetricsForScreenSize(value), safeInsets: self.deviceMetrics.safeInsets(inLandscape: value.width > value.height), forceInCallStatusBarText: self.forceInCallStatusBarText, transition: transition, overrideTransition: true) } } private var _rootController: ContainableController? @@ -693,7 +694,7 @@ public class Window1 { if let rootController = self._rootController { if !self.windowLayout.size.width.isZero && !self.windowLayout.size.height.isZero { - rootController.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, hasOnScreenNavigation: self.hostView.hasOnScreenNavigation), transition: .immediate) + rootController.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics), transition: .immediate) } self.hostView.containerView.insertSubview(rootController.view, at: 0) @@ -714,7 +715,7 @@ public class Window1 { } self._topLevelOverlayControllers = value - let layout = containedLayoutForWindowLayout(self.windowLayout, hasOnScreenNavigation: self.hostView.hasOnScreenNavigation) + let layout = containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics) for controller in self._topLevelOverlayControllers { controller.containerLayoutUpdated(layout, transition: .immediate) @@ -936,16 +937,20 @@ public class Window1 { self.isFirstLayout = false let boundsSize = updatingLayout.layout.size - let deviceMetrics = DeviceMetrics.forScreenSize(boundsSize, hintHasOnScreenNavigation: self.hostView.hasOnScreenNavigation) - + let isLandscape = boundsSize.width > boundsSize.height var statusBarHeight: CGFloat? if let statusBarHost = self.statusBarHost { statusBarHeight = statusBarHost.statusBarFrame.size.height } else { - statusBarHeight = deviceMetrics?.statusBarHeight ?? 20.0 + statusBarHeight = self.deviceMetrics.statusBarHeight } + + if self.deviceMetrics.type == .tablet, let onScreenNavigationHeight = self.hostView.onScreenNavigationHeight, onScreenNavigationHeight != self.deviceMetrics.onScreenNavigationHeight(inLandscape: false) { + self.deviceMetrics = DeviceMetrics(screenSize: UIScreen.main.bounds.size, statusBarHeight: statusBarHeight ?? defaultStatusBarHeight, onScreenNavigationHeight: onScreenNavigationHeight) + } + let statusBarWasHidden = self.statusBarHidden - if statusBarHiddenInLandscape && updatingLayout.layout.size.width > updatingLayout.layout.size.height { + if statusBarHiddenInLandscape && isLandscape { statusBarHeight = nil self.statusBarHidden = true } else { @@ -957,11 +962,9 @@ public class Window1 { } let previousInputOffset = inputHeightOffsetForLayout(self.windowLayout) - let onScreenNavigationHeight = deviceMetrics?.onScreenNavigationHeight(inLandscape: boundsSize.width > boundsSize.height) + self.windowLayout = WindowLayout(size: updatingLayout.layout.size, metrics: layoutMetricsForScreenSize(updatingLayout.layout.size), statusBarHeight: statusBarHeight, forceInCallStatusBarText: updatingLayout.layout.forceInCallStatusBarText, inputHeight: updatingLayout.layout.inputHeight, safeInsets: updatingLayout.layout.safeInsets, onScreenNavigationHeight: self.deviceMetrics.onScreenNavigationHeight(inLandscape: isLandscape), upperKeyboardInputPositionBound: updatingLayout.layout.upperKeyboardInputPositionBound, inVoiceOver: updatingLayout.layout.inVoiceOver) - self.windowLayout = WindowLayout(size: updatingLayout.layout.size, metrics: layoutMetricsForScreenSize(updatingLayout.layout.size), statusBarHeight: statusBarHeight, forceInCallStatusBarText: updatingLayout.layout.forceInCallStatusBarText, inputHeight: updatingLayout.layout.inputHeight, safeInsets: updatingLayout.layout.safeInsets, onScreenNavigationHeight: onScreenNavigationHeight, upperKeyboardInputPositionBound: updatingLayout.layout.upperKeyboardInputPositionBound, inVoiceOver: updatingLayout.layout.inVoiceOver) - - let childLayout = containedLayoutForWindowLayout(self.windowLayout, hasOnScreenNavigation: self.hostView.hasOnScreenNavigation) + let childLayout = containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics) let childLayoutUpdated = self.updatedContainerLayout != childLayout self.updatedContainerLayout = childLayout diff --git a/submodules/Emoji/Sources/EmojiUtils.swift b/submodules/Emoji/Sources/EmojiUtils.swift index bcabb02c29..cf869bebe8 100644 --- a/submodules/Emoji/Sources/EmojiUtils.swift +++ b/submodules/Emoji/Sources/EmojiUtils.swift @@ -41,6 +41,12 @@ public extension UnicodeScalar { var isZeroWidthJoiner: Bool { return self.value == 8205 } + + var isVariationSelector: Bool { + return self.value == 0xfe0f + } + + static var VariationSelector = UnicodeScalar(0xfe0f)! } private final class FrameworkClass: NSObject { @@ -67,24 +73,24 @@ public extension String { guard !self.isEmpty else { return false } - var nextShouldBeFE0F = false + var nextShouldBeVariationSelector = false for scalar in self.unicodeScalars { - if nextShouldBeFE0F { - if scalar.value == 0xfe0f { - nextShouldBeFE0F = false + if nextShouldBeVariationSelector { + if scalar.isVariationSelector { + nextShouldBeVariationSelector = false continue } else { return false } } if !scalar.isEmoji && scalar.maybeEmoji { - nextShouldBeFE0F = true + nextShouldBeVariationSelector = true } else if !scalar.isEmoji && !scalar.isZeroWidthJoiner { return false } } - return !nextShouldBeFE0F + return !nextShouldBeVariationSelector } var emojis: [String] { @@ -110,22 +116,22 @@ public extension String { var normalizedEmoji: String { var string = "" - var nextShouldBeFE0F = false + var nextShouldBeVariationSelector = false for scalar in self.unicodeScalars { - if nextShouldBeFE0F { - if scalar.value != 0xfe0f { - string.unicodeScalars.append("\u{fe0f}") + if nextShouldBeVariationSelector { + if !scalar.isVariationSelector{ + string.unicodeScalars.append(UnicodeScalar.VariationSelector) } - nextShouldBeFE0F = false + nextShouldBeVariationSelector = false } string.unicodeScalars.append(scalar) if !scalar.isEmoji && scalar.maybeEmoji { - nextShouldBeFE0F = true + nextShouldBeVariationSelector = true } } - if nextShouldBeFE0F { - string.unicodeScalars.append("\u{fe0f}") + if nextShouldBeVariationSelector { + string.unicodeScalars.append(UnicodeScalar.VariationSelector) } return string diff --git a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift index 8f6e8ae671..3991109a67 100644 --- a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift +++ b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift @@ -415,7 +415,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll func setMessage(_ message: Message) { self.currentMessage = message - self.actionButton.isHidden = message.containsSecretMedia + self.actionButton.isHidden = message.containsSecretMedia || Namespaces.Message.allScheduled.contains(message.id.namespace) let canDelete: Bool if let peer = message.peers[message.id.peerId] { @@ -806,7 +806,9 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll } if actions.options.contains(.deleteLocally) { var localOptionText = strongSelf.strings.Conversation_DeleteMessagesForMe - if strongSelf.context.account.peerId == peerId { + if let messageId = messages.first?.id, Namespaces.Message.allScheduled.contains(messageId.namespace) { + localOptionText = messages.count > 1 ? strongSelf.strings.ScheduledMessages_DeleteMany : strongSelf.strings.ScheduledMessages_Delete + } else if strongSelf.context.account.peerId == peerId { localOptionText = strongSelf.strings.Conversation_Moderate_Delete } items.append(ActionSheetButtonItem(title: localOptionText, color: .destructive, action: { [weak actionSheet] in diff --git a/submodules/GalleryUI/Sources/GalleryController.swift b/submodules/GalleryUI/Sources/GalleryController.swift index 797ad65c42..bcea3d7da7 100644 --- a/submodules/GalleryUI/Sources/GalleryController.swift +++ b/submodules/GalleryUI/Sources/GalleryController.swift @@ -956,7 +956,7 @@ public class GalleryController: ViewController { self.galleryNode.setControlsHidden(true, animated: false) if let centralItemNode = self.galleryNode.pager.centralItemNode(), let itemSize = centralItemNode.contentSize() { self.preferredContentSize = itemSize.aspectFitted(self.view.bounds.size) - self.containerLayoutUpdated(ContainerViewLayout(size: self.preferredContentSize, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + self.containerLayoutUpdated(ContainerViewLayout(size: self.preferredContentSize, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) } } } diff --git a/submodules/GalleryUI/Sources/GalleryControllerNode.swift b/submodules/GalleryUI/Sources/GalleryControllerNode.swift index 35d936f616..ef304d0504 100644 --- a/submodules/GalleryUI/Sources/GalleryControllerNode.swift +++ b/submodules/GalleryUI/Sources/GalleryControllerNode.swift @@ -70,7 +70,6 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture let completion = { [weak self] in if interfaceAnimationCompleted && contentAnimationCompleted { if let dismiss = self?.dismiss { - self?.scrollView.isScrollEnabled = true dismiss() } } @@ -123,6 +122,10 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture var previousIndex: Int? self.pager.centralItemIndexOffsetUpdated = { [weak self] itemsIndexAndProgress in if let strongSelf = self { + if abs(strongSelf.scrollView.contentOffset.y - strongSelf.scrollView.contentSize.height / 3.0) > 0.1 { + strongSelf.scrollView.setContentOffset(CGPoint(x: 0.0, y: strongSelf.scrollView.contentSize.height / 3.0), animated: true) + } + var node: GalleryThumbnailContainerNode? var thumbnailContainerVisible = false if let layout = strongSelf.containerLayout?.1, layout.size.width < layout.size.height { @@ -402,7 +405,6 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture let completion = { [weak self] in if interfaceAnimationCompleted && contentAnimationCompleted { if let dismiss = self?.dismiss { - self?.scrollView.isScrollEnabled = true dismiss() } } diff --git a/submodules/GalleryUI/Sources/Items/ChatDocumentGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatDocumentGalleryItem.swift index 8ba9fbb487..c879800a96 100644 --- a/submodules/GalleryUI/Sources/Items/ChatDocumentGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatDocumentGalleryItem.swift @@ -39,7 +39,7 @@ class ChatDocumentGalleryItem: GalleryItem { } if let location = self.location { - node._title.set(.single("\(location.index + 1) \(self.presentationData.strings.Common_of) \(location.count)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(location.index + 1)", "\(location.count)").0)) } node.setMessage(self.message) @@ -48,7 +48,7 @@ class ChatDocumentGalleryItem: GalleryItem { func updateNode(node: GalleryItemNode) { if let node = node as? ChatDocumentGalleryItemNode, let location = self.location { - node._title.set(.single("\(location.index + 1) \(self.presentationData.strings.Common_of) \(location.count)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(location.index + 1)", "\(location.count)").0)) node.setMessage(self.message) } } diff --git a/submodules/GalleryUI/Sources/Items/ChatExternalFileGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatExternalFileGalleryItem.swift index c36903b223..3f0a4df1b8 100644 --- a/submodules/GalleryUI/Sources/Items/ChatExternalFileGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatExternalFileGalleryItem.swift @@ -40,7 +40,7 @@ class ChatExternalFileGalleryItem: GalleryItem { } if let location = self.location { - node._title.set(.single("\(location.index + 1) \(self.presentationData.strings.Common_of) \(location.count)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(location.index + 1)", "\(location.count)").0)) } node.setMessage(self.message) @@ -49,7 +49,7 @@ class ChatExternalFileGalleryItem: GalleryItem { func updateNode(node: GalleryItemNode) { if let node = node as? ChatExternalFileGalleryItemNode, let location = self.location { - node._title.set(.single("\(location.index + 1) \(self.presentationData.strings.Common_of) \(location.count)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(location.index + 1)", "\(location.count)").0)) node.setMessage(self.message) } } diff --git a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift index 4c2a217f7d..1103737923 100644 --- a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift @@ -112,7 +112,7 @@ class ChatImageGalleryItem: GalleryItem { } if let location = self.location { - node._title.set(.single("\(location.index + 1) \(self.presentationData.strings.Common_of) \(location.count)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(location.index + 1)", "\(location.count)").0)) } node.setMessage(self.message) @@ -122,7 +122,7 @@ class ChatImageGalleryItem: GalleryItem { func updateNode(node: GalleryItemNode) { if let node = node as? ChatImageGalleryItemNode, let location = self.location { - node._title.set(.single("\(location.index + 1) \(self.presentationData.strings.Common_of) \(location.count)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(location.index + 1)", "\(location.count)").0)) node.setMessage(self.message) } diff --git a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift index 7d7914b285..199be79e80 100644 --- a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift @@ -56,7 +56,7 @@ public class UniversalVideoGalleryItem: GalleryItem { let node = UniversalVideoGalleryItemNode(context: self.context, presentationData: self.presentationData, performAction: self.performAction, openActionOptions: self.openActionOptions) if let indexData = self.indexData { - node._title.set(.single("\(indexData.position + 1) \(self.presentationData.strings.Common_of) \(indexData.totalCount)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(indexData.position + 1)", "\(indexData.totalCount)").0)) } node.setupItem(self) @@ -67,7 +67,7 @@ public class UniversalVideoGalleryItem: GalleryItem { public func updateNode(node: GalleryItemNode) { if let node = node as? UniversalVideoGalleryItemNode { if let indexData = self.indexData { - node._title.set(.single("\(indexData.position + 1) \(self.presentationData.strings.Common_of) \(indexData.totalCount)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(indexData.position + 1)", "\(indexData.totalCount)").0)) } node.setupItem(self) @@ -345,6 +345,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { self.dismissOnOrientationChange = item.landscape + var disablePictureInPicture = false var disablePlayerControls = false var isAnimated = false if let content = item.content as? NativeVideoContent { @@ -397,6 +398,10 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { self.requiresDownload = true var mediaFileStatus: Signal = .single(nil) if let contentInfo = item.contentInfo, case let .message(message) = contentInfo { + if Namespaces.Message.allScheduled.contains(message.id.namespace) { + disablePictureInPicture = true + } + var file: TelegramMediaFile? var isWebpage = false for m in message.media { @@ -526,7 +531,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode { self.zoomableContent = (videoSize, videoNode) - if !isAnimated && !disablePlayerControls { + if !isAnimated && !disablePlayerControls && !disablePictureInPicture { let rightBarButtonItem = UIBarButtonItem(image: pictureInPictureButtonImage, style: .plain, target: self, action: #selector(self.pictureInPictureButtonPressed)) self._rightBarButtonItem.set(.single(rightBarButtonItem)) } diff --git a/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift b/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift index 163b06c1e8..ced8219be9 100644 --- a/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift +++ b/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift @@ -106,7 +106,7 @@ final class HashtagSearchControllerNode: ASDisplayNode { insets.top += toolbarHeight - 4.0 let chatSize = CGSize(width: layout.size.width, height: layout.size.height) transition.updateFrame(node: chatController.displayNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: chatSize)) - chatController.containerLayoutUpdated(ContainerViewLayout(size: chatSize, metrics: layout.metrics, intrinsicInsets: UIEdgeInsets(top: insets.top, left: 0.0, bottom: layout.intrinsicInsets.bottom, right: 0.0), safeInsets: layout.safeInsets, statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + chatController.containerLayoutUpdated(ContainerViewLayout(size: chatSize, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(top: insets.top, left: 0.0, bottom: layout.intrinsicInsets.bottom, right: 0.0), safeInsets: layout.safeInsets, statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) if chatController.displayNode.supernode == nil { chatController.viewWillAppear(false) diff --git a/submodules/InstantPageUI/Sources/InstantImageGalleryItem.swift b/submodules/InstantPageUI/Sources/InstantImageGalleryItem.swift index 2f7527fe8e..ddbc4757b2 100644 --- a/submodules/InstantPageUI/Sources/InstantImageGalleryItem.swift +++ b/submodules/InstantPageUI/Sources/InstantImageGalleryItem.swift @@ -60,7 +60,7 @@ class InstantImageGalleryItem: GalleryItem { node.setImage(imageReference: self.imageReference) if let location = self.location { - node._title.set(.single("\(location.position + 1) \(self.presentationData.strings.Common_of) \(location.totalCount)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(location.position + 1)", "\(location.totalCount)").0)) } node.setCaption(self.caption, credit: self.credit) @@ -71,7 +71,7 @@ class InstantImageGalleryItem: GalleryItem { func updateNode(node: GalleryItemNode) { if let node = node as? InstantImageGalleryItemNode { if let location = self.location { - node._title.set(.single("\(location.position + 1) \(self.presentationData.strings.Common_of) \(location.totalCount)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(location.position + 1)", "\(location.totalCount)").0)) } node.setCaption(self.caption, credit: self.credit) diff --git a/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift b/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift index 2f5b06eb1d..5ff00fe512 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift @@ -407,7 +407,7 @@ final class InstantPageSlideshowNode: ASDisplayNode, InstantPageNode { super.layout() self.pagerNode.frame = self.bounds - self.pagerNode.containerLayoutUpdated(ContainerViewLayout(size: self.bounds.size, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + self.pagerNode.containerLayoutUpdated(ContainerViewLayout(size: self.bounds.size, metrics: LayoutMetrics(), deviceMetrics: .unknown(screenSize: CGSize(), statusBarHeight: 0.0, onScreenNavigationHeight: nil), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) self.pageControlNode.layer.transform = CATransform3DIdentity self.pageControlNode.frame = CGRect(origin: CGPoint(x: 0.0, y: self.bounds.size.height - 20.0), size: CGSize(width: self.bounds.size.width, height: 20.0)) diff --git a/submodules/ItemListUI/Sources/ItemListController.swift b/submodules/ItemListUI/Sources/ItemListController.swift index cddec7f95b..6efc7cfd66 100644 --- a/submodules/ItemListUI/Sources/ItemListController.swift +++ b/submodules/ItemListUI/Sources/ItemListController.swift @@ -542,16 +542,16 @@ open class ItemListController: ViewController, KeyShor } public func previewingController(from sourceView: UIView, for location: CGPoint) -> (UIViewController, CGRect)? { - guard let layout = self.validLayout else { + guard let layout = self.validLayout, case .phone = layout.deviceMetrics.type else { return nil } let boundsSize = self.view.bounds.size let contentSize: CGSize - if let metrics = DeviceMetrics.forScreenSize(layout.size) { - contentSize = metrics.previewingContentSize(inLandscape: boundsSize.width > boundsSize.height) - } else { + if case .unknown = layout.deviceMetrics { contentSize = boundsSize + } else { + contentSize = layout.deviceMetrics.previewingContentSize(inLandscape: boundsSize.width > boundsSize.height) } var selectedNode: ItemListItemNode? @@ -567,7 +567,7 @@ open class ItemListController: ViewController, KeyShor if let controller = self.previewItemWithTag?(tag) { if let controller = controller as? ContainableController { - controller.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + controller.containerLayoutUpdated(ContainerViewLayout(size: contentSize, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) } return (controller, sourceRect) } else { diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageImageViewOverlayView.m b/submodules/LegacyComponents/LegacyComponents/TGMessageImageViewOverlayView.m index 2e0bf501b0..52e88791cb 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGMessageImageViewOverlayView.m +++ b/submodules/LegacyComponents/LegacyComponents/TGMessageImageViewOverlayView.m @@ -1359,7 +1359,6 @@ const NSInteger TGMessageImageViewOverlayParticlesCount = 40; - (void)setCompletedAnimated:(bool)animated; { - __weak TGMessageImageViewOverlayView *weakSelf = self; [_contentLayer setCompletedAnimated:animated]; [_progressLayer setNone]; _blurredBackgroundLayer.hidden = _blurless; diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoVideoEditor.m b/submodules/LegacyComponents/LegacyComponents/TGPhotoVideoEditor.m index 47ce3aef36..ee6a2bc03d 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGPhotoVideoEditor.m +++ b/submodules/LegacyComponents/LegacyComponents/TGPhotoVideoEditor.m @@ -56,7 +56,6 @@ galleryController.model = model; __weak TGModernGalleryController *weakGalleryController = galleryController; - __weak TGMediaPickerGalleryModel *weakModel = model; [model.interfaceView updateSelectionInterface:1 counterVisible:false animated:false]; model.interfaceView.thumbnailSignalForItem = ^SSignal *(id item) diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraPipeline.m b/submodules/LegacyComponents/LegacyComponents/TGVideoCameraPipeline.m index 09b1c6c98d..cf69baa75e 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraPipeline.m +++ b/submodules/LegacyComponents/LegacyComponents/TGVideoCameraPipeline.m @@ -60,7 +60,6 @@ const NSInteger TGVideoCameraRetainedBufferCount = 16; CVPixelBufferRef _previousPixelBuffer; int32_t _repeatingCount; - NSMutableData *_audioBuffer; int16_t _micLevelPeak; int _micLevelPeakCount; diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubber.m b/submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubber.m index b76ba916e5..ceb7209390 100644 --- a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubber.m +++ b/submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubber.m @@ -14,7 +14,6 @@ #import "TGModernConversationInputMicButton.h" static const CGFloat TGVideoScrubberMinimumTrimDuration = 1.0f; -static const CGFloat TGVideoScrubberZoomActivationInterval = 0.25f; static const CGFloat TGVideoScrubberTrimRectEpsilon = 3.0f; typedef enum diff --git a/submodules/LegacyDataImport/Sources/LegacyPreferencesImport.swift b/submodules/LegacyDataImport/Sources/LegacyPreferencesImport.swift index 25f27cc612..8038feac0e 100644 --- a/submodules/LegacyDataImport/Sources/LegacyPreferencesImport.swift +++ b/submodules/LegacyDataImport/Sources/LegacyPreferencesImport.swift @@ -215,11 +215,11 @@ func importLegacyPreferences(accountManager: AccountManager, account: TemporaryA } switch autoNightPreferences.mode { case TGPresentationAutoNightModeSunsetSunrise: - settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .timeBased(setting: .automatic(latitude: Double(autoNightPreferences.latitude), longitude: Double(autoNightPreferences.longitude), localizedName: autoNightPreferences.cachedLocationName)), theme: nightTheme) + settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .timeBased(setting: .automatic(latitude: Double(autoNightPreferences.latitude), longitude: Double(autoNightPreferences.longitude), localizedName: autoNightPreferences.cachedLocationName)), theme: .builtin(nightTheme)) case TGPresentationAutoNightModeScheduled: - settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .timeBased(setting: .manual(fromSeconds: autoNightPreferences.scheduleStart, toSeconds: autoNightPreferences.scheduleEnd)), theme: nightTheme) + settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .timeBased(setting: .manual(fromSeconds: autoNightPreferences.scheduleStart, toSeconds: autoNightPreferences.scheduleEnd)), theme: .builtin(nightTheme)) case TGPresentationAutoNightModeBrightness: - settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .brightness(threshold: Double(autoNightPreferences.brightnessThreshold)), theme: nightTheme) + settings.automaticThemeSwitchSetting = AutomaticThemeSwitchSetting(trigger: .brightness(threshold: Double(autoNightPreferences.brightnessThreshold)), theme: .builtin(nightTheme)) default: break } diff --git a/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift b/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift index c456274e06..61511afe1b 100644 --- a/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift +++ b/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift @@ -340,8 +340,9 @@ private final class LegacyComponentsGlobalsProviderImpl: NSObject, LegacyCompone let theme = presentationTheme.list let navigationBar = presentationTheme.rootController.navigationBar + let tabBar = presentationTheme.rootController.tabBar - return TGMediaAssetsPallete(dark: presentationTheme.overallDarkAppearance, backgroundColor: theme.plainBackgroundColor, selectionColor: theme.itemHighlightedBackgroundColor, separatorColor: theme.itemPlainSeparatorColor, textColor: theme.itemPrimaryTextColor, secondaryTextColor: theme.controlSecondaryColor, accentColor: theme.itemAccentColor, barBackgroundColor: navigationBar.backgroundColor, barSeparatorColor: navigationBar.separatorColor, navigationTitleColor: navigationBar.primaryTextColor, badge: generateStretchableFilledCircleImage(diameter: 22.0, color: navigationBar.accentTextColor), badgeTextColor: navigationBar.backgroundColor, sendIconImage: PresentationResourcesChat.chatInputPanelSendButtonImage(presentationTheme), maybeAccentColor: navigationBar.accentTextColor) + return TGMediaAssetsPallete(dark: presentationTheme.overallDarkAppearance, backgroundColor: theme.plainBackgroundColor, selectionColor: theme.itemHighlightedBackgroundColor, separatorColor: theme.itemPlainSeparatorColor, textColor: theme.itemPrimaryTextColor, secondaryTextColor: theme.controlSecondaryColor, accentColor: theme.itemAccentColor, barBackgroundColor: tabBar.backgroundColor, barSeparatorColor: tabBar.separatorColor, navigationTitleColor: navigationBar.primaryTextColor, badge: generateStretchableFilledCircleImage(diameter: 22.0, color: navigationBar.accentTextColor), badgeTextColor: navigationBar.backgroundColor, sendIconImage: PresentationResourcesChat.chatInputPanelSendButtonImage(presentationTheme), maybeAccentColor: navigationBar.accentTextColor) } func checkButtonPallete() -> TGCheckButtonPallete! { diff --git a/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m b/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m index fe5777904a..7aa3215878 100644 --- a/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m +++ b/submodules/MtProtoKit/MTProtoKit/MTApiEnvironment.m @@ -740,12 +740,6 @@ NSString *suffix = @""; if ([platform hasPrefix:@"iPad"]) return UIDeviceUnknowniPad; if ([platform hasPrefix:@"AppleTV"]) return UIDeviceUnknownAppleTV; -#define IPAD_PRO_3G_NAMESTRING @"iPad Pro 12.9 (3rd gen)" -#define IPAD_PRO_11_NAMESTRING @"iPad Pro 11" -#define IPAD_PRO_6G_NAMESTRING @"iPad (6th gen)" -#define IPAD_PRO_10_5_NAMESTRING @"iPad Pro 10.5" -#define IPAD_PRO_12_9_NAMESTRING @"iPad Pro 12.9" - // Simulator thanks Jordan Breeding if ([platform hasSuffix:@"86"] || [platform isEqual:@"x86_64"]) { diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryController.swift b/submodules/PasscodeUI/Sources/PasscodeEntryController.swift index c6c4a57f62..3bdb3d95f0 100644 --- a/submodules/PasscodeUI/Sources/PasscodeEntryController.swift +++ b/submodules/PasscodeUI/Sources/PasscodeEntryController.swift @@ -137,10 +137,7 @@ public final class PasscodeEntryController: ViewController { case .none: succeed = true case let .numericalPassword(code, _, _): - succeed = passcode == code - if !succeed { - succeed = convertToArabicNumeralString(passcode) == code - } + succeed = passcode == normalizeArabicNumeralString(code, type: .western) case let .plaintextPassword(code, _, _): succeed = passcode == code } diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryKeyboardNode.swift b/submodules/PasscodeUI/Sources/PasscodeEntryKeyboardNode.swift index 0b5ecfd7e0..c0b29833e7 100644 --- a/submodules/PasscodeUI/Sources/PasscodeEntryKeyboardNode.swift +++ b/submodules/PasscodeUI/Sources/PasscodeEntryKeyboardNode.swift @@ -220,7 +220,7 @@ final class PasscodeEntryKeyboardNode: ASDisplayNode { if let subnodes = self.subnodes { for i in 0 ..< subnodes.count { let subnode = subnodes[i] - var delay: Double = 0.0 + var delay: Double = 0.001 if i / 3 == 1 { delay = 0.05 } diff --git a/submodules/PasscodeUI/Sources/PasscodeLayout.swift b/submodules/PasscodeUI/Sources/PasscodeLayout.swift index 8c4e6d4324..28ecd125be 100644 --- a/submodules/PasscodeUI/Sources/PasscodeLayout.swift +++ b/submodules/PasscodeUI/Sources/PasscodeLayout.swift @@ -14,98 +14,96 @@ struct PasscodeKeyboardLayout { let biometricsOffset: CGFloat let deleteOffset: CGFloat - fileprivate init(layout: ContainerViewLayout, metrics: DeviceMetrics?) { - if let metrics = metrics { - switch metrics { - case .iPhone4: - self.buttonSize = 75.0 - self.horizontalSecond = 95.0 - self.horizontalThird = 190.0 - self.verticalSecond = 88.0 - self.verticalThird = 176.0 - self.verticalFourth = 264.0 - self.size = CGSize(width: 265.0, height: 339.0) - self.topOffset = 122.0 - self.biometricsOffset = 0.0 - self.deleteOffset = 45.0 - case .iPhone5: - self.buttonSize = 75.0 - self.horizontalSecond = 95.0 - self.horizontalThird = 190.0 - self.verticalSecond = 88.0 - self.verticalThird = 176.0 - self.verticalFourth = 264.0 - self.size = CGSize(width: 265.0, height: 339.0) - self.topOffset = 155.0 - self.biometricsOffset = 23.0 - self.deleteOffset = 20.0 - case .iPhone6: - self.buttonSize = 75.0 - self.horizontalSecond = 103.0 - self.horizontalThird = 206.0 - self.verticalSecond = 90.0 - self.verticalThird = 180.0 - self.verticalFourth = 270.0 - self.size = CGSize(width: 281.0, height: 348.0) - self.topOffset = 221.0 - self.biometricsOffset = 30.0 - self.deleteOffset = 20.0 - case .iPhone6Plus: - self.buttonSize = 85.0 - self.horizontalSecond = 115.0 - self.horizontalThird = 230.0 - self.verticalSecond = 100.0 - self.verticalThird = 200.0 - self.verticalFourth = 300.0 - self.size = CGSize(width: 315.0, height: 385.0) - self.topOffset = 226.0 - self.biometricsOffset = 30.0 - self.deleteOffset = 20.0 - case .iPhoneX: - self.buttonSize = 75.0 - self.horizontalSecond = 103.0 - self.horizontalThird = 206.0 - self.verticalSecond = 91.0 - self.verticalThird = 182.0 - self.verticalFourth = 273.0 - self.size = CGSize(width: 281.0, height: 348.0) - self.topOffset = 294.0 - self.biometricsOffset = 30.0 - self.deleteOffset = 20.0 - case .iPhoneXSMax: - self.buttonSize = 85.0 - self.horizontalSecond = 115.0 - self.horizontalThird = 230.0 - self.verticalSecond = 100.0 - self.verticalThird = 200.0 - self.verticalFourth = 300.0 - self.size = CGSize(width: 315.0, height: 385.0) - self.topOffset = 329.0 - self.biometricsOffset = 30.0 - self.deleteOffset = 20.0 - case .iPad, .iPadPro10Inch, .iPadPro11Inch, .iPadPro, .iPadPro3rdGen: - self.buttonSize = 81.0 - self.horizontalSecond = 106.0 - self.horizontalThird = 212.0 - self.verticalSecond = 101.0 - self.verticalThird = 202.0 - self.verticalFourth = 303.0 - self.size = CGSize(width: 293.0, height: 384.0) - self.topOffset = 120.0 + (layout.size.height - self.size.height - 120.0) / 2.0 - self.biometricsOffset = 30.0 - self.deleteOffset = 80.0 - } - } else { - self.buttonSize = 75.0 - self.horizontalSecond = 95.0 - self.horizontalThird = 190.0 - self.verticalSecond = 88.0 - self.verticalThird = 176.0 - self.verticalFourth = 264.0 - self.size = CGSize(width: 265.0, height: 339.0) - self.topOffset = 0.0 - self.biometricsOffset = 30.0 - self.deleteOffset = 20.0 + fileprivate init(layout: ContainerViewLayout) { + switch layout.deviceMetrics { + case .iPhone4: + self.buttonSize = 75.0 + self.horizontalSecond = 95.0 + self.horizontalThird = 190.0 + self.verticalSecond = 88.0 + self.verticalThird = 176.0 + self.verticalFourth = 264.0 + self.size = CGSize(width: 265.0, height: 339.0) + self.topOffset = 122.0 + self.biometricsOffset = 0.0 + self.deleteOffset = 45.0 + case .iPhone5: + self.buttonSize = 75.0 + self.horizontalSecond = 95.0 + self.horizontalThird = 190.0 + self.verticalSecond = 88.0 + self.verticalThird = 176.0 + self.verticalFourth = 264.0 + self.size = CGSize(width: 265.0, height: 339.0) + self.topOffset = 155.0 + self.biometricsOffset = 23.0 + self.deleteOffset = 20.0 + case .iPhone6: + self.buttonSize = 75.0 + self.horizontalSecond = 103.0 + self.horizontalThird = 206.0 + self.verticalSecond = 90.0 + self.verticalThird = 180.0 + self.verticalFourth = 270.0 + self.size = CGSize(width: 281.0, height: 348.0) + self.topOffset = 221.0 + self.biometricsOffset = 30.0 + self.deleteOffset = 20.0 + case .iPhone6Plus: + self.buttonSize = 85.0 + self.horizontalSecond = 115.0 + self.horizontalThird = 230.0 + self.verticalSecond = 100.0 + self.verticalThird = 200.0 + self.verticalFourth = 300.0 + self.size = CGSize(width: 315.0, height: 385.0) + self.topOffset = 226.0 + self.biometricsOffset = 30.0 + self.deleteOffset = 20.0 + case .iPhoneX: + self.buttonSize = 75.0 + self.horizontalSecond = 103.0 + self.horizontalThird = 206.0 + self.verticalSecond = 91.0 + self.verticalThird = 182.0 + self.verticalFourth = 273.0 + self.size = CGSize(width: 281.0, height: 348.0) + self.topOffset = 294.0 + self.biometricsOffset = 30.0 + self.deleteOffset = 20.0 + case .iPhoneXSMax: + self.buttonSize = 85.0 + self.horizontalSecond = 115.0 + self.horizontalThird = 230.0 + self.verticalSecond = 100.0 + self.verticalThird = 200.0 + self.verticalFourth = 300.0 + self.size = CGSize(width: 315.0, height: 385.0) + self.topOffset = 329.0 + self.biometricsOffset = 30.0 + self.deleteOffset = 20.0 + case .iPad, .iPadPro10Inch, .iPadPro11Inch, .iPadPro, .iPadPro3rdGen: + self.buttonSize = 81.0 + self.horizontalSecond = 106.0 + self.horizontalThird = 212.0 + self.verticalSecond = 101.0 + self.verticalThird = 202.0 + self.verticalFourth = 303.0 + self.size = CGSize(width: 293.0, height: 384.0) + self.topOffset = 120.0 + (layout.size.height - self.size.height - 120.0) / 2.0 + self.biometricsOffset = 30.0 + self.deleteOffset = 80.0 + case .unknown: + self.buttonSize = 75.0 + self.horizontalSecond = 95.0 + self.horizontalThird = 190.0 + self.verticalSecond = 88.0 + self.verticalThird = 176.0 + self.verticalFourth = 264.0 + self.size = CGSize(width: 265.0, height: 339.0) + self.topOffset = 0.0 + self.biometricsOffset = 30.0 + self.deleteOffset = 20.0 } } } @@ -120,51 +118,46 @@ struct PasscodeLayout { init(layout: ContainerViewLayout) { self.layout = layout - let metrics = DeviceMetrics.forScreenSize(layout.size) - self.keyboard = PasscodeKeyboardLayout(layout: layout, metrics: metrics) - if let metrics = metrics { - switch metrics { - case .iPhone4: - self.titleOffset = 30.0 - self.subtitleOffset = -13.0 - self.inputFieldOffset = 70.0 - case .iPhone5: - self.titleOffset = 50.0 - self.subtitleOffset = -7.0 - self.inputFieldOffset = 90.0 - case .iPhone6: - self.titleOffset = 100.0 - self.subtitleOffset = -3.0 - self.inputFieldOffset = 144.0 - case .iPhone6Plus: - self.titleOffset = 112.0 - self.subtitleOffset = -6.0 - self.inputFieldOffset = 156.0 - case .iPhoneX: - self.titleOffset = 162.0 - self.subtitleOffset = 0.0 - self.inputFieldOffset = 206.0 - case .iPhoneXSMax: - self.titleOffset = 180.0 - self.subtitleOffset = 0.0 - self.inputFieldOffset = 226.0 - case .iPad, .iPadPro10Inch, .iPadPro11Inch, .iPadPro, .iPadPro3rdGen: - self.titleOffset = self.keyboard.topOffset - 120.0 - self.subtitleOffset = -2.0 - self.inputFieldOffset = self.keyboard.topOffset - 76.0 - } - } else { - self.titleOffset = 100.0 - self.subtitleOffset = 0.0 - self.inputFieldOffset = 140.0 + self.keyboard = PasscodeKeyboardLayout(layout: layout) + switch layout.deviceMetrics { + case .iPhone4: + self.titleOffset = 30.0 + self.subtitleOffset = -13.0 + self.inputFieldOffset = 70.0 + case .iPhone5: + self.titleOffset = 50.0 + self.subtitleOffset = -7.0 + self.inputFieldOffset = 90.0 + case .iPhone6: + self.titleOffset = 100.0 + self.subtitleOffset = -3.0 + self.inputFieldOffset = 144.0 + case .iPhone6Plus: + self.titleOffset = 112.0 + self.subtitleOffset = -6.0 + self.inputFieldOffset = 156.0 + case .iPhoneX: + self.titleOffset = 162.0 + self.subtitleOffset = 0.0 + self.inputFieldOffset = 206.0 + case .iPhoneXSMax: + self.titleOffset = 180.0 + self.subtitleOffset = 0.0 + self.inputFieldOffset = 226.0 + case .iPad, .iPadPro10Inch, .iPadPro11Inch, .iPadPro, .iPadPro3rdGen: + self.titleOffset = self.keyboard.topOffset - 120.0 + self.subtitleOffset = -2.0 + self.inputFieldOffset = self.keyboard.topOffset - 76.0 + case .unknown: + self.titleOffset = 100.0 + self.subtitleOffset = 0.0 + self.inputFieldOffset = 140.0 } } init(layout: ContainerViewLayout, titleOffset: CGFloat, subtitleOffset: CGFloat, inputFieldOffset: CGFloat) { self.layout = layout - - let metrics = DeviceMetrics.forScreenSize(layout.size) - self.keyboard = PasscodeKeyboardLayout(layout: layout, metrics: metrics) + self.keyboard = PasscodeKeyboardLayout(layout: layout) self.titleOffset = titleOffset self.subtitleOffset = subtitleOffset self.inputFieldOffset = inputFieldOffset diff --git a/submodules/PassportUI/Sources/SecureIdDocumentImageGalleryItem.swift b/submodules/PassportUI/Sources/SecureIdDocumentImageGalleryItem.swift index 044ad3cfaa..ea0b3898b9 100644 --- a/submodules/PassportUI/Sources/SecureIdDocumentImageGalleryItem.swift +++ b/submodules/PassportUI/Sources/SecureIdDocumentImageGalleryItem.swift @@ -36,7 +36,7 @@ class SecureIdDocumentGalleryItem: GalleryItem { node.setResource(secureIdContext: self.secureIdContext, resource: self.resource) - node._title.set(.single("\(self.location.position + 1) \(self.strings.Common_of) \(self.location.totalCount)")) + node._title.set(.single(self.strings.Items_NOfM("\(self.location.position + 1)", "\(self.location.totalCount)").0)) node.setCaption(self.caption) node.delete = self.delete @@ -46,7 +46,7 @@ class SecureIdDocumentGalleryItem: GalleryItem { func updateNode(node: GalleryItemNode) { if let node = node as? SecureIdDocumentGalleryItemNode { - node._title.set(.single("\(self.location.position + 1) \(self.strings.Common_of) \(self.location.totalCount)")) + node._title.set(.single(self.strings.Items_NOfM("\(self.location.position + 1)", "\(self.location.totalCount)").0)) node.setCaption(self.caption) node.delete = self.delete diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift index c6fafcb1f3..e7531ea7ba 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift @@ -408,7 +408,7 @@ public class AvatarGalleryController: ViewController { self.galleryNode.setControlsHidden(true, animated: false) if let centralItemNode = self.galleryNode.pager.centralItemNode(), let itemSize = centralItemNode.contentSize() { self.preferredContentSize = itemSize.aspectFitted(self.view.bounds.size) - self.containerLayoutUpdated(ContainerViewLayout(size: self.preferredContentSize, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + self.containerLayoutUpdated(ContainerViewLayout(size: self.preferredContentSize, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) centralItemNode.activateAsInitial() } } diff --git a/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift b/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift index 31fa91feb6..ba92495f16 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift @@ -59,7 +59,7 @@ class PeerAvatarImageGalleryItem: GalleryItem { let node = PeerAvatarImageGalleryItemNode(context: self.context, presentationData: self.presentationData, peer: self.peer) if let indexData = self.entry.indexData { - node._title.set(.single("\(indexData.position + 1) \(self.presentationData.strings.Common_of) \(indexData.totalCount)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(indexData.position + 1)", "\(indexData.totalCount)").0)) } node.setEntry(self.entry) @@ -71,7 +71,7 @@ class PeerAvatarImageGalleryItem: GalleryItem { func updateNode(node: GalleryItemNode) { if let node = node as? PeerAvatarImageGalleryItemNode { if let indexData = self.entry.indexData { - node._title.set(.single("\(indexData.position + 1) \(self.presentationData.strings.Common_of) \(indexData.totalCount)")) + node._title.set(.single(self.presentationData.strings.Items_NOfM("\(indexData.position + 1)", "\(indexData.totalCount)").0)) } node.setEntry(self.entry) diff --git a/submodules/SearchUI/Sources/SearchDisplayController.swift b/submodules/SearchUI/Sources/SearchDisplayController.swift index eea4802ec0..8f35e03bda 100644 --- a/submodules/SearchUI/Sources/SearchDisplayController.swift +++ b/submodules/SearchUI/Sources/SearchDisplayController.swift @@ -96,7 +96,7 @@ public final class SearchDisplayController { self.containerLayout = (layout, navigationBarFrame.maxY) transition.updateFrame(node: self.contentNode, frame: CGRect(origin: CGPoint(), size: layout.size)) - self.contentNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: LayoutMetrics(), intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: nil, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarFrame.maxY, transition: transition) + self.contentNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: layout.intrinsicInsets, safeInsets: layout.safeInsets, statusBarHeight: nil, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarFrame.maxY, transition: transition) } public func activate(insertSubnode: (ASDisplayNode, Bool) -> Void, placeholder: SearchBarPlaceholderNode) { @@ -107,7 +107,7 @@ public final class SearchDisplayController { insertSubnode(self.contentNode, false) self.contentNode.frame = CGRect(origin: CGPoint(), size: layout.size) - self.contentNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: layout.safeInsets, statusBarHeight: nil, inputHeight: nil, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), navigationBarHeight: navigationBarHeight, transition: .immediate) + self.contentNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: layout.safeInsets, statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), navigationBarHeight: navigationBarHeight, transition: .immediate) let initialTextBackgroundFrame = placeholder.convert(placeholder.backgroundNode.frame, to: nil) diff --git a/submodules/SettingsUI/SettingsUI_Xcode.xcodeproj/project.pbxproj b/submodules/SettingsUI/SettingsUI_Xcode.xcodeproj/project.pbxproj index a8f9c95e95..408af44cce 100644 --- a/submodules/SettingsUI/SettingsUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/SettingsUI/SettingsUI_Xcode.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 091EABA5231DAC7500A0EC14 /* ThemeNameGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 091EABA4231DAC7500A0EC14 /* ThemeNameGenerator.swift */; }; 09B4A9B823102B7A005C2E08 /* EditThemeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09B4A9B723102B7A005C2E08 /* EditThemeController.swift */; }; D03E465223075D930049C28B /* SettingsUI.h in Headers */ = {isa = PBXBuildFile; fileRef = D03E465023075D930049C28B /* SettingsUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; D03E466823075E660049C28B /* TabBarAccountSwitchControllerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E465C23075E630049C28B /* TabBarAccountSwitchControllerNode.swift */; }; @@ -191,6 +192,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 091EABA4231DAC7500A0EC14 /* ThemeNameGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeNameGenerator.swift; sourceTree = ""; }; 09B4A9B723102B7A005C2E08 /* EditThemeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditThemeController.swift; sourceTree = ""; }; D03E464D23075D930049C28B /* SettingsUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SettingsUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E465023075D930049C28B /* SettingsUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SettingsUI.h; sourceTree = ""; }; @@ -650,6 +652,7 @@ D03E46EB23075FD60049C28B /* WallpaperPatternPanelNode.swift */, D03E46EE23075FD60049C28B /* WallpaperSearchRecentQueries.swift */, 09B4A9B723102B7A005C2E08 /* EditThemeController.swift */, + 091EABA4231DAC7500A0EC14 /* ThemeNameGenerator.swift */, ); path = Themes; sourceTree = ""; @@ -915,6 +918,7 @@ D03E471523075FE40049C28B /* ThemeSettingsFontSizeItem.swift in Sources */, D03E46AA23075F2C0049C28B /* DataPrivacySettingsController.swift in Sources */, D03E467123075E660049C28B /* SettingsController.swift in Sources */, + 091EABA5231DAC7500A0EC14 /* ThemeNameGenerator.swift in Sources */, D03E46A923075F2C0049C28B /* BlockedPeersController.swift in Sources */, D03E469F23075F2C0049C28B /* TwoStepVerificationResetController.swift in Sources */, D03E472A230760330049C28B /* LocalizationListItem.swift in Sources */, diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift index efd05b9ce4..0ee6f5e19d 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift @@ -424,10 +424,7 @@ public func passcodeOptionsAccessController(context: AccountContext, animateIn: case .none: succeed = true case let .numericalPassword(code, _, _): - succeed = passcode == code - if !succeed { - succeed = convertToArabicNumeralString(passcode) == code - } + succeed = passcode == normalizeArabicNumeralString(code, type: .western) case let .plaintextPassword(code, _, _): succeed = passcode == code } diff --git a/submodules/SettingsUI/Sources/SettingsController.swift b/submodules/SettingsUI/Sources/SettingsController.swift index b310caa342..c20b24e173 100644 --- a/submodules/SettingsUI/Sources/SettingsController.swift +++ b/submodules/SettingsUI/Sources/SettingsController.swift @@ -705,11 +705,9 @@ public func settingsController(context: AccountContext, accountManager: AccountM updating = $0.updatingAvatar != nil return $0 } - if updating { return } - let _ = (contextValue.get() |> deliverOnMainQueue |> take(1)).start(next: { context in diff --git a/submodules/SettingsUI/Sources/TabBarAccountSwitchControllerNode.swift b/submodules/SettingsUI/Sources/TabBarAccountSwitchControllerNode.swift index 6929546f6a..3c21497668 100644 --- a/submodules/SettingsUI/Sources/TabBarAccountSwitchControllerNode.swift +++ b/submodules/SettingsUI/Sources/TabBarAccountSwitchControllerNode.swift @@ -9,6 +9,7 @@ import AvatarNode import AccountContext import LocalizedPeerData +private let animationDurationFactor: Double = 1.0 private let avatarFont = UIFont(name: ".SFCompactRounded-Semibold", size: 16.0)! private protocol AbstractSwitchAccountItemNode { @@ -216,6 +217,8 @@ final class TabBarAccountSwitchControllerNode: ViewControllerTracingNode { private let cancel: () -> Void private let effectView: UIVisualEffectView + private var propertyAnimator: AnyObject? + private var displayLinkAnimator: DisplayLinkAnimator? private let dimNode: ASDisplayNode private let contentContainerNode: ASDisplayNode @@ -284,41 +287,44 @@ final class TabBarAccountSwitchControllerNode: ViewControllerTracingNode { self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) } + deinit { + if let propertyAnimator = self.propertyAnimator { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { + let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator + propertyAnimator?.stopAnimation(true) + } + } + } + func animateIn() { - UIView.animate(withDuration: 0.3, animations: { - if #available(iOS 9.0, *) { - if self.presentationData.theme.rootController.keyboardColor == .dark { - if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { - self.effectView.effect = UIBlurEffect(style: .regular) - if self.effectView.subviews.count == 2 { - self.effectView.subviews[1].isHidden = true - } - } else { - self.effectView.effect = UIBlurEffect(style: .dark) - } - } else { - if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { - self.effectView.effect = UIBlurEffect(style: .regular) - } else { - self.effectView.effect = UIBlurEffect(style: .light) - } - } - } else { - self.effectView.alpha = 1.0 + self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + + if #available(iOS 10.0, *) { + if let propertyAnimator = self.propertyAnimator { + let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator + propertyAnimator?.stopAnimation(true) } - }, completion: { [weak self] _ in - guard let strongSelf = self else { - return + self.propertyAnimator = UIViewPropertyAnimator(duration: 0.2 * animationDurationFactor, curve: .easeInOut, animations: { [weak self] in + self?.effectView.effect = makeCustomZoomBlurEffect() + }) + } + + if let _ = self.propertyAnimator { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { + self.displayLinkAnimator = DisplayLinkAnimator(duration: 0.2 * animationDurationFactor, from: 0.0, to: 1.0, update: { [weak self] value in + (self?.propertyAnimator as? UIViewPropertyAnimator)?.fractionComplete = value + }, completion: { + }) } - if strongSelf.presentationData.theme.rootController.keyboardColor == .dark { - if strongSelf.effectView.subviews.count == 2 { - strongSelf.effectView.subviews[1].isHidden = true - } - } - }) - self.effectView.subviews[1].layer.removeAnimation(forKey: "backgroundColor") - self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3) - self.contentContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.08) + } else { + UIView.animate(withDuration: 0.2 * animationDurationFactor, animations: { + self.effectView.effect = makeCustomZoomBlurEffect() + }, completion: { _ in + }) + } + + self.contentContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + if let _ = self.validLayout, let sourceNode = self.sourceNodes.first { let sourceFrame = sourceNode.view.convert(sourceNode.bounds, to: self.view) self.contentContainerNode.layer.animateFrame(from: sourceFrame, to: self.contentContainerNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) @@ -354,23 +360,52 @@ final class TabBarAccountSwitchControllerNode: ViewControllerTracingNode { } } - UIView.animate(withDuration: 0.3, animations: { - if #available(iOS 9.0, *) { - self.effectView.effect = nil - } else { - self.effectView.alpha = 0.0 + if #available(iOS 10.0, *) { + if let propertyAnimator = self.propertyAnimator { + let propertyAnimator = propertyAnimator as? UIViewPropertyAnimator + propertyAnimator?.stopAnimation(true) } - }, completion: { [weak self] _ in - if let strongSelf = self { - for sourceNode in strongSelf.sourceNodes { - sourceNode.alpha = 1.0 + self.propertyAnimator = UIViewPropertyAnimator(duration: 0.2, curve: .easeInOut, animations: { [weak self] in + self?.effectView.effect = nil + }) + } + + if let _ = self.propertyAnimator { + if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { + self.displayLinkAnimator = DisplayLinkAnimator(duration: 0.2 * animationDurationFactor, from: 0.0, to: 0.999, update: { [weak self] value in + (self?.propertyAnimator as? UIViewPropertyAnimator)?.fractionComplete = value + }, completion: { [weak self] in + if let strongSelf = self { + for sourceNode in strongSelf.sourceNodes { + sourceNode.alpha = 1.0 + } + } + + completedEffect = true + intermediateCompletion() + }) + } + self.effectView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.05 * animationDurationFactor, delay: 0.15, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false) + } else { + UIView.animate(withDuration: 0.21 * animationDurationFactor, animations: { + if #available(iOS 9.0, *) { + self.effectView.effect = nil + } else { + self.effectView.alpha = 0.0 } - } - - completedEffect = true - intermediateCompletion() - }) - self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false) + }, completion: { [weak self] _ in + if let strongSelf = self { + for sourceNode in strongSelf.sourceNodes { + sourceNode.alpha = 1.0 + } + } + + completedEffect = true + intermediateCompletion() + }) + } + + self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false) self.contentContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.12, removeOnCompletion: false, completion: { _ in }) if let _ = self.validLayout, let sourceNode = self.sourceNodes.first { diff --git a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift index 9b95832e03..6de4440cb1 100644 --- a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift +++ b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift @@ -26,6 +26,7 @@ private final class EditThemeControllerArguments { private enum EditThemeEntryTag: ItemListItemTag { case title + case slug func isEqual(to other: ItemListItemTag) -> Bool { if let other = other as? EditThemeEntryTag, self == other { @@ -46,7 +47,7 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { case slug(PresentationTheme, PresentationStrings, String, String, Bool) case slugInfo(PresentationTheme, String) case chatPreviewHeader(PresentationTheme, String) - case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder) + case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) case uploadTheme(PresentationTheme, String) case uploadInfo(PresentationTheme, String) @@ -104,8 +105,8 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { } else { return false } - case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder): - if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder { + case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): + if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { return true } else { return false @@ -142,7 +143,7 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { }) case let .slug(theme, strings, title, text, enabled): - return ItemListSingleLineInputItem(theme: theme, strings: strings, title: NSAttributedString(string: "t.me/addtheme/", textColor: theme.list.itemPrimaryTextColor), text: text, placeholder: title, type: .username, clearType: .onFocus, enabled: enabled, sectionId: self.section, textUpdated: { value in + return ItemListSingleLineInputItem(theme: theme, strings: strings, title: NSAttributedString(string: "t.me/addtheme/", textColor: theme.list.itemPrimaryTextColor), text: text, placeholder: title, type: .username, clearType: .onFocus, enabled: enabled, tag: EditThemeEntryTag.slug, sectionId: self.section, textUpdated: { value in arguments.updateState { current in var state = current state.slug = value @@ -155,8 +156,8 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { return ItemListTextItem(theme: theme, text: .markdown(text), sectionId: self.section) case let .chatPreviewHeader(theme, text): return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section) - case let .chatPreview(theme, componentTheme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder): - return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder) + case let .chatPreview(theme, componentTheme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder, items): + return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) case let .uploadTheme(theme, text): return ItemListActionItem(theme: theme, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { arguments.openFile() @@ -189,29 +190,51 @@ private func editThemeControllerEntries(presentationData: PresentationData, stat } entries.append(.title(presentationData.theme, presentationData.strings, presentationData.strings.EditTheme_Title, state.title, isCreate)) - if case .edit = state.mode { - entries.append(.slug(presentationData.theme, presentationData.strings, presentationData.strings.EditTheme_ShortLink, state.slug, true)) - entries.append(.slugInfo(presentationData.theme, presentationData.strings.EditTheme_ShortLinkInfo)) - } - - entries.append(.chatPreviewHeader(presentationData.theme, presentationData.strings.EditTheme_Preview.uppercased())) - entries.append(.chatPreview(presentationData.theme, previewTheme, previewTheme.chat.defaultWallpaper, presentationData.fontSize, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder)) - + let infoText: String let uploadText: String let uploadInfo: String + let previewIncomingReplyName: String + let previewIncomingReplyText: String + let previewIncomingText: String + let previewOutgoingText: String switch state.mode { case .create: + infoText = presentationData.strings.EditTheme_Create_TopInfo uploadText = presentationData.strings.EditTheme_UploadNewTheme - uploadInfo = presentationData.strings.EditTheme_UploadNewInfo + uploadInfo = presentationData.strings.EditTheme_Create_BottomInfo + previewIncomingReplyName = presentationData.strings.EditTheme_Create_Preview_IncomingReplyName + previewIncomingReplyText = presentationData.strings.EditTheme_Create_Preview_IncomingReplyText + previewIncomingText = presentationData.strings.EditTheme_Create_Preview_IncomingText + previewOutgoingText = presentationData.strings.EditTheme_Create_Preview_OutgoingText case let .edit(theme): if let _ = theme.theme.file { + infoText = presentationData.strings.EditTheme_Edit_TopInfo uploadText = presentationData.strings.EditTheme_UploadEditedTheme - uploadInfo = presentationData.strings.EditTheme_UploadEditedInfo + uploadInfo = presentationData.strings.EditTheme_Edit_BottomInfo + previewIncomingReplyName = presentationData.strings.EditTheme_Expand_Preview_IncomingReplyName + previewIncomingReplyText = presentationData.strings.EditTheme_Expand_Preview_IncomingReplyText + previewIncomingText = presentationData.strings.EditTheme_Expand_Preview_IncomingText + previewOutgoingText = presentationData.strings.EditTheme_Expand_Preview_OutgoingText } else { + infoText = presentationData.strings.EditTheme_Expand_TopInfo uploadText = presentationData.strings.EditTheme_UploadNewTheme - uploadInfo = presentationData.strings.EditTheme_UploadNewInfo + uploadInfo = presentationData.strings.EditTheme_Expand_BottomInfo + previewIncomingReplyName = presentationData.strings.EditTheme_Edit_Preview_IncomingReplyName + previewIncomingReplyText = presentationData.strings.EditTheme_Edit_Preview_IncomingReplyText + previewIncomingText = presentationData.strings.EditTheme_Edit_Preview_IncomingText + previewOutgoingText = presentationData.strings.EditTheme_Edit_Preview_OutgoingText } } + + if case .edit = state.mode { + entries.append(.slug(presentationData.theme, presentationData.strings, presentationData.strings.EditTheme_ShortLink, state.slug, true)) + } + + entries.append(.slugInfo(presentationData.theme, infoText)) + + entries.append(.chatPreviewHeader(presentationData.theme, presentationData.strings.EditTheme_Preview.uppercased())) + entries.append(.chatPreview(presentationData.theme, previewTheme, previewTheme.chat.defaultWallpaper, presentationData.fontSize, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (previewIncomingReplyName, previewIncomingReplyText), text: previewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: previewOutgoingText)])) + entries.append(.uploadTheme(presentationData.theme, uploadText)) entries.append(.uploadInfo(presentationData.theme, uploadInfo)) @@ -224,21 +247,21 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll switch mode { case .create: let presentationData = context.sharedContext.currentPresentationData.with { $0 } - initialState = EditThemeControllerState(mode: mode, title: "", slug: "", updatedTheme: nil, updating: false) - previewThemePromise.set(.single(presentationData.theme.withUpdated(name: "", author: nil, defaultWallpaper: presentationData.chatWallpaper))) + initialState = EditThemeControllerState(mode: mode, title: generateThemeName(accentColor: presentationData.theme.rootController.navigationBar.buttonColor), slug: "", updatedTheme: nil, updating: false) + previewThemePromise.set(.single(presentationData.theme.withUpdated(name: "", defaultWallpaper: presentationData.chatWallpaper))) case let .edit(info): if let file = info.theme.file, let path = context.sharedContext.accountManager.mediaBox.completedResourcePath(file.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path)), let theme = makePresentationTheme(data: data, resolvedWallpaper: info.resolvedWallpaper) { if case let .file(file) = theme.chat.defaultWallpaper, file.id == 0 { - previewThemePromise.set(cachedWallpaper(account: context.account, slug: file.slug) + previewThemePromise.set(cachedWallpaper(account: context.account, slug: file.slug, settings: file.settings) |> map ({ wallpaper -> PresentationTheme in if let wallpaper = wallpaper { - return theme.withUpdated(name: nil, author: nil, defaultWallpaper: wallpaper.wallpaper) + return theme.withUpdated(name: nil, defaultWallpaper: wallpaper.wallpaper) } else { - return theme.withUpdated(name: nil, author: nil, defaultWallpaper: .color(Int32(bitPattern: theme.chatList.backgroundColor.rgb))) + return theme.withUpdated(name: nil, defaultWallpaper: .color(Int32(bitPattern: theme.chatList.backgroundColor.rgb))) } })) } else { - previewThemePromise.set(.single(theme.withUpdated(name: nil, author: nil, defaultWallpaper: info.resolvedWallpaper))) + previewThemePromise.set(.single(theme.withUpdated(name: nil, defaultWallpaper: info.resolvedWallpaper))) } } else { previewThemePromise.set(.single(context.sharedContext.currentPresentationData.with { $0 }.theme)) @@ -254,6 +277,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll var presentControllerImpl: ((ViewController, Any?) -> Void)? var dismissImpl: (() -> Void)? var dismissInputImpl: (() -> Void)? + var errorImpl: ((EditThemeEntryTag) -> Void)? let arguments = EditThemeControllerArguments(context: context, updateState: { f in updateState(f) @@ -263,7 +287,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll if let url = urls.first{ if let data = try? Data(contentsOf: url), let theme = makePresentationTheme(data: data) { if case let .file(file) = theme.chat.defaultWallpaper, file.id == 0 { - let _ = (cachedWallpaper(account: context.account, slug: file.slug) + let _ = (cachedWallpaper(account: context.account, slug: file.slug, settings: file.settings) |> mapToSignal { wallpaper -> Signal in if let wallpaper = wallpaper, case let .file(file) = wallpaper.wallpaper { var convertedRepresentations: [ImageRepresentationWithReference] = [] @@ -281,7 +305,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll } } |> deliverOnMainQueue).start(next: { wallpaper in - let updatedTheme = theme.withUpdated(name: nil, author: nil, defaultWallpaper: wallpaper) + let updatedTheme = theme.withUpdated(name: nil, defaultWallpaper: wallpaper) updateState { current in var state = current previewThemePromise.set(.single(updatedTheme)) @@ -329,6 +353,16 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll } rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Done), style: .bold, enabled: isComplete, action: { + if state.title.count > 128 { + errorImpl?(.title) + return + } + if case .create = mode { + } else if state.slug.count < 5 || state.slug.count > 64 { + errorImpl?(.slug) + return + } + dismissInputImpl?() arguments.updateState { current in var state = current @@ -345,7 +379,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll let _ = enqueueMessages(account: context.account, peerId: context.account.peerId, messages: [message]).start() if let navigateToChat = navigateToChat { - presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.EditTheme_ThemeTemplateAlert, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Settings_SavedMessages, action: { + presentControllerImpl?(textAlertController(context: context, title: presentationData.strings.EditTheme_ThemeTemplateAlertTitle, text: presentationData.strings.EditTheme_ThemeTemplateAlertText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Settings_SavedMessages, action: { completion() navigateToChat(context.account.peerId) }), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: { @@ -359,14 +393,14 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll let theme: PresentationTheme? let hasCustomFile: Bool if let updatedTheme = state.updatedTheme { - theme = updatedTheme.withUpdated(name: state.title, author: "", defaultWallpaper: nil) + theme = updatedTheme.withUpdated(name: state.title, defaultWallpaper: nil) hasCustomFile = true } else { if case let .edit(info) = mode, let _ = info.theme.file { theme = nil hasCustomFile = true } else { - theme = previewTheme.withUpdated(name: state.title, author: "", defaultWallpaper: nil) + theme = previewTheme.withUpdated(name: state.title, defaultWallpaper: nil) hasCustomFile = false } } @@ -489,6 +523,20 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll state.updating = false return state } + + var errorText: String? + switch error { + case .slugOccupied: + errorText = presentationData.strings.EditTheme_ErrorLinkTaken + case .slugInvalid: + errorText = presentationData.strings.EditTheme_ErrorInvalidCharacters + default: + break + } + + if let errorText = errorText { + presentControllerImpl?(textAlertController(context: context, title: nil, text: errorText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil) + } }) } }) @@ -523,5 +571,14 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll dismissInputImpl = { [weak controller] in controller?.view.endEditing(true) } + let hapticFeedback = HapticFeedback() + errorImpl = { [weak controller] targetTag in + hapticFeedback.error() + controller?.forEachItemNode { itemNode in + if let itemNode = itemNode as? ItemListSingleLineInputItemNode, let tag = itemNode.tag, tag.isEqual(to: targetTag) { + itemNode.animateError() + } + } + } return controller } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift index c8d996dbd4..e2b5fa9c65 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift @@ -372,9 +372,8 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.toolbarNode.updateLayout(size: CGSize(width: layout.size.width, height: 49.0), layout: layout, transition: transition) var bottomInset = toolbarHeight - let metrics = DeviceMetrics.forScreenSize(layout.size) - let standardInputHeight = metrics?.standardInputHeight(inLandscape: false) ?? 216.0 - let height = standardInputHeight - bottomInset + 47.0 + let standardInputHeight = layout.deviceMetrics.keyboardHeight(inLandscape: false) + let height = max(standardInputHeight, layout.inputHeight ?? 0.0) - bottomInset + 47.0 let colorPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - bottomInset - height), size: CGSize(width: layout.size.width, height: height)) bottomInset += height diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift index dc23c933cc..5c886122b0 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift @@ -11,6 +11,7 @@ import TelegramStringFormatting import AccountContext import DeviceLocationManager import Geocoding +import WallpaperResources private enum TriggerMode { case none @@ -24,14 +25,16 @@ private enum TimeBasedManualField { } private final class ThemeAutoNightSettingsControllerArguments { + let context: AccountContext let updateMode: (TriggerMode) -> Void let updateTimeBasedAutomatic: (Bool) -> Void let openTimeBasedManual: (TimeBasedManualField) -> Void let updateTimeBasedAutomaticLocation: () -> Void let updateAutomaticBrightness: (Double) -> Void - let updateTheme: (PresentationBuiltinThemeReference) -> Void + let updateTheme: (PresentationThemeReference) -> Void - init(updateMode: @escaping (TriggerMode) -> Void, updateTimeBasedAutomatic: @escaping (Bool) -> Void, openTimeBasedManual: @escaping (TimeBasedManualField) -> Void, updateTimeBasedAutomaticLocation: @escaping () -> Void, updateAutomaticBrightness: @escaping (Double) -> Void, updateTheme: @escaping (PresentationBuiltinThemeReference) -> Void) { + init(context: AccountContext, updateMode: @escaping (TriggerMode) -> Void, updateTimeBasedAutomatic: @escaping (Bool) -> Void, openTimeBasedManual: @escaping (TimeBasedManualField) -> Void, updateTimeBasedAutomaticLocation: @escaping () -> Void, updateAutomaticBrightness: @escaping (Double) -> Void, updateTheme: @escaping (PresentationThemeReference) -> Void) { + self.context = context self.updateMode = updateMode self.updateTimeBasedAutomatic = updateTimeBasedAutomatic self.openTimeBasedManual = openTimeBasedManual @@ -61,8 +64,7 @@ private enum ThemeAutoNightSettingsControllerEntry: ItemListNodeEntry { case settingInfo(PresentationTheme, String) case themeHeader(PresentationTheme, String) - case themeNightBlue(PresentationTheme, String, Bool) - case themeNight(PresentationTheme, String, Bool) + case themeItem(PresentationTheme, PresentationStrings, [PresentationThemeReference], PresentationThemeReference, [Int64: PresentationThemeAccentColor]) var section: ItemListSectionId { switch self { @@ -70,7 +72,7 @@ private enum ThemeAutoNightSettingsControllerEntry: ItemListNodeEntry { return ThemeAutoNightSettingsControllerSection.mode.rawValue case .settingsHeader, .timeBasedAutomaticLocation, .timeBasedAutomaticLocationValue, .timeBasedManualFrom, .timeBasedManualTo, .brightnessValue, .settingInfo: return ThemeAutoNightSettingsControllerSection.settings.rawValue - case .themeHeader, .themeNightBlue, .themeNight: + case .themeHeader, .themeItem: return ThemeAutoNightSettingsControllerSection.theme.rawValue } } @@ -99,10 +101,8 @@ private enum ThemeAutoNightSettingsControllerEntry: ItemListNodeEntry { return 9 case .themeHeader: return 10 - case .themeNightBlue: + case .themeItem: return 11 - case .themeNight: - return 12 } } @@ -174,14 +174,8 @@ private enum ThemeAutoNightSettingsControllerEntry: ItemListNodeEntry { } else { return false } - case let .themeNightBlue(lhsTheme, lhsTitle, lhsValue): - if case let .themeNightBlue(rhsTheme, rhsTitle, rhsValue) = rhs, lhsTheme === rhsTheme, lhsTitle == rhsTitle, lhsValue == rhsValue { - return true - } else { - return false - } - case let .themeNight(lhsTheme, lhsTitle, lhsValue): - if case let .themeNight(rhsTheme, rhsTitle, rhsValue) = rhs, lhsTheme === rhsTheme, lhsTitle == rhsTitle, lhsValue == rhsValue { + case let .themeItem(lhsTheme, lhsStrings, lhsThemes, lhsCurrentTheme, lhsThemeAccentColors): + if case let .themeItem(rhsTheme, rhsStrings, rhsThemes, rhsCurrentTheme, rhsThemeAccentColors) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsThemes == rhsThemes, lhsCurrentTheme == rhsCurrentTheme, lhsThemeAccentColors == rhsThemeAccentColors { return true } else { return false @@ -233,19 +227,16 @@ private enum ThemeAutoNightSettingsControllerEntry: ItemListNodeEntry { return ItemListTextItem(theme: theme, text: .plain(text), sectionId: self.section) case let .themeHeader(theme, title): return ItemListSectionHeaderItem(theme: theme, text: title, sectionId: self.section) - case let .themeNightBlue(theme, title, value): - return ItemListCheckboxItem(theme: theme, title: title, style: .left, checked: value, zeroSeparatorInsets: false, sectionId: self.section, action: { - arguments.updateTheme(.nightAccent) - }) - case let .themeNight(theme, title, value): - return ItemListCheckboxItem(theme: theme, title: title, style: .left, checked: value, zeroSeparatorInsets: false, sectionId: self.section, action: { - arguments.updateTheme(.night) + case let .themeItem(theme, strings, themes, currentTheme, themeSpecificAccentColors): + return ThemeSettingsThemeItem(context: arguments.context, theme: theme, strings: strings, sectionId: self.section, themes: themes, themeSpecificAccentColors: themeSpecificAccentColors, currentTheme: currentTheme, updatedTheme: { theme in + arguments.updateTheme(theme) + }, longTapped: { _ in }) } } } -private func themeAutoNightSettingsControllerEntries(theme: PresentationTheme, strings: PresentationStrings, switchSetting: AutomaticThemeSwitchSetting, dateTimeFormat: PresentationDateTimeFormat) -> [ThemeAutoNightSettingsControllerEntry] { +private func themeAutoNightSettingsControllerEntries(theme: PresentationTheme, strings: PresentationStrings, settings: PresentationThemeSettings, switchSetting: AutomaticThemeSwitchSetting, availableThemes: [PresentationThemeReference], dateTimeFormat: PresentationDateTimeFormat) -> [ThemeAutoNightSettingsControllerEntry] { var entries: [ThemeAutoNightSettingsControllerEntry] = [] let activeTriggerMode: TriggerMode @@ -297,8 +288,7 @@ private func themeAutoNightSettingsControllerEntries(theme: PresentationTheme, s break case .timeBased, .brightness: entries.append(.themeHeader(theme, strings.AutoNightTheme_PreferredTheme)) - entries.append(.themeNightBlue(theme, strings.Appearance_ThemeCarouselTintedNight, switchSetting.theme == .nightAccent)) - entries.append(.themeNight(theme, strings.Appearance_ThemeCarouselNewNight, switchSetting.theme == .night)) + entries.append(.themeItem(theme, strings, availableThemes, switchSetting.theme, settings.themeSpecificAccentColors)) } return entries @@ -389,7 +379,7 @@ public func themeAutoNightSettingsController(context: AccountContext) -> ViewCon updateLocationDisposable.set(disposable) } - let arguments = ThemeAutoNightSettingsControllerArguments(updateMode: { mode in + let arguments = ThemeAutoNightSettingsControllerArguments(context: context, updateMode: { mode in var updateLocation = false updateSettings { settings in var settings = settings @@ -508,19 +498,51 @@ public func themeAutoNightSettingsController(context: AccountContext) -> ViewCon } })) }, updateTheme: { theme in - updateSettings { settings in - var settings = settings - settings.theme = theme - return settings + let presentationTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: theme, accentColor: nil, serviceBackgroundColor: .black, baseColor: nil) + + let resolvedWallpaper: Signal + if case let .file(file) = presentationTheme.chat.defaultWallpaper, file.id == 0 { + resolvedWallpaper = cachedWallpaper(account: context.account, slug: file.slug, settings: file.settings) + |> map { wallpaper -> TelegramWallpaper? in + return wallpaper?.wallpaper + } + } else { + resolvedWallpaper = .single(nil) } + + let _ = (resolvedWallpaper + |> mapToSignal { resolvedWallpaper -> Signal in + var updatedTheme = theme + if case let .cloud(info) = theme { + updatedTheme = .cloud(PresentationCloudTheme(theme: info.theme, resolvedWallpaper: resolvedWallpaper)) + } + + updateSettings { settings in + var settings = settings + settings.theme = updatedTheme + return settings + } + + return .complete() + }).start() }) - let signal = combineLatest(context.sharedContext.presentationData |> deliverOnMainQueue, sharedData |> deliverOnMainQueue, stagingSettingsPromise.get() |> deliverOnMainQueue) - |> map { presentationData, sharedData, stagingSettings -> (ItemListControllerState, (ItemListNodeState, ThemeAutoNightSettingsControllerEntry.ItemGenerationArguments)) in + let cloudThemes = Promise<[TelegramTheme]>() + let updatedCloudThemes = telegramThemes(postbox: context.account.postbox, network: context.account.network, accountManager: context.sharedContext.accountManager) + cloudThemes.set(updatedCloudThemes) + + let signal = combineLatest(context.sharedContext.presentationData |> deliverOnMainQueue, sharedData |> deliverOnMainQueue, cloudThemes.get() |> deliverOnMainQueue, stagingSettingsPromise.get() |> deliverOnMainQueue) + |> map { presentationData, sharedData, cloudThemes, stagingSettings -> (ItemListControllerState, (ItemListNodeState, ThemeAutoNightSettingsControllerEntry.ItemGenerationArguments)) in let settings = (sharedData.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings + let defaultThemes: [PresentationThemeReference] = [.builtin(.night), .builtin(.nightAccent)] + let cloudThemes: [PresentationThemeReference] = cloudThemes.map { .cloud(PresentationCloudTheme(theme: $0, resolvedWallpaper: nil)) } + + var availableThemes = defaultThemes + availableThemes.append(contentsOf: cloudThemes) + let controllerState = ItemListControllerState(theme: presentationData.theme, title: .text(presentationData.strings.AutoNightTheme_Title), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back)) - let listState = ItemListNodeState(entries: themeAutoNightSettingsControllerEntries(theme: presentationData.theme, strings: presentationData.strings, switchSetting: stagingSettings ?? settings.automaticThemeSwitchSetting, dateTimeFormat: presentationData.dateTimeFormat), style: .blocks, animateChanges: false) + let listState = ItemListNodeState(entries: themeAutoNightSettingsControllerEntries(theme: presentationData.theme, strings: presentationData.strings, settings: settings, switchSetting: stagingSettings ?? settings.automaticThemeSwitchSetting, availableThemes: availableThemes, dateTimeFormat: presentationData.dateTimeFormat), style: .blocks, animateChanges: false) return (controllerState, (listState, arguments)) } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightTimeSelectionActionSheet.swift b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightTimeSelectionActionSheet.swift index 28d287d72f..099743aaa1 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightTimeSelectionActionSheet.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightTimeSelectionActionSheet.swift @@ -101,7 +101,7 @@ private final class ThemeAutoNightTimeSelectionActionSheetItemNode: ActionSheetI self.pickerView.datePickerMode = .time self.pickerView.timeZone = TimeZone(secondsFromGMT: 0) self.pickerView.date = Date(timeIntervalSince1970: Double(currentValue)) - self.pickerView.locale = localeWithStrings(strings) + self.pickerView.locale = Locale.current self.pickerView.setValue(theme.primaryTextColor, forKey: "textColor") diff --git a/submodules/SettingsUI/Sources/Themes/ThemeNameGenerator.swift b/submodules/SettingsUI/Sources/Themes/ThemeNameGenerator.swift new file mode 100644 index 0000000000..694c1757ef --- /dev/null +++ b/submodules/SettingsUI/Sources/Themes/ThemeNameGenerator.swift @@ -0,0 +1,345 @@ +import UIKit + +private let colors: [UInt32: String] = [ + 0x8e0000: "Berry", + 0xdec196: "Brandy", + 0x800b47: "Cherry", + 0xff7f50: "Coral", + 0xdb5079: "Cranberry", + 0xdc143c: "Crimson", + 0xe0b0ff: "Mauve", + 0xffc0cb: "Pink", + 0xff0000: "Red", + 0xff007f: "Rose", + 0x80461b: "Russet", + 0xff2400: "Scarlet", + 0xf1f1f1: "Seashell", + 0xff3399: "Strawberry", + 0xffbf00: "Amber", + 0xeb9373: "Apricot", + 0xfbe7b2: "Banana", + 0xa1c50a: "Citrus", + 0xb06500: "Ginger", + 0xffd700: "Gold", + 0xfde910: "Lemon", + 0xffa500: "Orange", + 0xffe5b4: "Peach", + 0xff6b53: "Persimmon", + 0xe4d422: "Sunflower", + 0xf28500: "Tangerine", + 0xffc87c: "Topaz", + 0xffff00: "Yellow", + 0x384910: "Clover", + 0x83aa5d: "Cucumber", + 0x50c878: "Emerald", + 0xb5b35c: "Olive", + 0x00ff00: "Green", + 0x00a86b: "Jade", + 0x29ab87: "Jungle", + 0xbfff00: "Lime", + 0x0bda51: "Malachite", + 0x98ff98: "Mint", + 0xaddfad: "Moss", + 0x315ba1: "Azure", + 0x0000ff: "Blue", + 0x0047ab: "Cobalt", + 0x4f69c6: "Indigo", + 0x017987: "Lagoon", + 0x71d9e2: "Aquamarine", + 0x120a8f: "Ultramarine", + 0x000080: "Navy", + 0x2f519e: "Sapphire", + 0x76d7ea: "Sky", + 0x008080: "Teal", + 0x40e0d0: "Turquoise", + 0x9966cc: "Amethyst", + 0x4d0135: "Blackberry", + 0x614051: "Eggplant", + 0xc8a2c8: "Lilac", + 0xb57edc: "Lavender", + 0xccccff: "Periwinkle", + 0x843179: "Plum", + 0x660099: "Purple", + 0xd8bfd8: "Thistle", + 0xda70d6: "Orchid", + 0x240a40: "Violet", + 0x3f2109: "Bronze", + 0x370202: "Chocolate", + 0x7b3f00: "Cinnamon", + 0x301f1e: "Cocoa", + 0x706555: "Coffee", + 0x796989: "Rum", + 0x4e0606: "Mahogany", + 0x782d19: "Mocha", + 0xc2b280: "Sand", + 0x882d17: "Sienna", + 0x780109: "Maple", + 0xf0e68c: "Khaki", + 0xb87333: "Copper", + 0xb94e48: "Chestnut", + 0xeed9c4: "Almond", + 0xfffdd0: "Cream", + 0xb9f2ff: "Diamond", + 0xa98307: "Honey", + 0xfffff0: "Ivory", + 0xeae0c8: "Pearl", + 0xeff2f3: "Porcelain", + 0xd1bea8: "Vanilla", + 0xffffff: "White", + 0x808080: "Gray", + 0x000000: "Black", + 0xe8f1d4: "Chrome", + 0x36454f: "Charcoal", + 0x0c0b1d: "Ebony", + 0xc0c0c0: "Silver", + 0xf5f5f5: "Smoke", + 0x262335: "Steel", + 0x4fa83d: "Apple", + 0x80b3c4: "Glacier", + 0xfebaad: "Melon", + 0xc54b8c: "Mulberry", + 0xa9c6c2: "Opal", + 0x54a5f8: "Blue" +] + +private let adjectives = [ + "Ancient", + "Antique", + "Autumn", + "Baby", + "Barely", + "Baroque", + "Blazing", + "Blushing", + "Bohemian", + "Bubbly", + "Burning", + "Buttered", + "Classic", + "Clear", + "Cool", + "Cosmic", + "Cotton", + "Cozy", + "Crystal", + "Dark", + "Daring", + "Darling", + "Dawn", + "Dazzling", + "Deep", + "Deepest", + "Delicate", + "Delightful", + "Divine", + "Double", + "Downtown", + "Dreamy", + "Dusky", + "Dusty", + "Electric", + "Enchanted", + "Endless", + "Evening", + "Fantastic", + "Flirty", + "Forever", + "Frigid", + "Frosty", + "Frozen", + "Gentle", + "Heavenly", + "Hyper", + "Icy", + "Infinite", + "Innocent", + "Instant", + "Luscious", + "Lunar", + "Lustrous", + "Magic", + "Majestic", + "Mambo", + "Midnight", + "Millenium", + "Morning", + "Mystic", + "Natural", + "Neon", + "Night", + "Opaque", + "Paradise", + "Perfect", + "Perky", + "Polished", + "Powerful", + "Rich", + "Royal", + "Sheer", + "Simply", + "Sizzling", + "Solar", + "Sparkling", + "Splendid", + "Spicy", + "Spring", + "Stellar", + "Sugared", + "Summer", + "Sunny", + "Super", + "Sweet", + "Tender", + "Tenacious", + "Tidal", + "Toasted", + "Totally", + "Tranquil", + "Tropical", + "True", + "Twilight", + "Twinkling", + "Ultimate", + "Ultra", + "Velvety", + "Vibrant", + "Vintage", + "Virtual", + "Warm", + "Warmest", + "Whipped", + "Wild", + "Winsome" +] + +private let subjectives = [ + "Ambrosia", + "Attack", + "Avalanche", + "Blast", + "Bliss", + "Blossom", + "Blush", + "Burst", + "Butter", + "Candy", + "Carnival", + "Charm", + "Chiffon", + "Cloud", + "Comet", + "Delight", + "Dream", + "Dust", + "Fantasy", + "Flame", + "Flash", + "Fire", + "Freeze", + "Frost", + "Glade", + "Glaze", + "Gleam", + "Glimmer", + "Glitter", + "Glow", + "Grande", + "Haze", + "Highlight", + "Ice", + "Illusion", + "Intrigue", + "Jewel", + "Jubilee", + "Kiss", + "Lights", + "Lollypop", + "Love", + "Luster", + "Madness", + "Matte", + "Mirage", + "Mist", + "Moon", + "Muse", + "Myth", + "Nectar", + "Nova", + "Parfait", + "Passion", + "Pop", + "Rain", + "Reflection", + "Rhapsody", + "Romance", + "Satin", + "Sensation", + "Silk", + "Shine", + "Shadow", + "Shimmer", + "Sky", + "Spice", + "Star", + "Sugar", + "Sunrise", + "Sunset", + "Sun", + "Twist", + "Unbound", + "Velvet", + "Vibrant", + "Waters", + "Wine", + "Wink", + "Wonder", + "Zone" +] + +private extension UIColor { + var colorComponents: (r: Int32, g: Int32, b: Int32) { + var r: CGFloat = 0.0 + var g: CGFloat = 0.0 + var b: CGFloat = 0.0 + if self.getRed(&r, green: &g, blue: &b, alpha: nil) { + return (Int32(max(0.0, r) * 255.0), Int32(max(0.0, g) * 255.0), Int32(max(0.0, b) * 255.0)) + } else if self.getWhite(&r, alpha: nil) { + return (Int32(max(0.0, r) * 255.0), Int32(max(0.0, r) * 255.0), Int32(max(0.0, r) * 255.0)) + } + return (0, 0, 0) + } + + func distance(to other: UIColor) -> Int32 { + let e1 = self.colorComponents + let e2 = other.colorComponents + let rMean = (e1.r + e2.r) / 2 + let r = e1.r - e2.r + let g = e1.g - e2.g + let b = e1.b - e2.b + return ((512 + rMean) * r * r) >> 8 + 4 * g * g + ((767 - rMean) * b * b) >> 8 + } +} + +func generateThemeName(accentColor: UIColor) -> String { + var nearest: (color: UInt32, distance: Int32)? + for (color, _) in colors { + let distance = accentColor.distance(to: UIColor(rgb: color)) + if let currentNearest = nearest { + if distance < currentNearest.distance { + nearest = (color, distance) + } + } else { + nearest = (color, distance) + } + } + + if let color = nearest?.color, let colorName = colors[color]?.capitalized { + if arc4random() % 2 == 0 { + return "\(adjectives[Int(arc4random()) % adjectives.count].capitalized) \(colorName)" + } else { + return "\(colorName) \(subjectives[Int(arc4random()) % subjectives.count].capitalized)" + } + } else { + return "" + } +} diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift index ca21e976c0..3dec14e542 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift @@ -25,16 +25,18 @@ public final class ThemePreviewController: ViewController { private let previewTheme: PresentationTheme private let source: ThemePreviewSource private let theme = Promise() + private let presentationTheme = Promise() private var controllerNode: ThemePreviewControllerNode { return self.displayNode as! ThemePreviewControllerNode } - + private var didPlayPresentationAnimation = false private var presentationData: PresentationData private var presentationDataDisposable: Disposable? + private var disposable: Disposable? private var applyDisposable = MetaDisposable() public init(context: AccountContext, previewTheme: PresentationTheme, source: ThemePreviewSource) { @@ -43,6 +45,7 @@ public final class ThemePreviewController: ViewController { self.source = source self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + self.presentationTheme.set(.single(previewTheme)) super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationTheme: self.previewTheme, presentationStrings: self.presentationData.strings)) @@ -57,24 +60,48 @@ public final class ThemePreviewController: ViewController { return .single(nil) }) themeName = previewTheme.name.string + + self.presentationTheme.set(.single(self.previewTheme) + |> then( + self.theme.get() + |> mapToSignal { theme in + if let file = theme?.file { + return telegramThemeData(account: context.account, accountManager: context.sharedContext.accountManager, resource: file.resource) + |> mapToSignal { data -> Signal in + guard let data = data, let presentationTheme = makePresentationTheme(data: data) else { + return .complete() + } + return .single(presentationTheme) + } + } else { + return .complete() + } + } + )) } else { self.theme.set(.single(nil)) themeName = previewTheme.name.string } - if let author = previewTheme.author { - let titleView = CounterContollerTitleView(theme: self.previewTheme) - titleView.title = CounterContollerTitle(title: themeName, counter: author) - self.navigationItem.titleView = titleView - } else { - self.title = themeName - } + let titleView = CounterContollerTitleView(theme: self.previewTheme) + titleView.title = CounterContollerTitle(title: themeName, counter: " ") + self.navigationItem.titleView = titleView self.statusBar.statusBarStyle = self.previewTheme.rootController.statusBarStyle.style self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: self.previewTheme.rootController.navigationBar.accentTextColor), style: .plain, target: self, action: #selector(self.actionPressed)) + self.disposable = (combineLatest(self.theme.get(), self.presentationTheme.get()) + |> deliverOnMainQueue).start(next: { [weak self] theme, presentationTheme in + if let strongSelf = self, let theme = theme { + let titleView = CounterContollerTitleView(theme: strongSelf.previewTheme) + titleView.title = CounterContollerTitle(title: themeName, counter: strongSelf.presentationData.strings.Theme_UsersCount(max(1, theme.installCount))) + strongSelf.navigationItem.titleView = titleView + strongSelf.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationTheme: presentationTheme, presentationStrings: strongSelf.presentationData.strings)) + } + }) + self.presentationDataDisposable = (context.sharedContext.presentationData |> deliverOnMainQueue).start(next: { [weak self] presentationData in if let strongSelf = self { @@ -89,6 +116,7 @@ public final class ThemePreviewController: ViewController { deinit { self.presentationDataDisposable?.dispose() + self.disposable?.dispose() self.applyDisposable.dispose() } @@ -119,7 +147,7 @@ public final class ThemePreviewController: ViewController { let previewTheme = self.previewTheme if case let .file(file) = previewTheme.chat.defaultWallpaper, file.id == 0 { - self.controllerNode.wallpaperPromise.set(cachedWallpaper(account: self.context.account, slug: file.slug) + self.controllerNode.wallpaperPromise.set(cachedWallpaper(account: self.context.account, slug: file.slug, settings: file.settings) |> mapToSignal { wallpaper in return .single(wallpaper?.wallpaper ?? .color(Int32(bitPattern: previewTheme.chatList.backgroundColor.rgb))) }) @@ -270,7 +298,7 @@ public final class ThemePreviewController: ViewController { } } |> runOn(Queue.mainQueue()) - |> delay(0.7, queue: Queue.mainQueue()) + |> delay(0.35, queue: Queue.mainQueue()) let progressDisposable = progressSignal.start() cancelImpl = { diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift index 0555305f43..10ce1e8cd2 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift @@ -10,6 +10,7 @@ import TelegramUIPreferences import AccountContext import ChatListUI import WallpaperResources +import LegacyComponents private func generateMaskImage(color: UIColor) -> UIImage? { return generateImage(CGSize(width: 1.0, height: 80.0), opaque: false, rotatedContext: { size, context in @@ -28,7 +29,7 @@ private func generateMaskImage(color: UIColor) -> UIImage? { final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { private let context: AccountContext - private let previewTheme: PresentationTheme + private var previewTheme: PresentationTheme private var presentationData: PresentationData public let wallpaperPromise = Promise() @@ -46,6 +47,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { private let chatContainerNode: ASDisplayNode private let instantChatBackgroundNode: WallpaperBackgroundNode private let remoteChatBackgroundNode: TransformImageNode + private let blurredNode: BlurredImageNode private var messageNodes: [ListViewItemNode]? private let toolbarNode: WallpaperGalleryToolbarNode @@ -85,9 +87,15 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { self.instantChatBackgroundNode.displaysAsynchronously = false self.instantChatBackgroundNode.image = chatControllerBackgroundImage(theme: previewTheme, wallpaper: previewTheme.chat.defaultWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper) self.instantChatBackgroundNode.motionEnabled = previewTheme.chat.defaultWallpaper.settings?.motion ?? false + self.instantChatBackgroundNode.view.contentMode = .scaleAspectFill self.remoteChatBackgroundNode = TransformImageNode() self.remoteChatBackgroundNode.backgroundColor = previewTheme.chatList.backgroundColor + self.remoteChatBackgroundNode.view.contentMode = .scaleAspectFill + + self.blurredNode = BlurredImageNode() + self.blurredNode.clipsToBounds = true + self.blurredNode.blurView.contentMode = .scaleAspectFill self.toolbarNode = WallpaperGalleryToolbarNode(theme: self.previewTheme, strings: self.presentationData.strings) @@ -140,6 +148,26 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { apply() } + if case let .file(file) = self.previewTheme.chat.defaultWallpaper { + if file.settings.blur { + self.chatContainerNode.addSubnode(self.blurredNode) + } + } + + self.remoteChatBackgroundNode.imageUpdated = { [weak self] image in + if let strongSelf = self, strongSelf.blurredNode.supernode != nil { + var image = image + if let imageToScale = image { + let actualSize = CGSize(width: imageToScale.size.width * imageToScale.scale, height: imageToScale.size.height * imageToScale.scale) + if actualSize.width > 1280.0 || actualSize.height > 1280.0 { + image = TGScaleImageToPixelSize(image, actualSize.fitted(CGSize(width: 1280.0, height: 1280.0))) + } + } + strongSelf.blurredNode.image = image + strongSelf.blurredNode.blurView.blurRadius = 45.0 + } + } + self.colorDisposable = (self.wallpaperPromise.get() |> mapToSignal { wallpaper -> Signal in if case let .file(file) = wallpaper, file.id == 0 { @@ -173,12 +201,17 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { } convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource), reference: .media(media: .standalone(media: file.file), resource: file.file.resource))) + let signal: Signal<(TransformImageArguments) -> DrawingContext?, NoError> let fileReference = FileMediaReference.standalone(media: file.file) - let signal = wallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: fileReference, representations: convertedRepresentations, alwaysShowThumbnailFirst: false, autoFetchFullSize: false) - |> afterNext { next in - if let _ = context.sharedContext.accountManager.mediaBox.completedResourcePath(file.file.resource) { - } else if let path = context.account.postbox.mediaBox.completedResourcePath(file.file.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path)) { - context.sharedContext.accountManager.mediaBox.storeResourceData(file.file.resource.id, data: data) + if file.isPattern { + signal = patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, mode: .screen, autoFetchFullSize: false) + } else { + signal = wallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: fileReference, representations: convertedRepresentations, alwaysShowThumbnailFirst: false, autoFetchFullSize: false) + |> afterNext { next in + if let _ = context.sharedContext.accountManager.mediaBox.completedResourcePath(file.file.resource) { + } else if let path = context.account.postbox.mediaBox.completedResourcePath(file.file.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path)) { + context.sharedContext.accountManager.mediaBox.storeResourceData(file.file.resource.id, data: data) + } } } strongSelf.remoteChatBackgroundNode.setSignal(signal) @@ -203,7 +236,16 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { } }) - strongSelf.remoteChatBackgroundNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), emptyColor: nil))() + var patternColor: UIColor? + var patternIntensity: CGFloat = 0.5 + if let color = file.settings.color { + if let intensity = file.settings.intensity { + patternIntensity = CGFloat(intensity) / 100.0 + } + patternColor = UIColor(rgb: UInt32(bitPattern: color), alpha: patternIntensity) + } + + strongSelf.remoteChatBackgroundNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), emptyColor: patternColor))() } }) } @@ -224,6 +266,27 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { self.pageControlNode.setPage(0.0) } + func updateTheme(_ theme: PresentationTheme) { + self.previewTheme = theme + + self.backgroundColor = self.previewTheme.list.plainBackgroundColor + + self.pageControlNode.dotColor = self.previewTheme.chatList.unreadBadgeActiveBackgroundColor + self.pageControlNode.inactiveDotColor = self.previewTheme.list.pageIndicatorInactiveColor + + self.chatListBackgroundNode.backgroundColor = self.previewTheme.chatList.backgroundColor + self.maskNode.image = generateMaskImage(color: self.previewTheme.chatList.backgroundColor) + if case let .color(value) = self.previewTheme.chat.defaultWallpaper { + self.instantChatBackgroundNode.backgroundColor = UIColor(rgb: UInt32(bitPattern: value)) + } + + self.toolbarNode.updateThemeAndStrings(theme: self.previewTheme, strings: self.presentationData.strings) + + if let (layout, navigationBarHeight) = self.validLayout { + self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate) + } + } + func scrollViewDidScroll(_ scrollView: UIScrollView) { let bounds = scrollView.bounds if !bounds.width.isZero { @@ -402,6 +465,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { self.chatContainerNode.frame = CGRect(x: 0.0, y: 0.0, width: bounds.width, height: bounds.height) self.instantChatBackgroundNode.frame = self.chatContainerNode.bounds self.remoteChatBackgroundNode.frame = self.chatContainerNode.bounds + self.blurredNode.frame = self.chatContainerNode.bounds self.scrollNode.view.contentSize = CGSize(width: bounds.width * 2.0, height: bounds.height) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift index 411c10018d..052d07d796 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift @@ -10,6 +10,27 @@ import TelegramUIPreferences import ItemListUI import AccountContext +struct ChatPreviewMessageItem: Equatable { + static func == (lhs: ChatPreviewMessageItem, rhs: ChatPreviewMessageItem) -> Bool { + if lhs.outgoing != rhs.outgoing { + return false + } + if let lhsReply = lhs.reply, let rhsReply = rhs.reply, lhsReply.0 != rhsReply.0 || lhsReply.1 != rhsReply.1 { + return false + } else if (lhs.reply == nil) != (rhs.reply == nil) { + return false + } + if lhs.text != rhs.text { + return false + } + return true + } + + let outgoing: Bool + let reply: (String, String)? + let text: String +} + class ThemeSettingsChatPreviewItem: ListViewItem, ItemListItem { let context: AccountContext let theme: PresentationTheme @@ -20,8 +41,9 @@ class ThemeSettingsChatPreviewItem: ListViewItem, ItemListItem { let wallpaper: TelegramWallpaper let dateTimeFormat: PresentationDateTimeFormat let nameDisplayOrder: PresentationPersonNameOrder + let messageItems: [ChatPreviewMessageItem] - init(context: AccountContext, theme: PresentationTheme, componentTheme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder) { + init(context: AccountContext, theme: PresentationTheme, componentTheme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, messageItems: [ChatPreviewMessageItem]) { self.context = context self.theme = theme self.componentTheme = componentTheme @@ -31,6 +53,7 @@ class ThemeSettingsChatPreviewItem: ListViewItem, ItemListItem { self.wallpaper = wallpaper self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder + self.messageItems = messageItems } func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { @@ -73,9 +96,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { private let bottomStripeNode: ASDisplayNode private let containerNode: ASDisplayNode - - private var messageNode1: ListViewItemNode? - private var messageNode2: ListViewItemNode? + private var messageNodes: [ListViewItemNode]? private var item: ThemeSettingsChatPreviewItem? @@ -103,8 +124,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { func asyncLayout() -> (_ item: ThemeSettingsChatPreviewItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { let currentItem = self.item - let currentNode1 = self.messageNode1 - let currentNode2 = self.messageNode2 + let currentNodes = self.messageNodes return { item, params, neighbors in var updatedBackgroundImage: UIImage? @@ -116,65 +136,57 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { let separatorHeight = UIScreenPixel let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) - - var peers = SimpleDictionary() - var messages = SimpleDictionary() - - peers[peerId] = TelegramUser(id: peerId, accessHash: nil, firstName: item.strings.Appearance_PreviewReplyAuthor, lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) - let replyMessageId = MessageId(peerId: peerId, namespace: 0, id: 3) - messages[replyMessageId] = Message(stableId: 3, stableVersion: 0, id: replyMessageId, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: item.strings.Appearance_PreviewReplyText, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - - let message2 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: nil, text: item.strings.Appearance_PreviewIncomingText, attributes: [ReplyMessageAttribute(messageId: replyMessageId)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - let message1 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: TelegramUser(id: item.context.account.peerId, accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []), text: item.strings.Appearance_PreviewOutgoingText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - - let item2 = item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: message2, theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil) - - let item1 = item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: message1, theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil) - - var node1: ListViewItemNode? - if let current = currentNode1 { - node1 = current - item1.updateNode(async: { $0() }, node: { return current }, params: params, previousItem: nil, nextItem: nil, animation: .None, completion: { (layout, apply) in - let nodeFrame = CGRect(origin: current.frame.origin, size: CGSize(width: layout.size.width, height: layout.size.height)) - - current.contentSize = layout.contentSize - current.insets = layout.insets - current.frame = nodeFrame - - apply(ListViewItemApply(isOnScreen: true)) - }) - } else { - item1.nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: true, previousItem: nil, nextItem: nil, completion: { node, apply in - node1 = node - apply().1(ListViewItemApply(isOnScreen: true)) - }) + let otherPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 2) + var items: [ListViewItem] = [] + for messageItem in item.messageItems.reversed() { + var peers = SimpleDictionary() + var messages = SimpleDictionary() + + let replyMessageId = MessageId(peerId: peerId, namespace: 0, id: 3) + if let (author, text) = messageItem.reply { + peers[peerId] = TelegramUser(id: peerId, accessHash: nil, firstName: author, lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) + messages[replyMessageId] = Message(stableId: 3, stableVersion: 0, id: replyMessageId, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: text, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) + } + + let message = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: messageItem.outgoing ? otherPeerId : peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: messageItem.outgoing ? [] : [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: messageItem.outgoing ? TelegramUser(id: otherPeerId, accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) : nil, text: messageItem.text, attributes: messageItem.reply != nil ? [ReplyMessageAttribute(messageId: replyMessageId)] : [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) + items.append(item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: message, theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil)) } - var node2: ListViewItemNode? - if let current = currentNode2 { - node2 = current - item2.updateNode(async: { $0() }, node: { return current }, params: params, previousItem: nil, nextItem: nil, animation: .None, completion: { (layout, apply) in - let nodeFrame = CGRect(origin: current.frame.origin, size: CGSize(width: layout.size.width, height: layout.size.height)) - - current.contentSize = layout.contentSize - current.insets = layout.insets - current.frame = nodeFrame - - apply(ListViewItemApply(isOnScreen: true)) - }) + var nodes: [ListViewItemNode] = [] + if let messageNodes = currentNodes { + nodes = messageNodes + for i in 0 ..< items.count { + let itemNode = messageNodes[i] + items[i].updateNode(async: { $0() }, node: { + return itemNode + }, params: params, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], animation: .None, completion: { (layout, apply) in + let nodeFrame = CGRect(origin: itemNode.frame.origin, size: CGSize(width: layout.size.width, height: layout.size.height)) + + itemNode.contentSize = layout.contentSize + itemNode.insets = layout.insets + itemNode.frame = nodeFrame + itemNode.isUserInteractionEnabled = false + + apply(ListViewItemApply(isOnScreen: true)) + }) + } } else { - item2.nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: true, previousItem: nil, nextItem: nil, completion: { node, apply in - node2 = node - apply().1(ListViewItemApply(isOnScreen: true)) - }) + var messageNodes: [ListViewItemNode] = [] + for i in 0 ..< items.count { + var itemNode: ListViewItemNode? + items[i].nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: false, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], completion: { node, apply in + itemNode = node + apply().1(ListViewItemApply(isOnScreen: true)) + }) + itemNode!.isUserInteractionEnabled = false + messageNodes.append(itemNode!) + } + nodes = messageNodes } var contentSize = CGSize(width: params.width, height: 4.0 + 4.0) - if let node1 = node1 { - contentSize.height += node1.frame.size.height - } - if let node2 = node2 { - contentSize.height += node2.frame.size.height + for node in nodes { + contentSize.height += node.frame.size.height } insets = itemListNeighborsGroupedInsets(neighbors) @@ -187,23 +199,14 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { strongSelf.containerNode.frame = CGRect(origin: CGPoint(), size: contentSize) + strongSelf.messageNodes = nodes var topOffset: CGFloat = 4.0 - if let node1 = node1 { - strongSelf.messageNode1 = node1 - if node1.supernode == nil { - strongSelf.containerNode.addSubnode(node1) + for node in nodes { + if node.supernode == nil { + strongSelf.containerNode.addSubnode(node) } - node1.updateFrame(CGRect(origin: CGPoint(x: 0.0, y: topOffset), size: node1.frame.size), within: layoutSize) - topOffset += node1.frame.size.height - } - - if let node2 = node2 { - strongSelf.messageNode2 = node2 - if node2.supernode == nil { - strongSelf.containerNode.addSubnode(node2) - } - node2.updateFrame(CGRect(origin: CGPoint(x: 0.0, y: topOffset), size: node2.frame.size), within: layoutSize) - topOffset += node2.frame.size.height + node.updateFrame(CGRect(origin: CGPoint(x: 0.0, y: topOffset), size: node.frame.size), within: layoutSize) + topOffset += node.frame.size.height } if let updatedBackgroundImage = updatedBackgroundImage { diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift index 1f8d4f9ccb..ee5d080a37 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift @@ -36,7 +36,7 @@ func themeDisplayName(strings: PresentationStrings, reference: PresentationTheme private final class ThemeSettingsControllerArguments { let context: AccountContext - let selectTheme: (PresentationThemeReference) -> Void + let updateTheme: (PresentationThemeReference) -> Void let selectFontSize: (PresentationFontSize) -> Void let openWallpaperSettings: () -> Void let selectAccentColor: (PresentationThemeAccentColor) -> Void @@ -48,9 +48,9 @@ private final class ThemeSettingsControllerArguments { let presentThemeMenu: (PresentationThemeReference, Bool) -> Void let editTheme: (PresentationCloudTheme) -> Void - init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference, PresentationThemeAccentColor?) -> Void, openAutoNightTheme: @escaping () -> Void, toggleLargeEmoji: @escaping (Bool) -> Void, disableAnimations: @escaping (Bool) -> Void, selectAppIcon: @escaping (String) -> Void, presentThemeMenu: @escaping (PresentationThemeReference, Bool) -> Void, editTheme: @escaping (PresentationCloudTheme) -> Void) { + init(context: AccountContext, updateTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference, PresentationThemeAccentColor?) -> Void, openAutoNightTheme: @escaping () -> Void, toggleLargeEmoji: @escaping (Bool) -> Void, disableAnimations: @escaping (Bool) -> Void, selectAppIcon: @escaping (String) -> Void, presentThemeMenu: @escaping (PresentationThemeReference, Bool) -> Void, editTheme: @escaping (PresentationCloudTheme) -> Void) { self.context = context - self.selectTheme = selectTheme + self.updateTheme = updateTheme self.selectFontSize = selectFontSize self.openWallpaperSettings = openWallpaperSettings self.selectAccentColor = selectAccentColor @@ -94,7 +94,7 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { case themeListHeader(PresentationTheme, String) case fontSizeHeader(PresentationTheme, String) case fontSize(PresentationTheme, PresentationFontSize) - case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder) + case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) case wallpaper(PresentationTheme, String) case accentColor(PresentationTheme, PresentationThemeReference, String, PresentationThemeAccentColor?) case autoNightTheme(PresentationTheme, String, String) @@ -156,8 +156,8 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { static func ==(lhs: ThemeSettingsControllerEntry, rhs: ThemeSettingsControllerEntry) -> Bool { switch lhs { - case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder): - if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder { + case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): + if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { return true } else { return false @@ -255,8 +255,8 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ThemeSettingsFontSizeItem(theme: theme, fontSize: fontSize, sectionId: self.section, updated: { value in arguments.selectFontSize(value) }, tag: ThemeSettingsEntryTag.fontSize) - case let .chatPreview(theme, componentTheme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder): - return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder) + case let .chatPreview(theme, componentTheme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder, items): + return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) case let .wallpaper(theme, text): return ItemListDisclosureItem(theme: theme, title: text, label: "", sectionId: self.section, style: .blocks, action: { arguments.openWallpaperSettings() @@ -290,14 +290,14 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { }) case let .themeListHeader(theme, text): return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section) - case let .themeItem(theme, strings, themes, currentTheme, themeSpecificAccentColors, currentColor): + case let .themeItem(theme, strings, themes, currentTheme, themeSpecificAccentColors, _): return ThemeSettingsThemeItem(context: arguments.context, theme: theme, strings: strings, sectionId: self.section, themes: themes, themeSpecificAccentColors: themeSpecificAccentColors, currentTheme: currentTheme, updatedTheme: { theme in if case let .cloud(theme) = theme, theme.theme.file == nil { if theme.theme.isCreator { arguments.editTheme(theme) } } else { - arguments.selectTheme(theme) + arguments.updateTheme(theme) } }, longTapped: { theme in arguments.presentThemeMenu(theme, theme.index == currentTheme.index) @@ -324,16 +324,11 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { } } -private struct ThemeSettingsState: Equatable { - init() { - } -} - private func themeSettingsControllerEntries(presentationData: PresentationData, theme: PresentationTheme, themeReference: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], availableThemes: [PresentationThemeReference], autoNightSettings: AutomaticThemeSwitchSetting, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, largeEmoji: Bool, disableAnimations: Bool, availableAppIcons: [PresentationAppIcon], currentAppIconName: String?) -> [ThemeSettingsControllerEntry] { var entries: [ThemeSettingsControllerEntry] = [] entries.append(.themeListHeader(presentationData.theme, strings.Appearance_ColorTheme.uppercased())) - entries.append(.chatPreview(presentationData.theme, theme, wallpaper, fontSize, presentationData.strings, dateTimeFormat, presentationData.nameDisplayOrder)) + entries.append(.chatPreview(presentationData.theme, theme, wallpaper, fontSize, presentationData.strings, dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (presentationData.strings.Appearance_PreviewReplyAuthor, presentationData.strings.Appearance_PreviewReplyText), text: presentationData.strings.Appearance_PreviewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: presentationData.strings.Appearance_PreviewOutgoingText)])) entries.append(.themeItem(presentationData.theme, presentationData.strings, availableThemes, themeReference, themeSpecificAccentColors, themeSpecificAccentColors[themeReference.index])) @@ -342,19 +337,17 @@ private func themeSettingsControllerEntries(presentationData: PresentationData, } entries.append(.wallpaper(presentationData.theme, strings.Settings_ChatBackground)) - - if theme.name == .builtin(.day) || theme.name == .builtin(.dayClassic) { - let title: String - switch autoNightSettings.trigger { - case .none: - title = strings.AutoNightTheme_Disabled - case .timeBased: - title = strings.AutoNightTheme_Scheduled - case .brightness: - title = strings.AutoNightTheme_Automatic - } - entries.append(.autoNightTheme(presentationData.theme, strings.Appearance_AutoNightTheme, title)) + + let title: String + switch autoNightSettings.trigger { + case .none: + title = strings.AutoNightTheme_Disabled + case .timeBased: + title = strings.AutoNightTheme_Scheduled + case .brightness: + title = strings.AutoNightTheme_Automatic } + entries.append(.autoNightTheme(presentationData.theme, strings.Appearance_AutoNightTheme, title)) entries.append(.fontSizeHeader(presentationData.theme, strings.Appearance_TextSize.uppercased())) entries.append(.fontSize(presentationData.theme, fontSize)) @@ -373,18 +366,11 @@ private func themeSettingsControllerEntries(presentationData: PresentationData, } public func themeSettingsController(context: AccountContext, focusOnItemTag: ThemeSettingsEntryTag? = nil) -> ViewController { - let initialState = ThemeSettingsState() - let statePromise = ValuePromise(initialState, ignoreRepeated: true) - let stateValue = Atomic(value: initialState) - let updateState: ((ThemeSettingsState) -> ThemeSettingsState) -> Void = { f in - statePromise.set(stateValue.modify { f($0) }) - } - var pushControllerImpl: ((ViewController) -> Void)? var presentControllerImpl: ((ViewController, Any?) -> Void)? var getNavigationControllerImpl: (() -> NavigationController?)? - var selectThemeImpl: ((PresentationThemeReference) -> Void)? + var updateThemeImpl: ((PresentationThemeReference) -> Void)? var moreImpl: (() -> Void)? let _ = telegramWallpapers(postbox: context.account.postbox, network: context.account.network).start() @@ -405,8 +391,8 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The let updatedCloudThemes = telegramThemes(postbox: context.account.postbox, network: context.account.network, accountManager: context.sharedContext.accountManager) cloudThemes.set(updatedCloudThemes) - let arguments = ThemeSettingsControllerArguments(context: context, selectTheme: { theme in - selectThemeImpl?(theme) + let arguments = ThemeSettingsControllerArguments(context: context, updateTheme: { theme in + updateThemeImpl?(theme) }, selectFontSize: { size in let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in return PresentationThemeSettings(chatWallpaper: current.chatWallpaper, theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, fontSize: size, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) @@ -488,7 +474,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The } else { newTheme = .builtin(.nightAccent) } - selectThemeImpl?(newTheme) + updateThemeImpl?(newTheme) } let _ = deleteThemeInteractively(account: context.account, accountManager: context.sharedContext.accountManager, theme: theme.theme).start() @@ -516,8 +502,8 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) }) - let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]), cloudThemes.get(), availableAppIcons, currentAppIconName.get(), statePromise.get()) - |> map { presentationData, sharedData, cloudThemes, availableAppIcons, currentAppIconName, state -> (ItemListControllerState, (ItemListNodeState, ThemeSettingsControllerEntry.ItemGenerationArguments)) in + let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]), cloudThemes.get(), availableAppIcons, currentAppIconName.get()) + |> map { presentationData, sharedData, cloudThemes, availableAppIcons, currentAppIconName -> (ItemListControllerState, (ItemListNodeState, ThemeSettingsControllerEntry.ItemGenerationArguments)) in let settings = (sharedData.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings let fontSize = settings.fontSize @@ -565,12 +551,12 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The getNavigationControllerImpl = { [weak controller] in return controller?.navigationController as? NavigationController } - selectThemeImpl = { theme in + updateThemeImpl = { theme in let presentationTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: theme, accentColor: nil, serviceBackgroundColor: .black, baseColor: nil) let resolvedWallpaper: Signal if case let .file(file) = presentationTheme.chat.defaultWallpaper, file.id == 0 { - resolvedWallpaper = cachedWallpaper(account: context.account, slug: file.slug) + resolvedWallpaper = cachedWallpaper(account: context.account, slug: file.slug, settings: file.settings) |> map { wallpaper -> TelegramWallpaper? in return wallpaper?.wallpaper } @@ -590,7 +576,6 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The if case let .cloud(info) = theme { updatedTheme = .cloud(PresentationCloudTheme(theme: info.theme, resolvedWallpaper: resolvedWallpaper)) } - return (context.sharedContext.accountManager.transaction { transaction -> Void in transaction.updateSharedData(ApplicationSpecificSharedDataKeys.presentationThemeSettings, { entry in let current: PresentationThemeSettings @@ -641,7 +626,7 @@ public final class ThemeSettingsCrossfadeController: ViewController { private let snapshotView: UIView? public init() { - self.snapshotView = UIScreen.main.snapshotView(afterScreenUpdates: true) + self.snapshotView = UIScreen.main.snapshotView(afterScreenUpdates: false) super.init(navigationBarPresentationData: nil) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift index 71768db278..e4ed343a2d 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift @@ -19,13 +19,13 @@ private func generateBorderImage(theme: PresentationTheme, bordered: Bool, selec if let image = borderImages[key] { return image } else { - let image = generateImage(CGSize(width: 30.0, height: 30.0), rotatedContext: { size, context in + let image = generateImage(CGSize(width: 32.0, height: 32.0), rotatedContext: { size, context in let bounds = CGRect(origin: CGPoint(), size: size) context.setFillColor(theme.list.itemBlocksBackgroundColor.cgColor) context.fill(bounds) context.setBlendMode(.clear) - context.fillEllipse(in: bounds) + context.fillEllipse(in: bounds.insetBy(dx: 1.0, dy: 1.0)) context.setBlendMode(.normal) let lineWidth: CGFloat @@ -43,9 +43,9 @@ private func generateBorderImage(theme: PresentationTheme, bordered: Bool, selec if bordered || selected { context.setLineWidth(lineWidth) - context.strokeEllipse(in: bounds.insetBy(dx: lineWidth / 2.0, dy: lineWidth / 2.0)) + context.strokeEllipse(in: bounds.insetBy(dx: 1.0 + lineWidth / 2.0, dy: 1.0 + lineWidth / 2.0)) } - })?.stretchableImage(withLeftCapWidth: 15, topCapHeight: 15) + })?.stretchableImage(withLeftCapWidth: 16, topCapHeight: 16) borderImages[key] = image return image } @@ -55,7 +55,7 @@ private func createThemeImage(theme: PresentationTheme) -> Signal<(TransformImag return .single(theme) |> map { theme -> (TransformImageArguments) -> DrawingContext? in return { arguments in - let context = DrawingContext(size: arguments.drawingSize, scale: arguments.scale ?? 0.0, clear: arguments.emptyColor == nil) + let context = DrawingContext(size: arguments.drawingSize, scale: arguments.scale ?? 0.0, clear: false) let drawingRect = arguments.drawingRect context.withContext { c in @@ -156,7 +156,7 @@ private final class ThemeSettingsThemeItemIconNode : ASDisplayNode { self.imageNode.isLayerBacked = true self.overlayNode = ASImageNode() - self.overlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 98.0, height: 62.0)) + self.overlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 100.0, height: 64.0)) self.overlayNode.isLayerBacked = true self.textNode = ASTextNode() @@ -171,10 +171,12 @@ private final class ThemeSettingsThemeItemIconNode : ASDisplayNode { } func setup(context: AccountContext, theme: PresentationThemeReference, accentColor: UIColor?, currentTheme: PresentationTheme, title: NSAttributedString, bordered: Bool, selected: Bool, action: @escaping () -> Void, longTapAction: @escaping () -> Void) { + let updatedTheme = self.currentTheme == nil || currentTheme !== self.currentTheme! if case let .cloud(theme) = theme, theme.theme.file == nil { - if self.currentTheme == nil || currentTheme !== self.currentTheme! { + if updatedTheme || accentColor != self.accentColor { self.imageNode.setSignal(createThemeImage(theme: currentTheme)) self.currentTheme = currentTheme + self.accentColor = accentColor } } else { if theme != self.theme || accentColor != self.accentColor { @@ -183,7 +185,7 @@ private final class ThemeSettingsThemeItemIconNode : ASDisplayNode { self.accentColor = accentColor } } - if self.currentTheme == nil || currentTheme !== self.currentTheme! || bordered != self.bordered || selected != self.selected { + if updatedTheme || bordered != self.bordered || selected != self.selected { self.overlayNode.image = generateBorderImage(theme: currentTheme, bordered: bordered, selected: selected) self.currentTheme = currentTheme self.bordered = bordered @@ -238,7 +240,7 @@ private final class ThemeSettingsThemeItemIconNode : ASDisplayNode { let applyLayout = makeLayout(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets(), emptyColor: .clear)) applyLayout() - self.overlayNode.frame = CGRect(origin: CGPoint(x: 10.0, y: 14.0), size: CGSize(width: 98.0, height: 62.0)) + self.overlayNode.frame = CGRect(origin: CGPoint(x: 9.0, y: 13.0), size: CGSize(width: 100.0, height: 64.0)) self.textNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 14.0 + 60.0 + 4.0 + 9.0), size: CGSize(width: bounds.size.width, height: 16.0)) } } @@ -295,8 +297,6 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { } func asyncLayout() -> (_ item: ThemeSettingsThemeItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { - let currentItem = self.item - return { item, params, neighbors in let contentSize: CGSize let insets: UIEdgeInsets diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift index bf7eaa0834..3e0a1dc81a 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift @@ -160,19 +160,12 @@ final class WallpaperColorPanelNode: ASDisplayNode, UITextFieldDelegate { } @objc internal func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { - if string.count > 1 { - if string.count <= 6 { - var updated = textField.text ?? "" - updated.replaceSubrange(updated.index(updated.startIndex, offsetBy: range.lowerBound) ..< updated.index(updated.startIndex, offsetBy: range.upperBound), with: string) - if updated.count <= 6 && updated.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF").inverted) == nil { - textField.text = updated.uppercased() - } - } - return false - } else if string.count == 1 { - return (textField.text ?? "").count < 6 && string.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF").inverted) == nil + var updated = textField.text ?? "" + updated.replaceSubrange(updated.index(updated.startIndex, offsetBy: range.lowerBound) ..< updated.index(updated.startIndex, offsetBy: range.upperBound), with: string) + if updated.count <= 6 && updated.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF").inverted) == nil { + textField.text = updated.uppercased() } - return true + return false } @objc func textFieldTextChanged(_ sender: UITextField) { diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift index 4b3e508522..b8f955a73d 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift @@ -681,10 +681,8 @@ public class WallpaperGalleryController: ViewController { self.toolbarNode!.updateLayout(size: CGSize(width: layout.size.width, height: 49.0), layout: layout, transition: transition) var bottomInset = layout.intrinsicInsets.bottom + 49.0 - let metrics = DeviceMetrics.forScreenSize(layout.size) - let standardInputHeight = metrics?.standardInputHeight(inLandscape: false) ?? 216.0 - let height = standardInputHeight - bottomInset + 47.0 - + let standardInputHeight = layout.deviceMetrics.keyboardHeight(inLandscape: false) + let height = max(standardInputHeight, layout.inputHeight ?? 0.0) - bottomInset + 47.0 if let colorPanelNode = self.colorPanelNode { var colorPanelFrame = CGRect(x: 0.0, y: layout.size.height, width: layout.size.width, height: height) if self.colorPanelEnabled { diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift index f9a37b2e1b..1207761b79 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift @@ -66,8 +66,8 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode { self.separatorNode.backgroundColor = theme.rootController.tabBar.separatorColor self.topSeparatorNode.backgroundColor = theme.rootController.tabBar.separatorColor - self.cancelButton.setTitle(strings.Common_Cancel, with: Font.regular(17.0), with: theme.rootController.navigationBar.primaryTextColor, for: []) - self.doneButton.setTitle(strings.Wallpaper_Set, with: Font.regular(17.0), with: theme.rootController.navigationBar.primaryTextColor, for: []) + self.cancelButton.setTitle(strings.Common_Cancel, with: Font.regular(17.0), with: theme.list.itemPrimaryTextColor, for: []) + self.doneButton.setTitle(strings.Wallpaper_Set, with: Font.regular(17.0), with: theme.list.itemPrimaryTextColor, for: []) } func updateLayout(size: CGSize, layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { diff --git a/submodules/SinglePhoneInputNode/SinglePhoneInputNode_Xcode.xcodeproj/project.pbxproj b/submodules/SinglePhoneInputNode/SinglePhoneInputNode_Xcode.xcodeproj/project.pbxproj index acd6ce8071..ab121f4100 100644 --- a/submodules/SinglePhoneInputNode/SinglePhoneInputNode_Xcode.xcodeproj/project.pbxproj +++ b/submodules/SinglePhoneInputNode/SinglePhoneInputNode_Xcode.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 094DC9C4231B75B400A6FF8F /* TelegramStringFormatting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094DC9C3231B75B400A6FF8F /* TelegramStringFormatting.framework */; }; D03E420C230563DB0049C28B /* SinglePhoneInputNode.h in Headers */ = {isa = PBXBuildFile; fileRef = D03E420A230563DB0049C28B /* SinglePhoneInputNode.h */; settings = {ATTRIBUTES = (Public, ); }; }; D03E4217230564570049C28B /* SinglePhoneInputNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E4216230564570049C28B /* SinglePhoneInputNode.swift */; }; D03E421A230564650049C28B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E4219230564650049C28B /* Foundation.framework */; }; @@ -17,6 +18,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 094DC9C3231B75B400A6FF8F /* TelegramStringFormatting.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramStringFormatting.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E4207230563DB0049C28B /* SinglePhoneInputNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SinglePhoneInputNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E420A230563DB0049C28B /* SinglePhoneInputNode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SinglePhoneInputNode.h; sourceTree = ""; }; D03E420B230563DB0049C28B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -33,6 +35,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 094DC9C4231B75B400A6FF8F /* TelegramStringFormatting.framework in Frameworks */, D03E4222230564760049C28B /* TelegramCore.framework in Frameworks */, D03E4220230564700049C28B /* Display.framework in Frameworks */, D03E421E2305646D0049C28B /* AsyncDisplayKit.framework in Frameworks */, @@ -74,6 +77,7 @@ D03E4218230564650049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + 094DC9C3231B75B400A6FF8F /* TelegramStringFormatting.framework */, D03E4221230564760049C28B /* TelegramCore.framework */, D03E421F230564700049C28B /* Display.framework */, D03E421D2305646D0049C28B /* AsyncDisplayKit.framework */, diff --git a/submodules/SinglePhoneInputNode/Sources/SinglePhoneInputNode.swift b/submodules/SinglePhoneInputNode/Sources/SinglePhoneInputNode.swift index 5c488cc5c2..3abdb9f357 100644 --- a/submodules/SinglePhoneInputNode/Sources/SinglePhoneInputNode.swift +++ b/submodules/SinglePhoneInputNode/Sources/SinglePhoneInputNode.swift @@ -3,6 +3,7 @@ import UIKit import AsyncDisplayKit import Display import TelegramCore +import TelegramStringFormatting private func removeDuplicatedPlus(_ text: String?) -> String { var result = "" @@ -34,7 +35,7 @@ private func removePlus(_ text: String?) -> String { private func cleanPhoneNumber(_ text: String?) -> String { var cleanNumber = "" - if let text = text { + if let text = text.flatMap({ normalizeArabicNumeralString($0, type: .western) }) { for c in text { if c == "+" { if cleanNumber.isEmpty { @@ -145,7 +146,7 @@ public final class SinglePhoneInputNode: ASDisplayNode, UITextFieldDelegate { guard let numberField = self.numberField else { return } - let inputText = removeDuplicatedPlus(cleanPhoneNumber(cleanPhoneNumber(numberField.textField.text))) + let inputText = removeDuplicatedPlus(cleanPhoneNumber(numberField.textField.text)) self.updateNumber(inputText) self.numberUpdated?(inputText) } diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift index df189d76b7..40df63d7b4 100644 --- a/submodules/TelegramApi/Sources/Api0.swift +++ b/submodules/TelegramApi/Sources/Api0.swift @@ -721,7 +721,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = { dict[-104284986] = { return Api.WebDocument.parse_webDocumentNoProxy($0) } dict[475467473] = { return Api.WebDocument.parse_webDocument($0) } dict[1211967244] = { return Api.Theme.parse_themeDocumentNotModified($0) } - dict[975846885] = { return Api.Theme.parse_theme($0) } + dict[-136770336] = { return Api.Theme.parse_theme($0) } dict[-1290580579] = { return Api.contacts.Found.parse_found($0) } dict[-368018716] = { return Api.ChannelAdminLogEventsFilter.parse_channelAdminLogEventsFilter($0) } dict[1889961234] = { return Api.PeerNotifySettings.parse_peerNotifySettingsEmpty($0) } diff --git a/submodules/TelegramApi/Sources/Api1.swift b/submodules/TelegramApi/Sources/Api1.swift index 691815d5fa..c564b24423 100644 --- a/submodules/TelegramApi/Sources/Api1.swift +++ b/submodules/TelegramApi/Sources/Api1.swift @@ -18231,7 +18231,7 @@ public extension Api { } public enum Theme: TypeConstructorDescription { case themeDocumentNotModified - case theme(flags: Int32, id: Int64, accessHash: Int64, slug: String, title: String, document: Api.Document?) + case theme(flags: Int32, id: Int64, accessHash: Int64, slug: String, title: String, document: Api.Document?, installsCount: Int32) public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) { switch self { @@ -18241,9 +18241,9 @@ public extension Api { } break - case .theme(let flags, let id, let accessHash, let slug, let title, let document): + case .theme(let flags, let id, let accessHash, let slug, let title, let document, let installsCount): if boxed { - buffer.appendInt32(975846885) + buffer.appendInt32(-136770336) } serializeInt32(flags, buffer: buffer, boxed: false) serializeInt64(id, buffer: buffer, boxed: false) @@ -18251,6 +18251,7 @@ public extension Api { serializeString(slug, buffer: buffer, boxed: false) serializeString(title, buffer: buffer, boxed: false) if Int(flags) & Int(1 << 2) != 0 {document!.serialize(buffer, true)} + serializeInt32(installsCount, buffer: buffer, boxed: false) break } } @@ -18259,8 +18260,8 @@ public extension Api { switch self { case .themeDocumentNotModified: return ("themeDocumentNotModified", []) - case .theme(let flags, let id, let accessHash, let slug, let title, let document): - return ("theme", [("flags", flags), ("id", id), ("accessHash", accessHash), ("slug", slug), ("title", title), ("document", document)]) + case .theme(let flags, let id, let accessHash, let slug, let title, let document, let installsCount): + return ("theme", [("flags", flags), ("id", id), ("accessHash", accessHash), ("slug", slug), ("title", title), ("document", document), ("installsCount", installsCount)]) } } @@ -18282,14 +18283,17 @@ public extension Api { if Int(_1!) & Int(1 << 2) != 0 {if let signature = reader.readInt32() { _6 = Api.parse(reader, signature: signature) as? Api.Document } } + var _7: Int32? + _7 = reader.readInt32() let _c1 = _1 != nil let _c2 = _2 != nil let _c3 = _3 != nil let _c4 = _4 != nil let _c5 = _5 != nil let _c6 = (Int(_1!) & Int(1 << 2) == 0) || _6 != nil - if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 { - return Api.Theme.theme(flags: _1!, id: _2!, accessHash: _3!, slug: _4!, title: _5!, document: _6) + let _c7 = _7 != nil + if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 { + return Api.Theme.theme(flags: _1!, id: _2!, accessHash: _3!, slug: _4!, title: _5!, document: _6, installsCount: _7!) } else { return nil diff --git a/submodules/TelegramApi/Sources/Api3.swift b/submodules/TelegramApi/Sources/Api3.swift index 293a4adf9f..f549eb900b 100644 --- a/submodules/TelegramApi/Sources/Api3.swift +++ b/submodules/TelegramApi/Sources/Api3.swift @@ -5717,12 +5717,13 @@ public extension Api { }) } - public static func installTheme(format: String, theme: Api.InputTheme) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { + public static func installTheme(flags: Int32, format: String?, theme: Api.InputTheme?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse) { let buffer = Buffer() - buffer.appendInt32(-520600676) - serializeString(format, buffer: buffer, boxed: false) - theme.serialize(buffer, true) - return (FunctionDescription(name: "account.installTheme", parameters: [("format", format), ("theme", theme)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in + buffer.appendInt32(2061776695) + serializeInt32(flags, buffer: buffer, boxed: false) + if Int(flags) & Int(1 << 1) != 0 {serializeString(format!, buffer: buffer, boxed: false)} + if Int(flags) & Int(1 << 1) != 0 {theme!.serialize(buffer, true)} + return (FunctionDescription(name: "account.installTheme", parameters: [("flags", flags), ("format", format), ("theme", theme)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in let reader = BufferReader(buffer) var result: Api.Bool? if let signature = reader.readInt32() { diff --git a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift index cd66aa00b9..eb7ef9ec7e 100644 --- a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift +++ b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift @@ -455,7 +455,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { if let (item, previousItem, nextItem, order, type, _) = self.playlistStateAndType, !mediaAccessoryPanelHidden { let panelHeight = MediaNavigationAccessoryHeaderNode.minimizedHeight - let panelFrame = CGRect(origin: CGPoint(x: 0.0, y: navigationHeight.isZero ? -panelHeight : (navigationHeight + additionalHeight + UIScreenPixel)), size: CGSize(width: layout.size.width, height: panelHeight)) + let panelFrame = CGRect(origin: CGPoint(x: 0.0, y: navigationHeight.isZero ? -panelHeight : (navigationHeight + additionalHeight)), size: CGSize(width: layout.size.width, height: panelHeight)) if let (mediaAccessoryPanel, mediaType) = self.mediaAccessoryPanel, mediaType == type { transition.updateFrame(layer: mediaAccessoryPanel.layer, frame: panelFrame) mediaAccessoryPanel.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: transition) @@ -615,7 +615,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder { if let dismissingPanel = self.dismissingPanel { self.displayNode.insertSubnode(mediaAccessoryPanel, aboveSubnode: dismissingPanel) } else if let navigationBar = self.navigationBar { - self.displayNode.insertSubnode(mediaAccessoryPanel, aboveSubnode: navigationBar) + self.displayNode.insertSubnode(mediaAccessoryPanel, belowSubnode: navigationBar) } else { self.displayNode.addSubnode(mediaAccessoryPanel) } diff --git a/submodules/TelegramCore/TelegramCore/AddressNames.swift b/submodules/TelegramCore/TelegramCore/AddressNames.swift index 62c808f82d..94fbdbcd16 100644 --- a/submodules/TelegramCore/TelegramCore/AddressNames.swift +++ b/submodules/TelegramCore/TelegramCore/AddressNames.swift @@ -32,6 +32,7 @@ public enum AddressNameAvailability: Equatable { public enum AddressNameDomain { case account case peer(PeerId) + case theme(TelegramTheme) } public func checkAddressNameFormat(_ value: String, canEmpty: Bool = false) -> AddressNameFormatError? { @@ -106,6 +107,20 @@ public func addressNameAvailability(account: Account, domain: AddressNameDomain, } else { return .single(.invalid) } + case .theme: + return account.network.request(Api.functions.account.createTheme(slug: name, title: "", document: .inputDocumentEmpty)) + |> map { _ -> AddressNameAvailability in + return .available + } + |> `catch` { error -> Signal in + if error.errorDescription == "THEME_SLUG_OCCUPIED" { + return .single(.taken) + } else if error.errorDescription == "THEME_SLUG_INVALID" { + return .single(.invalid) + } else { + return .single(.available) + } + } } } |> switchToLatest } @@ -154,6 +169,15 @@ public func updateAddressName(account: Account, domain: AddressNameDomain, name: } else { return .fail(.generic) } + case let .theme(theme): + let flags: Int32 = 1 << 0 + return account.network.request(Api.functions.account.updateTheme(flags: flags, format: telegramThemeFormat, theme: .inputTheme(id: theme.id, accessHash: theme.accessHash), slug: nil, title: nil, document: nil)) + |> mapError { _ -> UpdateAddressNameError in + return .generic + } + |> map { _ in + return Void() + } } } |> mapError { _ -> UpdateAddressNameError in return .generic } |> switchToLatest } diff --git a/submodules/TelegramCore/TelegramCore/InstantPage.swift b/submodules/TelegramCore/TelegramCore/InstantPage.swift index 360a7962d3..8700cc027c 100644 --- a/submodules/TelegramCore/TelegramCore/InstantPage.swift +++ b/submodules/TelegramCore/TelegramCore/InstantPage.swift @@ -917,7 +917,7 @@ extension InstantPageCaption { } public extension InstantPageListItem { - public var num: String? { + var num: String? { switch self { case let .text(_, num): return num diff --git a/submodules/TelegramCore/TelegramCore/MD5.swift b/submodules/TelegramCore/TelegramCore/MD5.swift index acc90c12ae..a70571eae5 100644 --- a/submodules/TelegramCore/TelegramCore/MD5.swift +++ b/submodules/TelegramCore/TelegramCore/MD5.swift @@ -6,7 +6,7 @@ import Foundation #endif public extension MemoryBuffer { - public func md5Digest() -> Data { + func md5Digest() -> Data { return CryptoMD5(self.memory, Int32(self.length)) } } diff --git a/submodules/TelegramCore/TelegramCore/MemoryBufferExtensions.swift b/submodules/TelegramCore/TelegramCore/MemoryBufferExtensions.swift index 4ca56f7bd2..10d3009e3b 100644 --- a/submodules/TelegramCore/TelegramCore/MemoryBufferExtensions.swift +++ b/submodules/TelegramCore/TelegramCore/MemoryBufferExtensions.swift @@ -9,7 +9,7 @@ import Foundation public extension MemoryBuffer { - public convenience init(_ buffer: Buffer) { + convenience init(_ buffer: Buffer) { let memory = malloc(Int(buffer.size))! memcpy(memory, buffer.data, Int(buffer.size)) self.init(memory: memory, capacity: Int(buffer.size), length: Int(buffer.size), freeWhenDone: true) diff --git a/submodules/TelegramCore/TelegramCore/RichText.swift b/submodules/TelegramCore/TelegramCore/RichText.swift index a56ced19a9..1ceaa7808b 100644 --- a/submodules/TelegramCore/TelegramCore/RichText.swift +++ b/submodules/TelegramCore/TelegramCore/RichText.swift @@ -259,7 +259,7 @@ public indirect enum RichText: PostboxCoding, Equatable { } public extension RichText { - public var plainText: String { + var plainText: String { switch self { case .empty: return "" diff --git a/submodules/TelegramCore/TelegramCore/TelegramChannel.swift b/submodules/TelegramCore/TelegramCore/TelegramChannel.swift index 825de62b7c..398819c234 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramChannel.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramChannel.swift @@ -316,7 +316,7 @@ public enum TelegramChannelPermission { } public extension TelegramChannel { - public func hasPermission(_ permission: TelegramChannelPermission) -> Bool { + func hasPermission(_ permission: TelegramChannelPermission) -> Bool { if self.flags.contains(.isCreator) { return true } diff --git a/submodules/TelegramCore/TelegramCore/TelegramGroup.swift b/submodules/TelegramCore/TelegramCore/TelegramGroup.swift index 49d932e60e..74bde61610 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramGroup.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramGroup.swift @@ -210,7 +210,7 @@ public final class TelegramGroup: Peer { } public extension TelegramGroup { - public func hasBannedPermission(_ rights: TelegramChatBannedRightsFlags) -> Bool { + func hasBannedPermission(_ rights: TelegramChatBannedRightsFlags) -> Bool { switch self.role { case .creator, .admin: return false diff --git a/submodules/TelegramCore/TelegramCore/Theme.swift b/submodules/TelegramCore/TelegramCore/Theme.swift index d785dafb65..2f184f058a 100644 --- a/submodules/TelegramCore/TelegramCore/Theme.swift +++ b/submodules/TelegramCore/TelegramCore/Theme.swift @@ -17,8 +17,9 @@ public final class TelegramTheme: OrderedItemListEntryContents, Equatable { public let file: TelegramMediaFile? public let isCreator: Bool public let isDefault: Bool + public let installCount: Int32 - public init(id: Int64, accessHash: Int64, slug: String, title: String, file: TelegramMediaFile?, isCreator: Bool, isDefault: Bool) { + public init(id: Int64, accessHash: Int64, slug: String, title: String, file: TelegramMediaFile?, isCreator: Bool, isDefault: Bool, installCount: Int32) { self.id = id self.accessHash = accessHash self.slug = slug @@ -26,6 +27,7 @@ public final class TelegramTheme: OrderedItemListEntryContents, Equatable { self.file = file self.isCreator = isCreator self.isDefault = isDefault + self.installCount = installCount } public init(decoder: PostboxDecoder) { @@ -36,6 +38,7 @@ public final class TelegramTheme: OrderedItemListEntryContents, Equatable { self.file = decoder.decodeObjectForKey("file", decoder: { TelegramMediaFile(decoder: $0) }) as? TelegramMediaFile self.isCreator = decoder.decodeInt32ForKey("isCreator", orElse: 0) != 0 self.isDefault = decoder.decodeInt32ForKey("isDefault", orElse: 0) != 0 + self.installCount = decoder.decodeInt32ForKey("installCount", orElse: 0) } public func encode(_ encoder: PostboxEncoder) { @@ -50,6 +53,7 @@ public final class TelegramTheme: OrderedItemListEntryContents, Equatable { } encoder.encodeInt32(self.isCreator ? 1 : 0, forKey: "isCreator") encoder.encodeInt32(self.isDefault ? 1 : 0, forKey: "isDefault") + encoder.encodeInt32(self.installCount, forKey: "installCount") } public static func ==(lhs: TelegramTheme, rhs: TelegramTheme) -> Bool { @@ -74,6 +78,9 @@ public final class TelegramTheme: OrderedItemListEntryContents, Equatable { if lhs.isDefault != rhs.isDefault { return false } + if lhs.installCount != rhs.installCount { + return false + } return true } } @@ -81,8 +88,8 @@ public final class TelegramTheme: OrderedItemListEntryContents, Equatable { extension TelegramTheme { convenience init?(apiTheme: Api.Theme) { switch apiTheme { - case let .theme(flags, id, accessHash, slug, title, document): - self.init(id: id, accessHash: accessHash, slug: slug, title: title, file: document.flatMap(telegramMediaFileFromApiDocument), isCreator: (flags & 1 << 0) != 0, isDefault: (flags & 1 << 1) != 0) + case let .theme(flags, id, accessHash, slug, title, document, installCount): + self.init(id: id, accessHash: accessHash, slug: slug, title: title, file: document.flatMap(telegramMediaFileFromApiDocument), isCreator: (flags & 1 << 0) != 0, isDefault: (flags & 1 << 1) != 0, installCount: installCount) default: return nil } diff --git a/submodules/TelegramCore/TelegramCore/Themes.swift b/submodules/TelegramCore/TelegramCore/Themes.swift index e1e9c2d017..8aead71fd5 100644 --- a/submodules/TelegramCore/TelegramCore/Themes.swift +++ b/submodules/TelegramCore/TelegramCore/Themes.swift @@ -26,16 +26,16 @@ final class CachedThemesConfiguration: PostboxCoding { } #if os(macOS) -private let themeFormat = "macos" -private let themeFileExtension = "palette" +let telegramThemeFormat = "macos" +let telegramThemeFileExtension = "palette" #else -private let themeFormat = "ios" -private let themeFileExtension = "tgios-theme" +let telegramThemeFormat = "ios" +let telegramThemeFileExtension = "tgios-theme" #endif public func telegramThemes(postbox: Postbox, network: Network, accountManager: AccountManager, forceUpdate: Bool = false) -> Signal<[TelegramTheme], NoError> { let fetch: ([TelegramTheme]?, Int32?) -> Signal<[TelegramTheme], NoError> = { current, hash in - network.request(Api.functions.account.getThemes(format: themeFormat, hash: hash ?? 0)) + network.request(Api.functions.account.getThemes(format: telegramThemeFormat, hash: hash ?? 0)) |> retryRequest |> mapToSignal { result -> Signal<([TelegramTheme], Int32), NoError> in switch result { @@ -109,7 +109,7 @@ public enum GetThemeError { } public func getTheme(account: Account, slug: String) -> Signal { - return account.network.request(Api.functions.account.getTheme(format: themeFormat, theme: .inputThemeSlug(slug: slug), documentId: 0)) + return account.network.request(Api.functions.account.getTheme(format: telegramThemeFormat, theme: .inputThemeSlug(slug: slug), documentId: 0)) |> mapError { error -> GetThemeError in if error.errorDescription == "THEME_FORMAT_INVALID" { return .unsupported @@ -137,7 +137,7 @@ private func checkThemeUpdated(network: Network, theme: TelegramTheme) -> Signal guard let file = theme.file, let fileId = file.id?.id else { return .fail(.generic) } - return network.request(Api.functions.account.getTheme(format: themeFormat, theme: .inputTheme(id: theme.id, accessHash: theme.accessHash), documentId: fileId)) + return network.request(Api.functions.account.getTheme(format: telegramThemeFormat, theme: .inputTheme(id: theme.id, accessHash: theme.accessHash), documentId: fileId)) |> mapError { _ -> GetThemeError in return .generic } |> map { theme -> ThemeUpdatedResult in if let theme = TelegramTheme(apiTheme: theme) { @@ -178,8 +178,21 @@ private func saveUnsaveTheme(account: Account, accountManager: AccountManager, t } |> switchToLatest } -private func installTheme(account: Account, theme: TelegramTheme) -> Signal { - return account.network.request(Api.functions.account.installTheme(format: themeFormat, theme: Api.InputTheme.inputTheme(id: theme.id, accessHash: theme.accessHash))) +private func installTheme(account: Account, theme: TelegramTheme?, autoNight: Bool) -> Signal { + var flags: Int32 = 0 + if autoNight { + flags |= 1 << 0 + } + + let inputTheme: Api.InputTheme? + if let theme = theme { + inputTheme = .inputTheme(id: theme.id, accessHash: theme.accessHash) + flags |= 1 << 1 + } else { + inputTheme = nil + } + + return account.network.request(Api.functions.account.installTheme(flags: flags, format: telegramThemeFormat, theme: inputTheme)) |> `catch` { _ -> Signal in return .complete() } @@ -227,8 +240,8 @@ private func uploadedThemeThumbnail(postbox: Postbox, network: Network, data: Da } private func uploadTheme(account: Account, resource: MediaResource, thumbnailData: Data? = nil) -> Signal { - let fileName = "theme.\(themeFileExtension)" - let mimeType = "application/x-tgtheme-\(themeFormat)" + let fileName = "theme.\(telegramThemeFileExtension)" + let mimeType = "application/x-tgtheme-\(telegramThemeFormat)" let uploadedThumbnail: Signal if let thumbnailData = thumbnailData { @@ -278,6 +291,7 @@ private func uploadTheme(account: Account, resource: MediaResource, thumbnailDat public enum CreateThemeError { case generic case slugInvalid + case slugOccupied } public enum CreateThemeResult { @@ -296,6 +310,8 @@ public func createTheme(account: Account, title: String, resource: MediaResource |> mapError { error in if error.errorDescription == "THEME_SLUG_INVALID" { return .slugInvalid + } else if error.errorDescription == "THEME_SLUG_OCCUPIED" { + return .slugOccupied } return .generic } @@ -371,10 +387,12 @@ public func updateTheme(account: Account, accountManager: AccountManager, theme: inputDocument = nil } - return account.network.request(Api.functions.account.updateTheme(flags: flags, format: themeFormat, theme: .inputTheme(id: theme.id, accessHash: theme.accessHash), slug: slug, title: title, document: inputDocument)) + return account.network.request(Api.functions.account.updateTheme(flags: flags, format: telegramThemeFormat, theme: .inputTheme(id: theme.id, accessHash: theme.accessHash), slug: slug, title: title, document: inputDocument)) |> mapError { error in if error.errorDescription == "THEME_SLUG_INVALID" { return .slugInvalid + } else if error.errorDescription == "THEME_SLUG_OCCUPIED" { + return .slugOccupied } return .generic } @@ -456,14 +474,14 @@ public func deleteThemeInteractively(account: Account, accountManager: AccountMa return saveUnsaveTheme(account: account, accountManager: accountManager, theme: theme, unsave: true) } -public func applyTheme(accountManager: AccountManager, account: Account, theme: TelegramTheme?) -> Signal { +public func applyTheme(accountManager: AccountManager, account: Account, theme: TelegramTheme?, autoNight: Bool = false) -> Signal { return accountManager.transaction { transaction -> Signal in transaction.updateSharedData(SharedDataKeys.themeSettings, { _ in return ThemeSettings(currentTheme: theme) }) if let theme = theme { - return installTheme(account: account, theme: theme) + return installTheme(account: account, theme: theme, autoNight: autoNight) } else { return .complete() } diff --git a/submodules/TelegramCore/TelegramCore/Wallpaper.swift b/submodules/TelegramCore/TelegramCore/Wallpaper.swift index 0d5563cee6..b88fe3c6fa 100644 --- a/submodules/TelegramCore/TelegramCore/Wallpaper.swift +++ b/submodules/TelegramCore/TelegramCore/Wallpaper.swift @@ -157,7 +157,7 @@ public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable { case let .image(representations, _): return .image(representations, settings) case let .file(id, accessHash, isCreator, isDefault, isPattern, isDark, slug, file, _): - return .file(id: id, accessHash: accessHash, isCreator: isCreator, isDefault: isDefault, isPattern: isPattern, isDark: isDark, slug: slug, file: file, settings: settings) + return .file(id: id, accessHash: accessHash, isCreator: isCreator, isDefault: isDefault, isPattern: settings.color != nil ? true : isPattern, isDark: isDark, slug: slug, file: file, settings: settings) } } } diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift index 3602ce16e4..4aae407cd9 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift @@ -100,6 +100,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta ) let intro = PresentationThemeIntro( + statusBarStyle: .white, startButtonColor: accentColor, dotColor: UIColor(rgb: 0x5e5e5e) ) @@ -354,7 +355,6 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta return PresentationTheme( name: .builtin(.night), - author: "Telegram", referenceTheme: .night, overallDarkAppearance: true, baseColor: baseColor, diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift index 1b889822ac..42eb388be7 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift @@ -76,6 +76,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta ) let intro = PresentationThemeIntro( + statusBarStyle: .white, startButtonColor: accentColor, dotColor: mainSecondaryColor ) @@ -123,13 +124,13 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta freeMonoIconColor: mainFreeTextColor, itemSwitchColors: switchColors, itemDisclosureActions: PresentationThemeItemDisclosureActions( - neutral1: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0x007cd6), foregroundColor: .white), + neutral1: PresentationThemeFillForeground(fillColor: accentColor, foregroundColor: .white), neutral2: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0xcd7800), foregroundColor: .white), destructive: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0xc70c0c), foregroundColor: .white), constructive: PresentationThemeFillForeground(fillColor: constructiveColor, foregroundColor: .white), - accent: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0x007cd6), foregroundColor: .white), + accent: PresentationThemeFillForeground(fillColor: accentColor, foregroundColor: .white), warning: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0xcd7800), foregroundColor: .white), - inactive: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0x26384c), foregroundColor: .white) + inactive: PresentationThemeFillForeground(fillColor: accentColor.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.3), foregroundColor: .white) ), itemCheckColors: PresentationThemeFillStrokeForeground( fillColor: accentColor, @@ -332,7 +333,6 @@ private func makeDarkPresentationTheme(accentColor: UIColor, baseColor: Presenta return PresentationTheme( name: .builtin(.nightAccent), - author: "Telegram", referenceTheme: .nightAccent, overallDarkAppearance: true, baseColor: baseColor, diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index 74643b790f..de62fd3dcf 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -83,6 +83,7 @@ private func makeDefaultDayPresentationTheme(accentColor: UIColor, serviceBackgr ) let intro = PresentationThemeIntro( + statusBarStyle: .black, startButtonColor: UIColor(rgb: 0x2ca5e0), dotColor: UIColor(rgb: 0xd9d9d9) ) @@ -294,8 +295,8 @@ private func makeDefaultDayPresentationTheme(accentColor: UIColor, serviceBackgr ) let historyNavigation = PresentationThemeChatHistoryNavigation( - fillColor: .white, - strokeColor: UIColor(rgb: 0x000000, alpha: 0.15), + fillColor: UIColor(rgb: 0xf7f7f7), + strokeColor: UIColor(rgb: 0xb1b1b1), foregroundColor: UIColor(rgb: 0x88888d), badgeBackgroundColor: accentColor, badgeStrokeColor: accentColor, @@ -363,7 +364,6 @@ private func makeDefaultDayPresentationTheme(accentColor: UIColor, serviceBackgr return PresentationTheme( name: .builtin(day ? .day : .dayClassic), - author: "Telegram", referenceTheme: day ? .day : .dayClassic, overallDarkAppearance: false, baseColor: baseColor, diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift index b4cffa1d1b..cd28f86b61 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationData.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift @@ -40,7 +40,7 @@ public struct PresentationAppIcon: Equatable { public let imageName: String public let isDefault: Bool - public init(name: String, imageName: String, isDefault: Bool) { + public init(name: String, imageName: String, isDefault: Bool = false) { self.name = name self.imageName = imageName self.isDefault = isDefault @@ -255,7 +255,7 @@ public func currentPresentationDataAndSettings(accountManager: AccountManager) - let parameters = AutomaticThemeSwitchParameters(settings: themeSettings.automaticThemeSwitchSetting) if automaticThemeShouldSwitchNow(parameters, currentTheme: themeSettings.theme) { - effectiveTheme = .builtin(themeSettings.automaticThemeSwitchSetting.theme) + effectiveTheme = themeSettings.automaticThemeSwitchSetting.theme } else { effectiveTheme = themeSettings.theme } @@ -302,7 +302,7 @@ private enum PreparedAutomaticThemeSwitchTrigger { private struct AutomaticThemeSwitchParameters { let trigger: PreparedAutomaticThemeSwitchTrigger - let theme: PresentationBuiltinThemeReference + let theme: PresentationThemeReference init(settings: AutomaticThemeSwitchSetting) { let trigger: PreparedAutomaticThemeSwitchTrigger @@ -331,17 +331,6 @@ private struct AutomaticThemeSwitchParameters { } private func automaticThemeShouldSwitchNow(_ parameters: AutomaticThemeSwitchParameters, currentTheme: PresentationThemeReference) -> Bool { - switch currentTheme { - case let .builtin(builtin): - switch builtin { - case .nightAccent, .night: - return false - default: - break - } - default: - return false - } switch parameters.trigger { case .none: return false @@ -515,7 +504,7 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI var effectiveChatWallpaper: TelegramWallpaper = currentWallpaper if shouldSwitch { - let automaticTheme: PresentationThemeReference = .builtin(themeSettings.automaticThemeSwitchSetting.theme) + let automaticTheme = themeSettings.automaticThemeSwitchSetting.theme if let themeSpecificWallpaper = themeSettings.themeSpecificChatWallpapers[automaticTheme.index] { effectiveChatWallpaper = themeSpecificWallpaper } diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index 79d0a5ed77..ae90761ef4 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -215,4210 +215,4235 @@ public final class PresentationStrings { public var FastTwoStepSetup_PasswordHelp: String { return self._s[24]! } public var SettingsSearch_Synonyms_Notifications_Title: String { return self._s[25]! } public var StickerPacksSettings_AnimatedStickers: String { return self._s[26]! } - public var AutoDownloadSettings_Files: String { return self._s[27]! } - public var TextFormat_AddLinkPlaceholder: String { return self._s[28]! } - public var LastSeen_Lately: String { return self._s[33]! } + public func Items_NOfM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[27]!, self._r[27]!, [_1, _2]) + } + public var AutoDownloadSettings_Files: String { return self._s[28]! } + public var TextFormat_AddLinkPlaceholder: String { return self._s[29]! } + public var LastSeen_Lately: String { return self._s[34]! } public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[34]!, self._r[34]!, [_1, _2]) + return formatWithArgumentRanges(self._s[35]!, self._r[35]!, [_1, _2]) } - public var Camera_Discard: String { return self._s[35]! } - public var Channel_EditAdmin_PermissinAddAdminOff: String { return self._s[36]! } - public var Login_InvalidPhoneError: String { return self._s[38]! } - public var SettingsSearch_Synonyms_Privacy_AuthSessions: String { return self._s[39]! } - public var GroupInfo_LabelOwner: String { return self._s[40]! } - public var Conversation_Moderate_Delete: String { return self._s[41]! } - public var Conversation_DeleteMessagesForEveryone: String { return self._s[42]! } - public var WatchRemote_AlertOpen: String { return self._s[43]! } + public var Camera_Discard: String { return self._s[36]! } + public var Channel_EditAdmin_PermissinAddAdminOff: String { return self._s[37]! } + public var Login_InvalidPhoneError: String { return self._s[39]! } + public var SettingsSearch_Synonyms_Privacy_AuthSessions: String { return self._s[40]! } + public var GroupInfo_LabelOwner: String { return self._s[41]! } + public var Conversation_Moderate_Delete: String { return self._s[42]! } + public var Conversation_DeleteMessagesForEveryone: String { return self._s[43]! } + public var WatchRemote_AlertOpen: String { return self._s[44]! } public func MediaPicker_Nof(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[44]!, self._r[44]!, [_0]) + return formatWithArgumentRanges(self._s[45]!, self._r[45]!, [_0]) } - public var AutoDownloadSettings_MediaTypes: String { return self._s[46]! } - public var Watch_GroupInfo_Title: String { return self._s[47]! } - public var Passport_Identity_AddPersonalDetails: String { return self._s[48]! } - public var Channel_Info_Members: String { return self._s[49]! } - public var LoginPassword_InvalidPasswordError: String { return self._s[51]! } - public var Conversation_LiveLocation: String { return self._s[52]! } - public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[53]! } - public var NetworkUsageSettings_BytesReceived: String { return self._s[55]! } - public var Stickers_Search: String { return self._s[57]! } - public var NotificationsSound_Synth: String { return self._s[58]! } - public var LogoutOptions_LogOutInfo: String { return self._s[59]! } + public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[46]! } + public var AutoDownloadSettings_MediaTypes: String { return self._s[48]! } + public var Watch_GroupInfo_Title: String { return self._s[49]! } + public var Passport_Identity_AddPersonalDetails: String { return self._s[50]! } + public var Channel_Info_Members: String { return self._s[51]! } + public var LoginPassword_InvalidPasswordError: String { return self._s[53]! } + public var Conversation_LiveLocation: String { return self._s[54]! } + public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[55]! } + public var NetworkUsageSettings_BytesReceived: String { return self._s[57]! } + public var Stickers_Search: String { return self._s[59]! } + public var NotificationsSound_Synth: String { return self._s[60]! } + public var LogoutOptions_LogOutInfo: String { return self._s[61]! } public func VoiceOver_Chat_ForwardedFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[61]!, self._r[61]!, [_0]) + return formatWithArgumentRanges(self._s[63]!, self._r[63]!, [_0]) } - public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[62]! } - public var AutoNightTheme_UseSunsetSunrise: String { return self._s[64]! } - public var FastTwoStepSetup_Title: String { return self._s[65]! } - public var Channel_Info_BlackList: String { return self._s[66]! } - public var Channel_AdminLog_InfoPanelTitle: String { return self._s[67]! } - public var Conversation_OpenFile: String { return self._s[68]! } - public var SecretTimer_ImageDescription: String { return self._s[69]! } - public var StickerSettings_ContextInfo: String { return self._s[70]! } - public var TwoStepAuth_GenericHelp: String { return self._s[72]! } - public var AutoDownloadSettings_Unlimited: String { return self._s[73]! } - public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[74]! } - public var AutoDownloadSettings_DataUsageHigh: String { return self._s[75]! } + public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[64]! } + public var AutoNightTheme_UseSunsetSunrise: String { return self._s[66]! } + public var FastTwoStepSetup_Title: String { return self._s[67]! } + public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[68]! } + public var Channel_Info_BlackList: String { return self._s[69]! } + public var Channel_AdminLog_InfoPanelTitle: String { return self._s[70]! } + public var Conversation_OpenFile: String { return self._s[71]! } + public var SecretTimer_ImageDescription: String { return self._s[72]! } + public var StickerSettings_ContextInfo: String { return self._s[73]! } + public var TwoStepAuth_GenericHelp: String { return self._s[75]! } + public var AutoDownloadSettings_Unlimited: String { return self._s[76]! } + public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[77]! } + public var AutoDownloadSettings_DataUsageHigh: String { return self._s[78]! } public func PUSH_CHAT_MESSAGE_VIDEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[76]!, self._r[76]!, [_1, _2]) + return formatWithArgumentRanges(self._s[79]!, self._r[79]!, [_1, _2]) } - public var Notifications_AddExceptionTitle: String { return self._s[77]! } - public var Watch_MessageView_Reply: String { return self._s[78]! } - public var Tour_Text6: String { return self._s[79]! } - public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[80]! } + public var Notifications_AddExceptionTitle: String { return self._s[80]! } + public var Watch_MessageView_Reply: String { return self._s[81]! } + public var Tour_Text6: String { return self._s[82]! } + public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[83]! } public func Notification_PinnedAnimationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[81]!, self._r[81]!, [_0]) + return formatWithArgumentRanges(self._s[84]!, self._r[84]!, [_0]) } public func ShareFileTip_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[82]!, self._r[82]!, [_0]) + return formatWithArgumentRanges(self._s[85]!, self._r[85]!, [_0]) } - public var AccessDenied_LocationDenied: String { return self._s[83]! } - public var CallSettings_RecentCalls: String { return self._s[84]! } - public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[85]! } - public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[86]! } - public var Passport_Authorize: String { return self._s[87]! } - public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[88]! } - public var AutoDownloadSettings_Videos: String { return self._s[89]! } - public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[90]! } - public var Tour_StartButton: String { return self._s[91]! } - public var Watch_AppName: String { return self._s[93]! } - public var StickerPack_ErrorNotFound: String { return self._s[94]! } - public var Channel_Info_Subscribers: String { return self._s[95]! } + public var AccessDenied_LocationDenied: String { return self._s[86]! } + public var CallSettings_RecentCalls: String { return self._s[87]! } + public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[88]! } + public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[89]! } + public var Passport_Authorize: String { return self._s[90]! } + public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[91]! } + public var AutoDownloadSettings_Videos: String { return self._s[92]! } + public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[93]! } + public var Tour_StartButton: String { return self._s[94]! } + public var Watch_AppName: String { return self._s[96]! } + public var StickerPack_ErrorNotFound: String { return self._s[97]! } + public var Channel_Info_Subscribers: String { return self._s[98]! } public func Channel_AdminLog_MessageGroupPreHistoryVisible(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[96]!, self._r[96]!, [_0]) + return formatWithArgumentRanges(self._s[99]!, self._r[99]!, [_0]) } public func DialogList_PinLimitError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[97]!, self._r[97]!, [_0]) + return formatWithArgumentRanges(self._s[100]!, self._r[100]!, [_0]) } - public var Appearance_RemoveTheme: String { return self._s[98]! } - public var Conversation_StopLiveLocation: String { return self._s[100]! } - public var Channel_AdminLogFilter_EventsAll: String { return self._s[101]! } - public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[103]! } - public var Username_LinkCopied: String { return self._s[105]! } - public var GroupRemoved_Title: String { return self._s[106]! } - public var SecretVideo_Title: String { return self._s[107]! } + public var Appearance_RemoveTheme: String { return self._s[101]! } + public var Conversation_StopLiveLocation: String { return self._s[103]! } + public var Channel_AdminLogFilter_EventsAll: String { return self._s[104]! } + public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[106]! } + public var Username_LinkCopied: String { return self._s[108]! } + public var GroupRemoved_Title: String { return self._s[109]! } + public var SecretVideo_Title: String { return self._s[110]! } public func PUSH_PINNED_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[108]!, self._r[108]!, [_1]) + return formatWithArgumentRanges(self._s[111]!, self._r[111]!, [_1]) } - public var AccessDenied_PhotosAndVideos: String { return self._s[109]! } - public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[110]! } + public var AccessDenied_PhotosAndVideos: String { return self._s[112]! } + public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[113]! } public func PUSH_CHANNEL_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[112]!, self._r[112]!, [_1]) + return formatWithArgumentRanges(self._s[115]!, self._r[115]!, [_1]) } - public var Map_OpenInGoogleMaps: String { return self._s[113]! } + public var Map_OpenInGoogleMaps: String { return self._s[116]! } public func Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[114]!, self._r[114]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[117]!, self._r[117]!, [_1, _2, _3]) } public func Channel_AdminLog_MessageKickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[115]!, self._r[115]!, [_1, _2]) + return formatWithArgumentRanges(self._s[118]!, self._r[118]!, [_1, _2]) } - public var Call_StatusRinging: String { return self._s[116]! } - public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[117]! } - public var Group_Username_InvalidStartsWithNumber: String { return self._s[118]! } - public var UserInfo_NotificationsEnabled: String { return self._s[119]! } - public var Map_Search: String { return self._s[120]! } - public var Login_TermsOfServiceHeader: String { return self._s[122]! } + public var Call_StatusRinging: String { return self._s[119]! } + public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[120]! } + public var Group_Username_InvalidStartsWithNumber: String { return self._s[121]! } + public var UserInfo_NotificationsEnabled: String { return self._s[122]! } + public var Map_Search: String { return self._s[123]! } + public var Login_TermsOfServiceHeader: String { return self._s[125]! } public func Notification_PinnedVideoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[123]!, self._r[123]!, [_0]) + return formatWithArgumentRanges(self._s[126]!, self._r[126]!, [_0]) } public func Channel_AdminLog_MessageToggleSignaturesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[124]!, self._r[124]!, [_0]) + return formatWithArgumentRanges(self._s[127]!, self._r[127]!, [_0]) } - public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[125]! } - public var Weekday_Today: String { return self._s[126]! } + public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[128]! } + public var Weekday_Today: String { return self._s[129]! } public func InstantPage_AuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[128]!, self._r[128]!, [_1, _2]) + return formatWithArgumentRanges(self._s[131]!, self._r[131]!, [_1, _2]) } public func Conversation_MessageDialogRetryAll(_ _1: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[129]!, self._r[129]!, ["\(_1)"]) + return formatWithArgumentRanges(self._s[132]!, self._r[132]!, ["\(_1)"]) } - public var Notification_PassportValuePersonalDetails: String { return self._s[131]! } - public var Channel_AdminLog_MessagePreviousLink: String { return self._s[132]! } - public var ChangePhoneNumberNumber_NewNumber: String { return self._s[133]! } - public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[134]! } - public var TwoStepAuth_ChangePasswordDescription: String { return self._s[135]! } - public var PhotoEditor_BlurToolLinear: String { return self._s[136]! } - public var Contacts_PermissionsAllowInSettings: String { return self._s[137]! } - public var Weekday_ShortMonday: String { return self._s[138]! } - public var Cache_KeepMedia: String { return self._s[139]! } - public var Passport_FieldIdentitySelfieHelp: String { return self._s[140]! } + public var Notification_PassportValuePersonalDetails: String { return self._s[134]! } + public var Channel_AdminLog_MessagePreviousLink: String { return self._s[135]! } + public var ChangePhoneNumberNumber_NewNumber: String { return self._s[136]! } + public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[137]! } + public var TwoStepAuth_ChangePasswordDescription: String { return self._s[138]! } + public var PhotoEditor_BlurToolLinear: String { return self._s[139]! } + public var Contacts_PermissionsAllowInSettings: String { return self._s[140]! } + public var Weekday_ShortMonday: String { return self._s[141]! } + public var Cache_KeepMedia: String { return self._s[142]! } + public var Passport_FieldIdentitySelfieHelp: String { return self._s[143]! } public func PUSH_PINNED_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[141]!, self._r[141]!, [_1, _2]) + return formatWithArgumentRanges(self._s[144]!, self._r[144]!, [_1, _2]) } public func Chat_SlowmodeTooltip(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[142]!, self._r[142]!, [_0]) + return formatWithArgumentRanges(self._s[145]!, self._r[145]!, [_0]) } - public var Conversation_ClousStorageInfo_Description4: String { return self._s[143]! } - public var Passport_Language_ru: String { return self._s[144]! } + public var Conversation_ClousStorageInfo_Description4: String { return self._s[146]! } + public var Passport_Language_ru: String { return self._s[147]! } public func Notification_CreatedChatWithTitle(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[145]!, self._r[145]!, [_0, _1]) + return formatWithArgumentRanges(self._s[148]!, self._r[148]!, [_0, _1]) } - public var WallpaperPreview_PatternIntensity: String { return self._s[146]! } - public var TwoStepAuth_RecoveryUnavailable: String { return self._s[147]! } - public var EnterPasscode_TouchId: String { return self._s[148]! } - public var PhotoEditor_QualityVeryHigh: String { return self._s[151]! } - public var Checkout_NewCard_SaveInfo: String { return self._s[153]! } - public var Gif_NoGifsPlaceholder: String { return self._s[155]! } - public var Conversation_OpenBotLinkTitle: String { return self._s[157]! } - public var ChatSettings_AutoDownloadEnabled: String { return self._s[158]! } - public var NetworkUsageSettings_BytesSent: String { return self._s[159]! } - public var Checkout_PasswordEntry_Pay: String { return self._s[160]! } - public var AuthSessions_TerminateSession: String { return self._s[161]! } - public var Message_File: String { return self._s[162]! } - public var MediaPicker_VideoMuteDescription: String { return self._s[163]! } - public var SocksProxySetup_ProxyStatusConnected: String { return self._s[164]! } - public var TwoStepAuth_RecoveryCode: String { return self._s[165]! } - public var EnterPasscode_EnterCurrentPasscode: String { return self._s[166]! } + public var WallpaperPreview_PatternIntensity: String { return self._s[149]! } + public var TwoStepAuth_RecoveryUnavailable: String { return self._s[150]! } + public var EnterPasscode_TouchId: String { return self._s[151]! } + public var PhotoEditor_QualityVeryHigh: String { return self._s[154]! } + public var Checkout_NewCard_SaveInfo: String { return self._s[156]! } + public var Gif_NoGifsPlaceholder: String { return self._s[158]! } + public var Conversation_OpenBotLinkTitle: String { return self._s[160]! } + public var ChatSettings_AutoDownloadEnabled: String { return self._s[161]! } + public var NetworkUsageSettings_BytesSent: String { return self._s[162]! } + public var Checkout_PasswordEntry_Pay: String { return self._s[163]! } + public var AuthSessions_TerminateSession: String { return self._s[164]! } + public var Message_File: String { return self._s[165]! } + public var MediaPicker_VideoMuteDescription: String { return self._s[166]! } + public var SocksProxySetup_ProxyStatusConnected: String { return self._s[167]! } + public var TwoStepAuth_RecoveryCode: String { return self._s[168]! } + public var EnterPasscode_EnterCurrentPasscode: String { return self._s[169]! } public func TwoStepAuth_EnterPasswordHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[167]!, self._r[167]!, [_0]) + return formatWithArgumentRanges(self._s[170]!, self._r[170]!, [_0]) } - public var Conversation_Moderate_Report: String { return self._s[169]! } - public var TwoStepAuth_EmailInvalid: String { return self._s[170]! } - public var Passport_Language_ms: String { return self._s[171]! } - public var Channel_Edit_AboutItem: String { return self._s[173]! } - public var DialogList_SearchSectionGlobal: String { return self._s[177]! } - public var AttachmentMenu_WebSearch: String { return self._s[178]! } - public var PasscodeSettings_TurnPasscodeOn: String { return self._s[179]! } - public var Channel_BanUser_Title: String { return self._s[180]! } - public var WallpaperPreview_SwipeTopText: String { return self._s[181]! } - public var ArchivedChats_IntroText2: String { return self._s[182]! } - public var Notification_Exceptions_DeleteAll: String { return self._s[183]! } + public var Conversation_Moderate_Report: String { return self._s[172]! } + public var TwoStepAuth_EmailInvalid: String { return self._s[173]! } + public var Passport_Language_ms: String { return self._s[174]! } + public var Channel_Edit_AboutItem: String { return self._s[176]! } + public var DialogList_SearchSectionGlobal: String { return self._s[180]! } + public var AttachmentMenu_WebSearch: String { return self._s[181]! } + public var PasscodeSettings_TurnPasscodeOn: String { return self._s[182]! } + public var Channel_BanUser_Title: String { return self._s[183]! } + public var WallpaperPreview_SwipeTopText: String { return self._s[184]! } + public var ArchivedChats_IntroText2: String { return self._s[185]! } + public var Notification_Exceptions_DeleteAll: String { return self._s[186]! } public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[184]!, self._r[184]!, [_1, _2]) + return formatWithArgumentRanges(self._s[187]!, self._r[187]!, [_1, _2]) } - public var ChatSearch_SearchPlaceholder: String { return self._s[186]! } - public var Passport_FieldAddressTranslationHelp: String { return self._s[187]! } - public var NotificationsSound_Aurora: String { return self._s[188]! } + public var ChatSearch_SearchPlaceholder: String { return self._s[189]! } + public var Passport_FieldAddressTranslationHelp: String { return self._s[190]! } + public var NotificationsSound_Aurora: String { return self._s[191]! } public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[189]!, self._r[189]!, [_0]) + return formatWithArgumentRanges(self._s[192]!, self._r[192]!, [_0]) } - public var AuthSessions_LoggedInWithTelegram: String { return self._s[192]! } + public var AuthSessions_LoggedInWithTelegram: String { return self._s[195]! } public func Privacy_GroupsAndChannels_InviteToGroupError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[193]!, self._r[193]!, [_0, _1]) + return formatWithArgumentRanges(self._s[196]!, self._r[196]!, [_0, _1]) } - public var Passport_PasswordNext: String { return self._s[194]! } - public var Bot_GroupStatusReadsHistory: String { return self._s[195]! } - public var EmptyGroupInfo_Line2: String { return self._s[196]! } - public var VoiceOver_Chat_SeenByRecipients: String { return self._s[197]! } - public var Settings_FAQ_Intro: String { return self._s[199]! } - public var PrivacySettings_PasscodeAndTouchId: String { return self._s[201]! } - public var FeaturedStickerPacks_Title: String { return self._s[202]! } - public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[204]! } - public var Username_Title: String { return self._s[205]! } + public var Passport_PasswordNext: String { return self._s[197]! } + public var Bot_GroupStatusReadsHistory: String { return self._s[198]! } + public var EmptyGroupInfo_Line2: String { return self._s[199]! } + public var VoiceOver_Chat_SeenByRecipients: String { return self._s[200]! } + public var Settings_FAQ_Intro: String { return self._s[202]! } + public var PrivacySettings_PasscodeAndTouchId: String { return self._s[204]! } + public var FeaturedStickerPacks_Title: String { return self._s[205]! } + public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[207]! } + public var Username_Title: String { return self._s[208]! } public func Message_StickerText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[206]!, self._r[206]!, [_0]) + return formatWithArgumentRanges(self._s[209]!, self._r[209]!, [_0]) } - public var PasscodeSettings_AlphanumericCode: String { return self._s[207]! } - public var Localization_LanguageOther: String { return self._s[208]! } - public var Stickers_SuggestStickers: String { return self._s[209]! } + public var PasscodeSettings_AlphanumericCode: String { return self._s[210]! } + public var Localization_LanguageOther: String { return self._s[211]! } + public var Stickers_SuggestStickers: String { return self._s[212]! } public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[210]!, self._r[210]!, [_0]) + return formatWithArgumentRanges(self._s[213]!, self._r[213]!, [_0]) } - public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[211]! } - public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[212]! } - public var Conversation_DefaultRestrictedStickers: String { return self._s[213]! } + public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[214]! } + public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[215]! } + public var Conversation_DefaultRestrictedStickers: String { return self._s[216]! } public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[214]!, self._r[214]!, [_0]) + return formatWithArgumentRanges(self._s[217]!, self._r[217]!, [_0]) } - public var Group_UpgradeConfirmation: String { return self._s[216]! } - public var DialogList_Unpin: String { return self._s[217]! } - public var Passport_Identity_DateOfBirth: String { return self._s[218]! } - public var Month_ShortOctober: String { return self._s[219]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[220]! } - public var Notification_CallCanceledShort: String { return self._s[221]! } - public var Passport_Phone_Help: String { return self._s[222]! } - public var Passport_Language_az: String { return self._s[224]! } - public var CreatePoll_TextPlaceholder: String { return self._s[226]! } - public var VoiceOver_Chat_AnonymousPoll: String { return self._s[227]! } - public var Passport_Identity_DocumentNumber: String { return self._s[228]! } - public var PhotoEditor_CurvesRed: String { return self._s[229]! } - public var PhoneNumberHelp_Alert: String { return self._s[231]! } - public var SocksProxySetup_Port: String { return self._s[232]! } - public var Checkout_PayNone: String { return self._s[233]! } - public var AutoDownloadSettings_WiFi: String { return self._s[234]! } - public var GroupInfo_GroupType: String { return self._s[235]! } - public var StickerSettings_ContextHide: String { return self._s[236]! } - public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[237]! } - public var Group_Setup_HistoryTitle: String { return self._s[239]! } - public var Passport_Identity_FilesUploadNew: String { return self._s[240]! } - public var PasscodeSettings_AutoLock: String { return self._s[241]! } - public var Passport_Title: String { return self._s[242]! } - public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[243]! } - public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[244]! } - public var GroupPermission_NoSendGifs: String { return self._s[245]! } - public var PrivacySettings_PasscodeOn: String { return self._s[246]! } + public var Group_UpgradeConfirmation: String { return self._s[219]! } + public var DialogList_Unpin: String { return self._s[220]! } + public var Passport_Identity_DateOfBirth: String { return self._s[221]! } + public var Month_ShortOctober: String { return self._s[222]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[223]! } + public var Notification_CallCanceledShort: String { return self._s[224]! } + public var Passport_Phone_Help: String { return self._s[225]! } + public var Passport_Language_az: String { return self._s[227]! } + public var CreatePoll_TextPlaceholder: String { return self._s[229]! } + public var VoiceOver_Chat_AnonymousPoll: String { return self._s[230]! } + public var Passport_Identity_DocumentNumber: String { return self._s[231]! } + public var PhotoEditor_CurvesRed: String { return self._s[232]! } + public var PhoneNumberHelp_Alert: String { return self._s[234]! } + public var SocksProxySetup_Port: String { return self._s[235]! } + public var Checkout_PayNone: String { return self._s[236]! } + public var AutoDownloadSettings_WiFi: String { return self._s[237]! } + public var GroupInfo_GroupType: String { return self._s[238]! } + public var StickerSettings_ContextHide: String { return self._s[239]! } + public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[240]! } + public var Group_Setup_HistoryTitle: String { return self._s[242]! } + public var Passport_Identity_FilesUploadNew: String { return self._s[243]! } + public var PasscodeSettings_AutoLock: String { return self._s[244]! } + public var Passport_Title: String { return self._s[245]! } + public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[246]! } + public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[247]! } + public var GroupPermission_NoSendGifs: String { return self._s[248]! } + public var PrivacySettings_PasscodeOn: String { return self._s[249]! } public func Conversation_ScheduleMessage_SendTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[247]!, self._r[247]!, [_0]) + return formatWithArgumentRanges(self._s[250]!, self._r[250]!, [_0]) } - public var State_WaitingForNetwork: String { return self._s[249]! } + public var State_WaitingForNetwork: String { return self._s[252]! } public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[250]!, self._r[250]!, [_0, _1]) + return formatWithArgumentRanges(self._s[253]!, self._r[253]!, [_0, _1]) } - public var Calls_NotNow: String { return self._s[252]! } + public var Calls_NotNow: String { return self._s[255]! } public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[253]!, self._r[253]!, [_0]) + return formatWithArgumentRanges(self._s[256]!, self._r[256]!, [_0]) } - public var UserInfo_SendMessage: String { return self._s[254]! } - public var TwoStepAuth_PasswordSet: String { return self._s[255]! } - public var Passport_DeleteDocument: String { return self._s[256]! } - public var SocksProxySetup_AddProxyTitle: String { return self._s[257]! } + public var UserInfo_SendMessage: String { return self._s[257]! } + public var TwoStepAuth_PasswordSet: String { return self._s[258]! } + public var Passport_DeleteDocument: String { return self._s[259]! } + public var SocksProxySetup_AddProxyTitle: String { return self._s[260]! } public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[258]!, self._r[258]!, [_1]) + return formatWithArgumentRanges(self._s[261]!, self._r[261]!, [_1]) } - public var GroupRemoved_Remove: String { return self._s[259]! } - public var Passport_FieldIdentity: String { return self._s[260]! } - public var Group_Setup_TypePrivateHelp: String { return self._s[261]! } - public var Conversation_Processing: String { return self._s[264]! } - public var ChatSettings_AutoPlayAnimations: String { return self._s[266]! } - public var AuthSessions_LogOutApplicationsHelp: String { return self._s[269]! } - public var Month_GenFebruary: String { return self._s[270]! } + public var GroupRemoved_Remove: String { return self._s[262]! } + public var Passport_FieldIdentity: String { return self._s[263]! } + public var Group_Setup_TypePrivateHelp: String { return self._s[264]! } + public var Conversation_Processing: String { return self._s[267]! } + public var ChatSettings_AutoPlayAnimations: String { return self._s[269]! } + public var AuthSessions_LogOutApplicationsHelp: String { return self._s[272]! } + public var Month_GenFebruary: String { return self._s[273]! } public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[272]!, self._r[272]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[275]!, self._r[275]!, [_1, _2, _3, _4, _5]) } - public var Passport_Identity_TypeIdentityCard: String { return self._s[273]! } - public var AutoDownloadSettings_DataUsageMedium: String { return self._s[275]! } - public var GroupInfo_AddParticipant: String { return self._s[276]! } - public var KeyCommand_SendMessage: String { return self._s[277]! } - public var VoiceOver_Chat_YourContact: String { return self._s[279]! } - public var Map_LiveLocationShowAll: String { return self._s[280]! } - public var WallpaperSearch_ColorOrange: String { return self._s[282]! } - public var Appearance_AppIconDefaultX: String { return self._s[283]! } - public var Checkout_Receipt_Title: String { return self._s[284]! } - public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[285]! } - public var WallpaperPreview_PreviewTopText: String { return self._s[286]! } - public var Message_Contact: String { return self._s[287]! } - public var Call_StatusIncoming: String { return self._s[288]! } + public var Passport_Identity_TypeIdentityCard: String { return self._s[276]! } + public var AutoDownloadSettings_DataUsageMedium: String { return self._s[278]! } + public var GroupInfo_AddParticipant: String { return self._s[279]! } + public var KeyCommand_SendMessage: String { return self._s[280]! } + public var VoiceOver_Chat_YourContact: String { return self._s[282]! } + public var Map_LiveLocationShowAll: String { return self._s[283]! } + public var WallpaperSearch_ColorOrange: String { return self._s[285]! } + public var Appearance_AppIconDefaultX: String { return self._s[286]! } + public var Checkout_Receipt_Title: String { return self._s[287]! } + public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[288]! } + public var WallpaperPreview_PreviewTopText: String { return self._s[289]! } + public var Message_Contact: String { return self._s[290]! } + public var Call_StatusIncoming: String { return self._s[291]! } public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[289]!, self._r[289]!, [_1]) + return formatWithArgumentRanges(self._s[292]!, self._r[292]!, [_1]) } public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[291]!, self._r[291]!, [_1]) + return formatWithArgumentRanges(self._s[294]!, self._r[294]!, [_1]) } - public var VoiceOver_Media_PlaybackRate: String { return self._s[292]! } - public var Passport_FieldIdentityDetailsHelp: String { return self._s[293]! } - public var Conversation_ViewChannel: String { return self._s[294]! } + public var VoiceOver_Media_PlaybackRate: String { return self._s[295]! } + public var Passport_FieldIdentityDetailsHelp: String { return self._s[296]! } + public var Conversation_ViewChannel: String { return self._s[297]! } public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[295]!, self._r[295]!, [_0]) + return formatWithArgumentRanges(self._s[298]!, self._r[298]!, [_0]) } - public var Passport_Language_nl: String { return self._s[297]! } - public var Camera_Retake: String { return self._s[298]! } + public var Passport_Language_nl: String { return self._s[300]! } + public var Camera_Retake: String { return self._s[301]! } public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[299]!, self._r[299]!, [_0]) + return formatWithArgumentRanges(self._s[302]!, self._r[302]!, [_0]) } - public var AuthSessions_LogOutApplications: String { return self._s[300]! } - public var ApplyLanguage_ApplySuccess: String { return self._s[301]! } - public var Tour_Title6: String { return self._s[302]! } - public var Map_ChooseAPlace: String { return self._s[303]! } - public var CallSettings_Never: String { return self._s[305]! } + public var AuthSessions_LogOutApplications: String { return self._s[303]! } + public var ApplyLanguage_ApplySuccess: String { return self._s[304]! } + public var Tour_Title6: String { return self._s[305]! } + public var Map_ChooseAPlace: String { return self._s[306]! } + public var CallSettings_Never: String { return self._s[308]! } public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[306]!, self._r[306]!, [_0]) + return formatWithArgumentRanges(self._s[309]!, self._r[309]!, [_0]) } - public var ChannelRemoved_RemoveInfo: String { return self._s[307]! } + public var ChannelRemoved_RemoveInfo: String { return self._s[310]! } public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[308]!, self._r[308]!, [_0]) + return formatWithArgumentRanges(self._s[311]!, self._r[311]!, [_0]) } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[309]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[312]! } public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[310]!, self._r[310]!, [_0]) + return formatWithArgumentRanges(self._s[313]!, self._r[313]!, [_0]) } - public var GroupInfo_InviteLink_Title: String { return self._s[311]! } + public var GroupInfo_InviteLink_Title: String { return self._s[314]! } public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[312]!, self._r[312]!, [_1, _2]) + return formatWithArgumentRanges(self._s[315]!, self._r[315]!, [_1, _2]) } - public var KeyCommand_ScrollUp: String { return self._s[313]! } - public var ContactInfo_URLLabelHomepage: String { return self._s[314]! } - public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[315]! } + public var KeyCommand_ScrollUp: String { return self._s[316]! } + public var ContactInfo_URLLabelHomepage: String { return self._s[317]! } + public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[318]! } public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[316]!, self._r[316]!, [_0]) + return formatWithArgumentRanges(self._s[319]!, self._r[319]!, [_0]) } public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[317]!, self._r[317]!, [_0]) + return formatWithArgumentRanges(self._s[320]!, self._r[320]!, [_0]) } - public var CallFeedback_ReasonDistortedSpeech: String { return self._s[318]! } - public var Watch_LastSeen_WithinAWeek: String { return self._s[319]! } - public var Weekday_Tuesday: String { return self._s[321]! } - public var ScheduledMessages_Delete: String { return self._s[323]! } - public var UserInfo_StartSecretChat: String { return self._s[324]! } - public var Passport_Identity_FilesTitle: String { return self._s[325]! } - public var Permissions_NotificationsAllow_v0: String { return self._s[326]! } - public var DialogList_DeleteConversationConfirmation: String { return self._s[328]! } - public var ChatList_UndoArchiveRevealedTitle: String { return self._s[329]! } - public var AuthSessions_Sessions: String { return self._s[330]! } + public var CallFeedback_ReasonDistortedSpeech: String { return self._s[321]! } + public var Watch_LastSeen_WithinAWeek: String { return self._s[322]! } + public var Weekday_Tuesday: String { return self._s[324]! } + public var ScheduledMessages_Delete: String { return self._s[326]! } + public var UserInfo_StartSecretChat: String { return self._s[327]! } + public var Passport_Identity_FilesTitle: String { return self._s[328]! } + public var Permissions_NotificationsAllow_v0: String { return self._s[329]! } + public var DialogList_DeleteConversationConfirmation: String { return self._s[331]! } + public var ChatList_UndoArchiveRevealedTitle: String { return self._s[332]! } + public var AuthSessions_Sessions: String { return self._s[333]! } public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[332]!, self._r[332]!, [_0]) + return formatWithArgumentRanges(self._s[335]!, self._r[335]!, [_0]) } - public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[333]! } - public var Call_StatusWaiting: String { return self._s[334]! } - public var CreateGroup_SoftUserLimitAlert: String { return self._s[335]! } - public var FastTwoStepSetup_HintHelp: String { return self._s[336]! } - public var WallpaperPreview_CustomColorBottomText: String { return self._s[337]! } - public var LogoutOptions_AddAccountText: String { return self._s[338]! } - public var PasscodeSettings_6DigitCode: String { return self._s[339]! } - public var Settings_LogoutConfirmationText: String { return self._s[340]! } - public var Passport_Identity_TypePassport: String { return self._s[342]! } + public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[336]! } + public var Call_StatusWaiting: String { return self._s[337]! } + public var CreateGroup_SoftUserLimitAlert: String { return self._s[338]! } + public var FastTwoStepSetup_HintHelp: String { return self._s[339]! } + public var WallpaperPreview_CustomColorBottomText: String { return self._s[340]! } + public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[341]! } + public var LogoutOptions_AddAccountText: String { return self._s[342]! } + public var PasscodeSettings_6DigitCode: String { return self._s[343]! } + public var Settings_LogoutConfirmationText: String { return self._s[344]! } + public var Passport_Identity_TypePassport: String { return self._s[346]! } public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[345]!, self._r[345]!, [_1, _2]) + return formatWithArgumentRanges(self._s[349]!, self._r[349]!, [_1, _2]) } - public var SocksProxySetup_SaveProxy: String { return self._s[346]! } - public var AccessDenied_SaveMedia: String { return self._s[347]! } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[349]! } - public var Settings_Title: String { return self._s[351]! } - public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[352]! } - public var Contacts_InviteSearchLabel: String { return self._s[354]! } - public var ConvertToSupergroup_Title: String { return self._s[355]! } + public var SocksProxySetup_SaveProxy: String { return self._s[350]! } + public var AccessDenied_SaveMedia: String { return self._s[351]! } + public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[353]! } + public var Settings_Title: String { return self._s[355]! } + public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[356]! } + public var Contacts_InviteSearchLabel: String { return self._s[358]! } + public var ConvertToSupergroup_Title: String { return self._s[359]! } public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[356]!, self._r[356]!, [_0]) + return formatWithArgumentRanges(self._s[360]!, self._r[360]!, [_0]) } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[357]! } + public var InfoPlist_NSSiriUsageDescription: String { return self._s[361]! } public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[358]!, self._r[358]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[362]!, self._r[362]!, [_1, _2, _3]) } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[359]! } - public var UserInfo_BotHelp: String { return self._s[360]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[361]! } - public var Checkout_Name: String { return self._s[362]! } - public var AutoDownloadSettings_DataUsage: String { return self._s[363]! } - public var Channel_BanUser_BlockFor: String { return self._s[364]! } - public var Checkout_ShippingAddress: String { return self._s[365]! } - public var AutoDownloadSettings_MaxVideoSize: String { return self._s[366]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[367]! } - public var Privacy_Forwards: String { return self._s[368]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[369]! } - public var Appearance_ThemeCarouselNewNight: String { return self._s[370]! } + public var ChatSettings_AutomaticPhotoDownload: String { return self._s[363]! } + public var UserInfo_BotHelp: String { return self._s[364]! } + public var PrivacySettings_LastSeenEverybody: String { return self._s[365]! } + public var Checkout_Name: String { return self._s[366]! } + public var AutoDownloadSettings_DataUsage: String { return self._s[367]! } + public var Channel_BanUser_BlockFor: String { return self._s[368]! } + public var Checkout_ShippingAddress: String { return self._s[369]! } + public var AutoDownloadSettings_MaxVideoSize: String { return self._s[370]! } + public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[371]! } + public var Privacy_Forwards: String { return self._s[372]! } + public var Channel_BanUser_PermissionSendPolls: String { return self._s[373]! } + public var Appearance_ThemeCarouselNewNight: String { return self._s[374]! } public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[373]!, self._r[373]!, [_0]) + return formatWithArgumentRanges(self._s[377]!, self._r[377]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[374]! } - public var Group_OwnershipTransfer_Title: String { return self._s[375]! } - public var VoiceOver_Chat_OpenHint: String { return self._s[376]! } - public var Group_LeaveGroup: String { return self._s[377]! } - public var Settings_UsernameEmpty: String { return self._s[378]! } + public var Contacts_SortedByName: String { return self._s[378]! } + public var Group_OwnershipTransfer_Title: String { return self._s[379]! } + public var VoiceOver_Chat_OpenHint: String { return self._s[380]! } + public var Group_LeaveGroup: String { return self._s[381]! } + public var Settings_UsernameEmpty: String { return self._s[382]! } public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[379]!, self._r[379]!, [_0]) + return formatWithArgumentRanges(self._s[383]!, self._r[383]!, [_0]) } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_1]) + return formatWithArgumentRanges(self._s[384]!, self._r[384]!, [_1]) } public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[381]!, self._r[381]!, [_1, _2]) + return formatWithArgumentRanges(self._s[385]!, self._r[385]!, [_1, _2]) } - public var Message_ImageExpired: String { return self._s[382]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[384]! } - public var UserInfo_AddToExisting: String { return self._s[385]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[386]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[387]! } + public var Message_ImageExpired: String { return self._s[386]! } + public var TwoStepAuth_RecoveryFailed: String { return self._s[388]! } + public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[389]! } + public var UserInfo_AddToExisting: String { return self._s[390]! } + public var TwoStepAuth_EnabledSuccess: String { return self._s[391]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[392]! } public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[388]!, self._r[388]!, [_1]) + return formatWithArgumentRanges(self._s[393]!, self._r[393]!, [_1]) } - public var Notifications_GroupNotificationsAlert: String { return self._s[389]! } - public var Passport_Language_km: String { return self._s[390]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[392]! } - public var VoiceOver_Media_PlaybackPlay: String { return self._s[393]! } - public var Notification_CallMissedShort: String { return self._s[394]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[395]! } - public var Watch_Compose_Send: String { return self._s[396]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[399]! } - public var Conversation_HoldForVideo: String { return self._s[400]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[402]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[404]! } - public var Channel_LinkItem: String { return self._s[405]! } + public var Notifications_GroupNotificationsAlert: String { return self._s[394]! } + public var Passport_Language_km: String { return self._s[395]! } + public var SocksProxySetup_AdNoticeHelp: String { return self._s[397]! } + public var VoiceOver_Media_PlaybackPlay: String { return self._s[398]! } + public var Notification_CallMissedShort: String { return self._s[399]! } + public var ReportPeer_ReasonOther_Send: String { return self._s[400]! } + public var Watch_Compose_Send: String { return self._s[401]! } + public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[404]! } + public var Conversation_HoldForVideo: String { return self._s[405]! } + public var CheckoutInfo_ErrorCityInvalid: String { return self._s[407]! } + public var Appearance_AutoNightThemeDisabled: String { return self._s[409]! } + public var Channel_LinkItem: String { return self._s[410]! } public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[406]!, self._r[406]!, [_0, _1]) + return formatWithArgumentRanges(self._s[411]!, self._r[411]!, [_0, _1]) } public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[409]!, self._r[409]!, [_0]) + return formatWithArgumentRanges(self._s[414]!, self._r[414]!, [_0]) } - public var VoiceOver_Recording_StopAndPreview: String { return self._s[410]! } - public var Passport_Language_dv: String { return self._s[411]! } - public var Undo_LeftChannel: String { return self._s[412]! } - public var Notifications_ExceptionsMuted: String { return self._s[413]! } - public var ChatList_UnhideAction: String { return self._s[414]! } - public var Conversation_ContextMenuShare: String { return self._s[415]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[416]! } - public var ShareFileTip_Title: String { return self._s[417]! } - public var NotificationsSound_Chord: String { return self._s[418]! } + public var VoiceOver_Recording_StopAndPreview: String { return self._s[415]! } + public var Passport_Language_dv: String { return self._s[416]! } + public var Undo_LeftChannel: String { return self._s[417]! } + public var Notifications_ExceptionsMuted: String { return self._s[418]! } + public var ChatList_UnhideAction: String { return self._s[419]! } + public var Conversation_ContextMenuShare: String { return self._s[420]! } + public var Conversation_ContextMenuStickerPackInfo: String { return self._s[421]! } + public var ShareFileTip_Title: String { return self._s[422]! } + public var NotificationsSound_Chord: String { return self._s[423]! } public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[419]!, self._r[419]!, [_1, _2]) + return formatWithArgumentRanges(self._s[424]!, self._r[424]!, [_1, _2]) } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[420]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[425]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[421]!, self._r[421]!, [_0]) + return formatWithArgumentRanges(self._s[426]!, self._r[426]!, [_0]) } - public var Wallpaper_ErrorNotFound: String { return self._s[422]! } - public var Notification_CallOutgoingShort: String { return self._s[424]! } + public var Wallpaper_ErrorNotFound: String { return self._s[427]! } + public var Notification_CallOutgoingShort: String { return self._s[429]! } public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[425]!, self._r[425]!, [_1, _2]) + return formatWithArgumentRanges(self._s[430]!, self._r[430]!, [_1, _2]) } - public var Passport_Address_TypeUtilityBill: String { return self._s[426]! } - public var Privacy_Forwards_LinkIfAllowed: String { return self._s[427]! } - public var ReportPeer_Report: String { return self._s[428]! } - public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[429]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[430]! } + public var Passport_Address_TypeUtilityBill: String { return self._s[431]! } + public var Privacy_Forwards_LinkIfAllowed: String { return self._s[432]! } + public var ReportPeer_Report: String { return self._s[433]! } + public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[434]! } + public var GroupInfo_DeactivatedStatus: String { return self._s[435]! } public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[431]!, self._r[431]!, [_1, _2]) + return formatWithArgumentRanges(self._s[436]!, self._r[436]!, [_1, _2]) } - public var StickerPack_Send: String { return self._s[432]! } - public var Login_CodeSentInternal: String { return self._s[433]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[434]! } + public var StickerPack_Send: String { return self._s[437]! } + public var Login_CodeSentInternal: String { return self._s[438]! } + public var GroupInfo_InviteLink_LinkSection: String { return self._s[439]! } public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[435]!, self._r[435]!, [_0]) + return formatWithArgumentRanges(self._s[440]!, self._r[440]!, [_0]) } public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[437]!, self._r[437]!, [_0]) + return formatWithArgumentRanges(self._s[442]!, self._r[442]!, [_0]) } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[438]! } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[443]! } public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[439]!, self._r[439]!, [_1]) - } - public var ReportPeer_ReasonViolence: String { return self._s[441]! } - public var Map_Locating: String { return self._s[442]! } - public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[443]!, self._r[443]!, [_0]) - } - public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[444]!, self._r[444]!, [_1]) } - public var AutoDownloadSettings_GroupChats: String { return self._s[446]! } - public var CheckoutInfo_SaveInfo: String { return self._s[447]! } - public var SharedMedia_EmptyLinksText: String { return self._s[449]! } - public var Passport_Address_CityPlaceholder: String { return self._s[450]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[451]! } - public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[452]! } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[454]! } + public var ReportPeer_ReasonViolence: String { return self._s[446]! } + public var Map_Locating: String { return self._s[447]! } + public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[448]!, self._r[448]!, [_0]) + } + public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[449]!, self._r[449]!, [_1]) + } + public var AutoDownloadSettings_GroupChats: String { return self._s[451]! } + public var CheckoutInfo_SaveInfo: String { return self._s[452]! } + public var SharedMedia_EmptyLinksText: String { return self._s[454]! } + public var Passport_Address_CityPlaceholder: String { return self._s[455]! } + public var CheckoutInfo_ErrorStateInvalid: String { return self._s[456]! } + public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[457]! } + public var Channel_AdminLog_CanAddAdmins: String { return self._s[459]! } public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[455]!, self._r[455]!, [_1]) + return formatWithArgumentRanges(self._s[460]!, self._r[460]!, [_1]) } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[456]!, self._r[456]!, [_0]) - } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[457]! } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[458]! } - public var ChangePhoneNumberCode_Code: String { return self._s[459]! } - public var Appearance_CreateTheme: String { return self._s[460]! } - public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[461]!, self._r[461]!, [_0]) } - public var TwoStepAuth_SetupEmail: String { return self._s[462]! } - public var HashtagSearch_AllChats: String { return self._s[463]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[465]! } - public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { + public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[462]! } + public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[463]! } + public var ChangePhoneNumberCode_Code: String { return self._s[464]! } + public var Appearance_CreateTheme: String { return self._s[465]! } + public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[466]!, self._r[466]!, [_0]) } - public var PhotoEditor_QualityHigh: String { return self._s[468]! } + public var TwoStepAuth_SetupEmail: String { return self._s[467]! } + public var HashtagSearch_AllChats: String { return self._s[468]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[470]! } + public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[471]!, self._r[471]!, [_0]) + } + public var PhotoEditor_QualityHigh: String { return self._s[473]! } public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[469]!, self._r[469]!, [_0]) + return formatWithArgumentRanges(self._s[474]!, self._r[474]!, [_0]) } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[470]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[471]! } - public var Message_LiveLocation: String { return self._s[472]! } - public var Cache_LowDiskSpaceText: String { return self._s[473]! } - public var Conversation_SendMessage: String { return self._s[474]! } - public var AuthSessions_EmptyTitle: String { return self._s[475]! } - public var Privacy_PhoneNumber: String { return self._s[476]! } - public var PeopleNearby_CreateGroup: String { return self._s[477]! } - public var CallSettings_UseLessData: String { return self._s[478]! } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[479]! } - public var Stickers_AddToFavorites: String { return self._s[480]! } - public var PhotoEditor_QualityLow: String { return self._s[481]! } - public var Watch_UserInfo_Unblock: String { return self._s[482]! } - public var Settings_Logout: String { return self._s[483]! } + public var ApplyLanguage_ApplyLanguageAction: String { return self._s[475]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[476]! } + public var Message_LiveLocation: String { return self._s[477]! } + public var Cache_LowDiskSpaceText: String { return self._s[478]! } + public var EditTheme_ErrorLinkTaken: String { return self._s[479]! } + public var Conversation_SendMessage: String { return self._s[480]! } + public var AuthSessions_EmptyTitle: String { return self._s[481]! } + public var Privacy_PhoneNumber: String { return self._s[482]! } + public var PeopleNearby_CreateGroup: String { return self._s[483]! } + public var CallSettings_UseLessData: String { return self._s[484]! } + public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[485]! } + public var Stickers_AddToFavorites: String { return self._s[486]! } + public var PhotoEditor_QualityLow: String { return self._s[487]! } + public var Watch_UserInfo_Unblock: String { return self._s[488]! } + public var Settings_Logout: String { return self._s[489]! } public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_1]) + return formatWithArgumentRanges(self._s[490]!, self._r[490]!, [_1]) } - public var ContactInfo_PhoneLabelWork: String { return self._s[485]! } - public var ChannelInfo_Stats: String { return self._s[486]! } - public var TextFormat_Link: String { return self._s[487]! } + public var ContactInfo_PhoneLabelWork: String { return self._s[491]! } + public var ChannelInfo_Stats: String { return self._s[492]! } + public var TextFormat_Link: String { return self._s[493]! } public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[488]!, self._r[488]!, [_1, _2]) + return formatWithArgumentRanges(self._s[494]!, self._r[494]!, [_1, _2]) } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[489]!, self._r[489]!, [_0]) + return formatWithArgumentRanges(self._s[495]!, self._r[495]!, [_0]) } - public var Watch_Notification_Joined: String { return self._s[490]! } - public var Group_Setup_TypePublicHelp: String { return self._s[491]! } - public var Passport_Scans_UploadNew: String { return self._s[492]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[493]! } - public var DialogList_Title: String { return self._s[496]! } - public var NotificationSettings_ContactJoined: String { return self._s[497]! } - public var GroupInfo_LabelAdmin: String { return self._s[498]! } - public var KeyCommand_ChatInfo: String { return self._s[499]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[500]! } - public var Call_ReportIncludeLog: String { return self._s[501]! } + public var Watch_Notification_Joined: String { return self._s[496]! } + public var Group_Setup_TypePublicHelp: String { return self._s[497]! } + public var Passport_Scans_UploadNew: String { return self._s[498]! } + public var Checkout_LiabilityAlertTitle: String { return self._s[499]! } + public var DialogList_Title: String { return self._s[502]! } + public var NotificationSettings_ContactJoined: String { return self._s[503]! } + public var GroupInfo_LabelAdmin: String { return self._s[504]! } + public var KeyCommand_ChatInfo: String { return self._s[505]! } + public var Conversation_EditingCaptionPanelTitle: String { return self._s[506]! } + public var Call_ReportIncludeLog: String { return self._s[507]! } public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[504]!, self._r[504]!, [_0]) + return formatWithArgumentRanges(self._s[510]!, self._r[510]!, [_0]) } - public var LocalGroup_IrrelevantWarning: String { return self._s[505]! } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[506]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[507]! } - public var Message_Sticker: String { return self._s[508]! } - public var LastSeen_JustNow: String { return self._s[510]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[512]! } - public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[513]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[514]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[515]! } - public var TwoStepAuth_Email: String { return self._s[516]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[517]! } - public var PhotoEditor_BlurToolOff: String { return self._s[518]! } - public var Message_PinnedStickerMessage: String { return self._s[519]! } - public var ContactInfo_PhoneLabelPager: String { return self._s[520]! } - public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[521]! } - public var Passport_DiscardMessageTitle: String { return self._s[522]! } - public var Privacy_PaymentsTitle: String { return self._s[523]! } - public var Channel_DiscussionGroup_Header: String { return self._s[525]! } - public var VoiceOver_Chat_OptionSelected: String { return self._s[526]! } - public var Appearance_ColorTheme: String { return self._s[527]! } - public var UserInfo_ShareContact: String { return self._s[528]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[529]! } - public var Common_More: String { return self._s[530]! } - public var Watch_Message_Call: String { return self._s[531]! } - public var Profile_EncryptionKey: String { return self._s[534]! } - public var Privacy_TopPeers: String { return self._s[535]! } - public var Conversation_StopPollConfirmation: String { return self._s[536]! } - public var Privacy_TopPeersWarning: String { return self._s[538]! } - public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[539]! } - public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[540]! } - public var DialogList_SearchSectionMessages: String { return self._s[543]! } - public var Notifications_ChannelNotifications: String { return self._s[544]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[545]! } - public var Passport_Language_sk: String { return self._s[546]! } - public var Notification_MessageLifetime1h: String { return self._s[547]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[548]! } - public var Call_ReportSkip: String { return self._s[550]! } - public var Cache_ServiceFiles: String { return self._s[551]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[552]! } - public var VoiceOver_Chat_YourFile: String { return self._s[553]! } - public var Map_Hybrid: String { return self._s[554]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[556]! } - public var ChatSettings_AutoDownloadVideos: String { return self._s[558]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[559]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[560]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[563]! } + public var LocalGroup_IrrelevantWarning: String { return self._s[511]! } + public var ChatAdmins_AllMembersAreAdmins: String { return self._s[512]! } + public var Conversation_DefaultRestrictedInline: String { return self._s[513]! } + public var Message_Sticker: String { return self._s[514]! } + public var LastSeen_JustNow: String { return self._s[516]! } + public var Passport_Email_EmailPlaceholder: String { return self._s[518]! } + public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[519]! } + public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[520]! } + public var Channel_EditAdmin_PermissionsHeader: String { return self._s[521]! } + public var TwoStepAuth_Email: String { return self._s[522]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[523]! } + public var PhotoEditor_BlurToolOff: String { return self._s[524]! } + public var Message_PinnedStickerMessage: String { return self._s[525]! } + public var ContactInfo_PhoneLabelPager: String { return self._s[526]! } + public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[527]! } + public var Passport_DiscardMessageTitle: String { return self._s[528]! } + public var Privacy_PaymentsTitle: String { return self._s[529]! } + public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[530]! } + public var Channel_DiscussionGroup_Header: String { return self._s[532]! } + public var VoiceOver_Chat_OptionSelected: String { return self._s[533]! } + public var Appearance_ColorTheme: String { return self._s[534]! } + public var UserInfo_ShareContact: String { return self._s[535]! } + public var Passport_Address_TypePassportRegistration: String { return self._s[536]! } + public var Common_More: String { return self._s[537]! } + public var Watch_Message_Call: String { return self._s[538]! } + public var Profile_EncryptionKey: String { return self._s[541]! } + public var Privacy_TopPeers: String { return self._s[542]! } + public var Conversation_StopPollConfirmation: String { return self._s[543]! } + public var Privacy_TopPeersWarning: String { return self._s[545]! } + public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[546]! } + public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[547]! } + public var DialogList_SearchSectionMessages: String { return self._s[550]! } + public var Notifications_ChannelNotifications: String { return self._s[551]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[552]! } + public var Passport_Language_sk: String { return self._s[553]! } + public var Notification_MessageLifetime1h: String { return self._s[554]! } + public var Wallpaper_ResetWallpapersInfo: String { return self._s[555]! } + public var Call_ReportSkip: String { return self._s[557]! } + public var Cache_ServiceFiles: String { return self._s[558]! } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[559]! } + public var VoiceOver_Chat_YourFile: String { return self._s[560]! } + public var Map_Hybrid: String { return self._s[561]! } + public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[563]! } + public var ChatSettings_AutoDownloadVideos: String { return self._s[565]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[566]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[567]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[570]! } public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[564]!, self._r[564]!, [_1]) + return formatWithArgumentRanges(self._s[571]!, self._r[571]!, [_1]) } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[566]! } - public var ScheduledMessages_ScheduledToday: String { return self._s[567]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[573]! } + public var ScheduledMessages_ScheduledToday: String { return self._s[574]! } public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[568]!, self._r[568]!, [_1, _2]) - } - public var Conversation_LiveLocationYou: String { return self._s[569]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[570]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[571]! } - public var UserInfo_ShareBot: String { return self._s[574]! } - public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[575]!, self._r[575]!, [_1, _2]) } - public var PhotoEditor_ShadowsTint: String { return self._s[576]! } - public var Message_Audio: String { return self._s[577]! } - public var Passport_Language_lt: String { return self._s[578]! } + public var Conversation_LiveLocationYou: String { return self._s[576]! } + public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[577]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[578]! } + public var UserInfo_ShareBot: String { return self._s[581]! } + public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[582]!, self._r[582]!, [_1, _2]) + } + public var PhotoEditor_ShadowsTint: String { return self._s[583]! } + public var Message_Audio: String { return self._s[584]! } + public var Passport_Language_lt: String { return self._s[585]! } public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[579]!, self._r[579]!, [_0]) + return formatWithArgumentRanges(self._s[586]!, self._r[586]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[580]! } - public var Conversation_FileICloudDrive: String { return self._s[581]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[582]! } + public var Permissions_SiriText_v0: String { return self._s[587]! } + public var Conversation_FileICloudDrive: String { return self._s[588]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[589]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[583]!, self._r[583]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[590]!, self._r[590]!, [_1, _2, _3, _4, _5, _6]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[584]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[591]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[585]!, self._r[585]!, [_0]) + return formatWithArgumentRanges(self._s[592]!, self._r[592]!, [_0]) } - public var Channel_SignMessages: String { return self._s[586]! } + public var Channel_SignMessages: String { return self._s[593]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[587]!, self._r[587]!, [_1]) + return formatWithArgumentRanges(self._s[594]!, self._r[594]!, [_1]) } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[588]! } - public var Passport_ScanPassport: String { return self._s[589]! } - public var Watch_Suggestion_Thanks: String { return self._s[590]! } - public var BlockedUsers_AddNew: String { return self._s[591]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[595]! } + public var Passport_ScanPassport: String { return self._s[596]! } + public var Watch_Suggestion_Thanks: String { return self._s[597]! } + public var BlockedUsers_AddNew: String { return self._s[598]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[592]!, self._r[592]!, [_1, _2]) + return formatWithArgumentRanges(self._s[599]!, self._r[599]!, [_1, _2]) } - public var Watch_Message_Invoice: String { return self._s[593]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[594]! } - public var Month_GenJuly: String { return self._s[595]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[596]! } - public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[598]! } - public var Notification_ChannelInviterSelf: String { return self._s[599]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[600]! } + public var Watch_Message_Invoice: String { return self._s[600]! } + public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[601]! } + public var Month_GenJuly: String { return self._s[602]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[603]! } + public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[605]! } + public var Notification_ChannelInviterSelf: String { return self._s[606]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[607]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[601]!, self._r[601]!, [_1, _2]) + return formatWithArgumentRanges(self._s[608]!, self._r[608]!, [_1, _2]) } - public var CheckoutInfo_Title: String { return self._s[602]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[603]! } + public var CheckoutInfo_Title: String { return self._s[609]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[610]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[604]!, self._r[604]!, [_0]) + return formatWithArgumentRanges(self._s[611]!, self._r[611]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[605]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[606]! } - public var Passport_Language_de: String { return self._s[607]! } - public var Update_Title: String { return self._s[608]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[609]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[610]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[611]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[612]! } - public var NotificationsSound_Telegraph: String { return self._s[613]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[614]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[615]! } + public var Passport_Identity_MainPage: String { return self._s[612]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[613]! } + public var Passport_Language_de: String { return self._s[614]! } + public var Update_Title: String { return self._s[615]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[616]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[617]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[618]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[619]! } + public var NotificationsSound_Telegraph: String { return self._s[620]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[621]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[622]! } public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[616]!, self._r[616]!, [_0]) + return formatWithArgumentRanges(self._s[623]!, self._r[623]!, [_0]) } - public var Stickers_SuggestAll: String { return self._s[617]! } - public var Conversation_ForwardTitle: String { return self._s[618]! } - public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[619]! } + public var Stickers_SuggestAll: String { return self._s[624]! } + public var Conversation_ForwardTitle: String { return self._s[625]! } + public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[626]! } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[620]!, self._r[620]!, [_0]) + return formatWithArgumentRanges(self._s[627]!, self._r[627]!, [_0]) } - public var Calls_NewCall: String { return self._s[621]! } - public var Call_StatusEnded: String { return self._s[622]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[623]! } - public var Settings_ProxyConnected: String { return self._s[624]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[625]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[626]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[627]! } - public var Passport_PasswordPlaceholder: String { return self._s[628]! } - public var Message_PinnedInvoice: String { return self._s[629]! } - public var Passport_Identity_IssueDate: String { return self._s[630]! } - public var Passport_Language_pl: String { return self._s[631]! } + public var Calls_NewCall: String { return self._s[628]! } + public var Call_StatusEnded: String { return self._s[629]! } + public var AutoDownloadSettings_DataUsageLow: String { return self._s[630]! } + public var Settings_ProxyConnected: String { return self._s[631]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[632]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[633]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[634]! } + public var Passport_PasswordPlaceholder: String { return self._s[635]! } + public var Message_PinnedInvoice: String { return self._s[636]! } + public var Passport_Identity_IssueDate: String { return self._s[637]! } + public var Passport_Language_pl: String { return self._s[638]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[632]!, self._r[632]!, [_0]) + return formatWithArgumentRanges(self._s[639]!, self._r[639]!, [_0]) } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[633]! } - public var Call_StatusConnecting: String { return self._s[634]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[640]! } + public var Call_StatusConnecting: String { return self._s[641]! } public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[635]!, self._r[635]!, [_0]) + return formatWithArgumentRanges(self._s[642]!, self._r[642]!, [_0]) } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[637]! } - public var Common_Edit: String { return self._s[638]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[639]! } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[644]! } + public var Common_Edit: String { return self._s[645]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[646]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[640]!, self._r[640]!, [_0]) + return formatWithArgumentRanges(self._s[647]!, self._r[647]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[641]! } - public var PrivateDataSettings_Title: String { return self._s[642]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[643]! } - public var ChatList_Read: String { return self._s[644]! } - public var Undo_ChatClearedForBothSides: String { return self._s[645]! } - public var GroupPermission_SectionTitle: String { return self._s[646]! } + public var GroupInfo_ChatAdmins: String { return self._s[648]! } + public var PrivateDataSettings_Title: String { return self._s[649]! } + public var Login_CancelPhoneVerificationStop: String { return self._s[650]! } + public var ChatList_Read: String { return self._s[651]! } + public var Undo_ChatClearedForBothSides: String { return self._s[652]! } + public var GroupPermission_SectionTitle: String { return self._s[653]! } public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[648]!, self._r[648]!, [_1, _2]) + return formatWithArgumentRanges(self._s[655]!, self._r[655]!, [_1, _2]) } - public var Checkout_ErrorPaymentFailed: String { return self._s[649]! } - public var Update_UpdateApp: String { return self._s[650]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[651]! } - public var Settings_Appearance: String { return self._s[652]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[655]! } - public var Watch_Location_Access: String { return self._s[656]! } - public var ShareMenu_CopyShareLink: String { return self._s[658]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[659]! } - public var Conversation_Theme: String { return self._s[661]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[656]! } + public var Update_UpdateApp: String { return self._s[657]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[658]! } + public var Settings_Appearance: String { return self._s[659]! } + public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[662]! } + public var Watch_Location_Access: String { return self._s[663]! } + public var ShareMenu_CopyShareLink: String { return self._s[665]! } + public var TwoStepAuth_SetupHintTitle: String { return self._s[666]! } + public var Conversation_Theme: String { return self._s[668]! } public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[662]!, self._r[662]!, [_0]) + return formatWithArgumentRanges(self._s[669]!, self._r[669]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[663]! } - public var Weekday_ShortWednesday: String { return self._s[664]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[665]! } - public var Undo_LeftGroup: String { return self._s[668]! } - public var Conversation_LinkDialogCopy: String { return self._s[669]! } - public var KeyCommand_FocusOnInputField: String { return self._s[671]! } - public var Contacts_SelectAll: String { return self._s[672]! } - public var Preview_SaveToCameraRoll: String { return self._s[673]! } - public var PrivacySettings_PasscodeOff: String { return self._s[674]! } - public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[675]! } - public var Wallpaper_Title: String { return self._s[676]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[677]! } - public var AccessDenied_Camera: String { return self._s[678]! } - public var Watch_Compose_CurrentLocation: String { return self._s[679]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[681]! } + public var Notifications_ClassicTones: String { return self._s[670]! } + public var Weekday_ShortWednesday: String { return self._s[671]! } + public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[672]! } + public var Undo_LeftGroup: String { return self._s[675]! } + public var Conversation_LinkDialogCopy: String { return self._s[676]! } + public var KeyCommand_FocusOnInputField: String { return self._s[678]! } + public var Contacts_SelectAll: String { return self._s[679]! } + public var Preview_SaveToCameraRoll: String { return self._s[680]! } + public var PrivacySettings_PasscodeOff: String { return self._s[681]! } + public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[682]! } + public var Wallpaper_Title: String { return self._s[683]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[684]! } + public var AccessDenied_Camera: String { return self._s[685]! } + public var Watch_Compose_CurrentLocation: String { return self._s[686]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[688]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[682]!, self._r[682]!, [_0]) + return formatWithArgumentRanges(self._s[689]!, self._r[689]!, [_0]) } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[683]! } - public var Passport_Language_ro: String { return self._s[684]! } - public var EditTheme_UploadNewTheme: String { return self._s[685]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[686]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[690]! } + public var Passport_Language_ro: String { return self._s[691]! } + public var EditTheme_UploadNewTheme: String { return self._s[692]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[693]! } public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[687]!, self._r[687]!, [_0]) + return formatWithArgumentRanges(self._s[694]!, self._r[694]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[688]! } - public var State_ConnectingToProxy: String { return self._s[689]! } - public var Calls_RatingTitle: String { return self._s[690]! } - public var Generic_ErrorMoreInfo: String { return self._s[691]! } - public var Appearance_PreviewReplyText: String { return self._s[692]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[693]! } - public var SharedMedia_CategoryLinks: String { return self._s[694]! } - public var Calls_Missed: String { return self._s[695]! } - public var Cache_Photos: String { return self._s[699]! } - public var GroupPermission_NoAddMembers: String { return self._s[700]! } - public var ScheduledMessages_Title: String { return self._s[701]! } + public var Login_CancelPhoneVerification: String { return self._s[695]! } + public var State_ConnectingToProxy: String { return self._s[696]! } + public var Calls_RatingTitle: String { return self._s[697]! } + public var Generic_ErrorMoreInfo: String { return self._s[698]! } + public var Appearance_PreviewReplyText: String { return self._s[699]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[700]! } + public var SharedMedia_CategoryLinks: String { return self._s[701]! } + public var Calls_Missed: String { return self._s[702]! } + public var Cache_Photos: String { return self._s[706]! } + public var GroupPermission_NoAddMembers: String { return self._s[707]! } + public var ScheduledMessages_Title: String { return self._s[708]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[702]!, self._r[702]!, [_0]) + return formatWithArgumentRanges(self._s[709]!, self._r[709]!, [_0]) } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[703]! } - public var Settings_ProxyDisabled: String { return self._s[704]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[710]! } + public var Settings_ProxyDisabled: String { return self._s[711]! } public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[705]!, self._r[705]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[712]!, self._r[712]!, [_1, _2, _3, _4]) } public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[706]!, self._r[706]!, [_0]) + return formatWithArgumentRanges(self._s[713]!, self._r[713]!, [_0]) } - public var Appearance_Title: String { return self._s[708]! } + public var Appearance_Title: String { return self._s[715]! } public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[710]!, self._r[710]!, [_0]) - } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[711]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[712]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[713]! } - public var Preview_DeletePhoto: String { return self._s[714]! } - public var Appearance_AppIconFilledX: String { return self._s[715]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[716]! } - public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[717]!, self._r[717]!, [_0]) } - public var Coub_TapForSound: String { return self._s[719]! } - public var Map_LocatingError: String { return self._s[720]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[722]! } - public var Conversation_SendMessage_SendSilently: String { return self._s[723]! } - public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[724]! } - public var Passport_ForgottenPassword: String { return self._s[725]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[726]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[727]! } - public var Login_TermsOfServiceSignupDecline: String { return self._s[729]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[730]! } - public var Message_Location: String { return self._s[731]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[732]! } - public var Channel_Management_Title: String { return self._s[733]! } - public var DialogList_SearchSectionDialogs: String { return self._s[735]! } - public var Compose_NewChannel_Members: String { return self._s[736]! } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[718]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[719]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[720]! } + public var Preview_DeletePhoto: String { return self._s[721]! } + public var Appearance_AppIconFilledX: String { return self._s[722]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[723]! } + public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[724]!, self._r[724]!, [_0]) + } + public var Coub_TapForSound: String { return self._s[726]! } + public var Map_LocatingError: String { return self._s[727]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[729]! } + public var Conversation_SendMessage_SendSilently: String { return self._s[730]! } + public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[731]! } + public var Passport_ForgottenPassword: String { return self._s[732]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[733]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[734]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[736]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[737]! } + public var Message_Location: String { return self._s[738]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[739]! } + public var Channel_Management_Title: String { return self._s[740]! } + public var DialogList_SearchSectionDialogs: String { return self._s[742]! } + public var Compose_NewChannel_Members: String { return self._s[743]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[737]!, self._r[737]!, [_0]) + return formatWithArgumentRanges(self._s[744]!, self._r[744]!, [_0]) } - public var GroupInfo_Location: String { return self._s[738]! } - public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[739]! } - public var AutoNightTheme_ScheduledFrom: String { return self._s[740]! } - public var PhotoEditor_WarmthTool: String { return self._s[741]! } - public var Passport_Language_tr: String { return self._s[742]! } + public var GroupInfo_Location: String { return self._s[745]! } + public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[746]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[747]! } + public var PhotoEditor_WarmthTool: String { return self._s[748]! } + public var Passport_Language_tr: String { return self._s[749]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[743]!, self._r[743]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[750]!, self._r[750]!, [_1, _2, _3]) } - public var Login_ResetAccountProtected_Reset: String { return self._s[745]! } - public var Watch_PhotoView_Title: String { return self._s[746]! } - public var Passport_Phone_Delete: String { return self._s[747]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[748]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[749]! } - public var GroupInfo_Permissions: String { return self._s[750]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[751]! } - public var Profile_ShareContactButton: String { return self._s[752]! } - public var ChatSettings_Other: String { return self._s[753]! } - public var UserInfo_NotificationsDisabled: String { return self._s[754]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[755]! } - public var LastSeen_WithinAMonth: String { return self._s[756]! } - public var VoiceOver_Chat_PlayHint: String { return self._s[757]! } - public var Conversation_ReportGroupLocation: String { return self._s[758]! } - public var Conversation_EncryptionCanceled: String { return self._s[759]! } - public var MediaPicker_GroupDescription: String { return self._s[760]! } - public var WebSearch_Images: String { return self._s[761]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[752]! } + public var Watch_PhotoView_Title: String { return self._s[753]! } + public var Passport_Phone_Delete: String { return self._s[754]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[755]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[756]! } + public var GroupInfo_Permissions: String { return self._s[757]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[758]! } + public var Profile_ShareContactButton: String { return self._s[759]! } + public var ChatSettings_Other: String { return self._s[760]! } + public var UserInfo_NotificationsDisabled: String { return self._s[761]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[762]! } + public var LastSeen_WithinAMonth: String { return self._s[763]! } + public var VoiceOver_Chat_PlayHint: String { return self._s[764]! } + public var Conversation_ReportGroupLocation: String { return self._s[765]! } + public var Conversation_EncryptionCanceled: String { return self._s[766]! } + public var MediaPicker_GroupDescription: String { return self._s[767]! } + public var WebSearch_Images: String { return self._s[768]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[762]!, self._r[762]!, [_0]) + return formatWithArgumentRanges(self._s[769]!, self._r[769]!, [_0]) } - public var Message_Photo: String { return self._s[763]! } - public var PasscodeSettings_HelpBottom: String { return self._s[764]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[765]! } - public var EditTheme_ThemeTemplateAlert: String { return self._s[766]! } - public var VoiceOver_Media_PlaybackRateChange: String { return self._s[767]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[768]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[769]! } - public var NotificationsSound_Calypso: String { return self._s[770]! } - public var Map_Map: String { return self._s[771]! } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[773]! } - public var ChatSettings_TextSizeUnits: String { return self._s[774]! } + public var Message_Photo: String { return self._s[770]! } + public var PasscodeSettings_HelpBottom: String { return self._s[771]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[772]! } + public var VoiceOver_Media_PlaybackRateChange: String { return self._s[773]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[774]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[775]! } + public var NotificationsSound_Calypso: String { return self._s[776]! } + public var Map_Map: String { return self._s[777]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[779]! } + public var ChatSettings_TextSizeUnits: String { return self._s[780]! } public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[775]!, self._r[775]!, [_0]) - } - public var Common_of: String { return self._s[776]! } - public var Conversation_ForwardContacts: String { return self._s[779]! } - public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[781]!, self._r[781]!, [_0]) } - public var Passport_Language_hy: String { return self._s[782]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[783]! } - public var AutoDownloadSettings_Reset: String { return self._s[784]! } - public var Paint_ClearConfirm: String { return self._s[785]! } - public var Camera_VideoMode: String { return self._s[786]! } - public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Common_of: String { return self._s[782]! } + public var Conversation_ForwardContacts: String { return self._s[785]! } + public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[787]!, self._r[787]!, [_0]) } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[788]! } - public var Conversation_ViewBackground: String { return self._s[789]! } - public var Passport_Language_el: String { return self._s[790]! } - public var PhotoEditor_Original: String { return self._s[791]! } - public var Settings_FAQ_Button: String { return self._s[793]! } - public var Channel_Setup_PublicNoLink: String { return self._s[795]! } - public var Conversation_UnsupportedMedia: String { return self._s[796]! } - public var Conversation_SlideToCancel: String { return self._s[797]! } - public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[798]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[799]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[800]! } - public var Conversation_ReportSpamChannelConfirmation: String { return self._s[801]! } - public var AutoNightTheme_NotAvailable: String { return self._s[802]! } - public var Conversation_Owner: String { return self._s[803]! } - public var Common_Create: String { return self._s[804]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[805]! } - public var Localization_ChooseLanguage: String { return self._s[807]! } - public var Settings_Proxy: String { return self._s[810]! } - public var Privacy_TopPeersHelp: String { return self._s[811]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[812]! } - public var Chat_UnsendMyMessages: String { return self._s[813]! } + public var Passport_Language_hy: String { return self._s[788]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[789]! } + public var AutoDownloadSettings_Reset: String { return self._s[790]! } + public var Paint_ClearConfirm: String { return self._s[791]! } + public var Camera_VideoMode: String { return self._s[792]! } + public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[793]!, self._r[793]!, [_0]) + } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[794]! } + public var Conversation_ViewBackground: String { return self._s[795]! } + public var Passport_Language_el: String { return self._s[796]! } + public var PhotoEditor_Original: String { return self._s[797]! } + public var Settings_FAQ_Button: String { return self._s[799]! } + public var Channel_Setup_PublicNoLink: String { return self._s[801]! } + public var Conversation_UnsupportedMedia: String { return self._s[802]! } + public var Conversation_SlideToCancel: String { return self._s[803]! } + public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[804]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[805]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[806]! } + public var Conversation_ReportSpamChannelConfirmation: String { return self._s[807]! } + public var AutoNightTheme_NotAvailable: String { return self._s[808]! } + public var Conversation_Owner: String { return self._s[809]! } + public var Common_Create: String { return self._s[810]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[811]! } + public var Localization_ChooseLanguage: String { return self._s[813]! } + public var Settings_Proxy: String { return self._s[816]! } + public var Privacy_TopPeersHelp: String { return self._s[817]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[818]! } + public var Chat_UnsendMyMessages: String { return self._s[819]! } public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[814]!, self._r[814]!, [_0]) + return formatWithArgumentRanges(self._s[820]!, self._r[820]!, [_0]) } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[815]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[821]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[817]!, self._r[817]!, [_0]) + return formatWithArgumentRanges(self._s[823]!, self._r[823]!, [_0]) } - public var Contacts_SortedByPresence: String { return self._s[818]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[819]! } - public var Cache_Title: String { return self._s[820]! } + public var Contacts_SortedByPresence: String { return self._s[824]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[825]! } + public var Cache_Title: String { return self._s[826]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[821]!, self._r[821]!, [_0]) + return formatWithArgumentRanges(self._s[827]!, self._r[827]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[822]! } - public var Channel_Moderator_Title: String { return self._s[823]! } - public var InstantPage_AutoNightTheme: String { return self._s[825]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[828]! } + public var Channel_Moderator_Title: String { return self._s[829]! } + public var InstantPage_AutoNightTheme: String { return self._s[831]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[828]!, self._r[828]!, [_1]) + return formatWithArgumentRanges(self._s[834]!, self._r[834]!, [_1]) } - public var Passport_Scans_Upload: String { return self._s[829]! } - public var Undo_Undo: String { return self._s[831]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[832]! } - public var TwoStepAuth_RemovePassword: String { return self._s[833]! } - public var Common_Delete: String { return self._s[834]! } - public var Contacts_AddPeopleNearby: String { return self._s[836]! } - public var Conversation_ContextMenuDelete: String { return self._s[837]! } - public var SocksProxySetup_Credentials: String { return self._s[838]! } - public var Appearance_EditTheme: String { return self._s[840]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[841]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[844]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[845]! } - public var Passport_Language_id: String { return self._s[847]! } - public var WallpaperSearch_ColorTeal: String { return self._s[848]! } - public var ChannelIntro_Title: String { return self._s[849]! } + public var Passport_Scans_Upload: String { return self._s[835]! } + public var Undo_Undo: String { return self._s[837]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[838]! } + public var TwoStepAuth_RemovePassword: String { return self._s[839]! } + public var Common_Delete: String { return self._s[840]! } + public var Contacts_AddPeopleNearby: String { return self._s[842]! } + public var Conversation_ContextMenuDelete: String { return self._s[843]! } + public var SocksProxySetup_Credentials: String { return self._s[844]! } + public var Appearance_EditTheme: String { return self._s[846]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[847]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[850]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[851]! } + public var Passport_Language_id: String { return self._s[853]! } + public var WallpaperSearch_ColorTeal: String { return self._s[854]! } + public var ChannelIntro_Title: String { return self._s[855]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[850]!, self._r[850]!, [_0]) + return formatWithArgumentRanges(self._s[856]!, self._r[856]!, [_0]) } - public var VoiceOver_Chat_OpenLinkHint: String { return self._s[852]! } - public var VoiceOver_Chat_Reply: String { return self._s[853]! } - public var ScheduledMessages_BotActionUnavailable: String { return self._s[854]! } - public var Channel_Info_Description: String { return self._s[855]! } - public var Stickers_FavoriteStickers: String { return self._s[856]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[857]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[858]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[859]! } - public var Group_PublicLink_Placeholder: String { return self._s[860]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[861]! } + public var VoiceOver_Chat_OpenLinkHint: String { return self._s[858]! } + public var VoiceOver_Chat_Reply: String { return self._s[859]! } + public var ScheduledMessages_BotActionUnavailable: String { return self._s[860]! } + public var Channel_Info_Description: String { return self._s[861]! } + public var Stickers_FavoriteStickers: String { return self._s[862]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[863]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[864]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[865]! } + public var Group_PublicLink_Placeholder: String { return self._s[866]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[867]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[862]!, self._r[862]!, [_1]) + return formatWithArgumentRanges(self._s[868]!, self._r[868]!, [_1]) } - public var TextFormat_Underline: String { return self._s[863]! } + public var TextFormat_Underline: String { return self._s[869]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[864]!, self._r[864]!, [_1, _2]) + return formatWithArgumentRanges(self._s[870]!, self._r[870]!, [_1, _2]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[865]!, self._r[865]!, [_0]) + return formatWithArgumentRanges(self._s[871]!, self._r[871]!, [_0]) } - public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[866]! } + public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[872]! } public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[867]!, self._r[867]!, [_1, _2]) - } - public var GroupPermission_Delete: String { return self._s[868]! } - public var Passport_Language_uk: String { return self._s[869]! } - public var StickerPack_HideStickers: String { return self._s[871]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[872]! } - public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[873]!, self._r[873]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[874]! } + public var GroupPermission_Delete: String { return self._s[874]! } + public var Passport_Language_uk: String { return self._s[875]! } + public var StickerPack_HideStickers: String { return self._s[877]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[878]! } + public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[879]!, self._r[879]!, [_1, _2]) + } + public var Activity_UploadingVideoMessage: String { return self._s[880]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[875]!, self._r[875]!, [_0]) + return formatWithArgumentRanges(self._s[881]!, self._r[881]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[876]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[877]! } - public var Settings_CallSettings: String { return self._s[878]! } - public var Camera_SquareMode: String { return self._s[879]! } - public var Conversation_SendMessage_ScheduleMessage: String { return self._s[880]! } - public var GroupInfo_SharedMediaNone: String { return self._s[881]! } + public var Channel_TitleInfo: String { return self._s[882]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[883]! } + public var Settings_CallSettings: String { return self._s[884]! } + public var Camera_SquareMode: String { return self._s[885]! } + public var Conversation_SendMessage_ScheduleMessage: String { return self._s[886]! } + public var GroupInfo_SharedMediaNone: String { return self._s[887]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[882]!, self._r[882]!, [_1]) + return formatWithArgumentRanges(self._s[888]!, self._r[888]!, [_1]) } - public var Bot_GenericBotStatus: String { return self._s[883]! } - public var Application_Update: String { return self._s[885]! } - public var Month_ShortJanuary: String { return self._s[886]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[887]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[888]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[889]! } - public var Passport_Address_Street2Placeholder: String { return self._s[890]! } + public var Bot_GenericBotStatus: String { return self._s[889]! } + public var Application_Update: String { return self._s[891]! } + public var Month_ShortJanuary: String { return self._s[892]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[893]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[894]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[895]! } + public var Passport_Address_Street2Placeholder: String { return self._s[896]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[891]!, self._r[891]!, [_0]) + return formatWithArgumentRanges(self._s[897]!, self._r[897]!, [_0]) } - public var NetworkUsageSettings_Cellular: String { return self._s[892]! } - public var Appearance_PreviewOutgoingText: String { return self._s[893]! } - public var Notifications_PermissionsAllowInSettings: String { return self._s[894]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[896]! } - public var Map_Directions: String { return self._s[897]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[899]! } - public var Appearance_ThemeDay: String { return self._s[900]! } - public var LogoutOptions_LogOut: String { return self._s[901]! } - public var Group_PublicLink_Title: String { return self._s[903]! } - public var Channel_AddBotErrorNoRights: String { return self._s[904]! } - public var Passport_Identity_AddPassport: String { return self._s[905]! } - public var LocalGroup_ButtonTitle: String { return self._s[906]! } - public var Call_Message: String { return self._s[907]! } - public var PhotoEditor_ExposureTool: String { return self._s[908]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[910]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[912]! } - public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[913]! } - public var Appearance_Preview: String { return self._s[914]! } - public var Compose_ChannelMembers: String { return self._s[915]! } - public var Conversation_DeleteManyMessages: String { return self._s[916]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[917]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[918]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[919]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[922]! } - public var Conversation_UpdateTelegram: String { return self._s[923]! } + public var NetworkUsageSettings_Cellular: String { return self._s[898]! } + public var Appearance_PreviewOutgoingText: String { return self._s[899]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[900]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[902]! } + public var Map_Directions: String { return self._s[903]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[905]! } + public var Appearance_ThemeDay: String { return self._s[906]! } + public var LogoutOptions_LogOut: String { return self._s[907]! } + public var Group_PublicLink_Title: String { return self._s[909]! } + public var Channel_AddBotErrorNoRights: String { return self._s[910]! } + public var Passport_Identity_AddPassport: String { return self._s[911]! } + public var LocalGroup_ButtonTitle: String { return self._s[912]! } + public var Call_Message: String { return self._s[913]! } + public var PhotoEditor_ExposureTool: String { return self._s[914]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[916]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[918]! } + public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[919]! } + public var Appearance_Preview: String { return self._s[920]! } + public var Compose_ChannelMembers: String { return self._s[921]! } + public var Conversation_DeleteManyMessages: String { return self._s[922]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[923]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[924]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[925]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[928]! } + public var Conversation_UpdateTelegram: String { return self._s[929]! } + public var EditTheme_Create_TopInfo: String { return self._s[930]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[924]!, self._r[924]!, [_0]) + return formatWithArgumentRanges(self._s[931]!, self._r[931]!, [_0]) } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[925]!, self._r[925]!, [_1]) + return formatWithArgumentRanges(self._s[932]!, self._r[932]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[926]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[927]! } + public var GroupInfo_Administrators_Title: String { return self._s[933]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[934]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[928]!, self._r[928]!, [_0]) + return formatWithArgumentRanges(self._s[935]!, self._r[935]!, [_0]) } - public var Tour_Title3: String { return self._s[929]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[930]! } - public var Clipboard_SendPhoto: String { return self._s[934]! } - public var MediaPicker_Videos: String { return self._s[935]! } - public var Passport_Email_Title: String { return self._s[936]! } + public var Tour_Title3: String { return self._s[936]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[937]! } + public var Clipboard_SendPhoto: String { return self._s[941]! } + public var MediaPicker_Videos: String { return self._s[942]! } + public var Passport_Email_Title: String { return self._s[943]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[937]!, self._r[937]!, [_0]) + return formatWithArgumentRanges(self._s[944]!, self._r[944]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[938]! } - public var Conversation_MessageDialogDelete: String { return self._s[939]! } - public var Privacy_Calls_CustomHelp: String { return self._s[941]! } - public var Message_Wallpaper: String { return self._s[942]! } - public var MemberSearch_BotSection: String { return self._s[943]! } - public var GroupInfo_SetSound: String { return self._s[944]! } - public var Core_ServiceUserStatus: String { return self._s[945]! } - public var LiveLocationUpdated_JustNow: String { return self._s[946]! } - public var Call_StatusFailed: String { return self._s[947]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[948]! } - public var TwoStepAuth_SetPassword: String { return self._s[949]! } - public var Permissions_PeopleNearbyText_v0: String { return self._s[950]! } + public var StickerPacksSettings_Title: String { return self._s[945]! } + public var Conversation_MessageDialogDelete: String { return self._s[946]! } + public var Privacy_Calls_CustomHelp: String { return self._s[948]! } + public var Message_Wallpaper: String { return self._s[949]! } + public var MemberSearch_BotSection: String { return self._s[950]! } + public var GroupInfo_SetSound: String { return self._s[951]! } + public var Core_ServiceUserStatus: String { return self._s[952]! } + public var LiveLocationUpdated_JustNow: String { return self._s[953]! } + public var Call_StatusFailed: String { return self._s[954]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[955]! } + public var TwoStepAuth_SetPassword: String { return self._s[956]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[957]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_0]) + return formatWithArgumentRanges(self._s[959]!, self._r[959]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[953]! } - public var Profile_Username: String { return self._s[954]! } - public var Bot_DescriptionTitle: String { return self._s[955]! } - public var MaskStickerSettings_Title: String { return self._s[956]! } - public var SharedMedia_CategoryOther: String { return self._s[957]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[958]! } - public var Common_NotNow: String { return self._s[959]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[960]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[961]! } - public var Map_Location: String { return self._s[962]! } - public var Invitation_JoinGroup: String { return self._s[963]! } - public var AutoDownloadSettings_Title: String { return self._s[965]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[966]! } - public var Channel_ErrorAddBlocked: String { return self._s[967]! } - public var Conversation_UnblockUser: String { return self._s[968]! } - public var Watch_Bot_Restart: String { return self._s[969]! } - public var TwoStepAuth_Title: String { return self._s[970]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[971]! } - public var Checkout_ShippingMethod: String { return self._s[972]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[973]! } + public var Calls_SubmitRating: String { return self._s[960]! } + public var Profile_Username: String { return self._s[961]! } + public var Bot_DescriptionTitle: String { return self._s[962]! } + public var MaskStickerSettings_Title: String { return self._s[963]! } + public var SharedMedia_CategoryOther: String { return self._s[964]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[965]! } + public var Common_NotNow: String { return self._s[966]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[967]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[968]! } + public var Map_Location: String { return self._s[969]! } + public var Invitation_JoinGroup: String { return self._s[970]! } + public var AutoDownloadSettings_Title: String { return self._s[972]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[973]! } + public var Channel_ErrorAddBlocked: String { return self._s[974]! } + public var Conversation_UnblockUser: String { return self._s[975]! } + public var EditTheme_Edit_TopInfo: String { return self._s[976]! } + public var Watch_Bot_Restart: String { return self._s[977]! } + public var TwoStepAuth_Title: String { return self._s[978]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[979]! } + public var Checkout_ShippingMethod: String { return self._s[980]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[981]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[974]!, self._r[974]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[982]!, self._r[982]!, [_1, _2, _3]) } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[976]!, self._r[976]!, [_0]) + return formatWithArgumentRanges(self._s[984]!, self._r[984]!, [_0]) } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[977]!, self._r[977]!, [_0]) + return formatWithArgumentRanges(self._s[985]!, self._r[985]!, [_0]) } - public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[978]! } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[979]! } - public var AuthSessions_TerminateOtherSessions: String { return self._s[980]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[981]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[982]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[983]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[984]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[985]! } - public var Checkout_PaymentMethod_Title: String { return self._s[986]! } - public var SocksProxySetup_Connection: String { return self._s[987]! } - public var Group_MessagePhotoRemoved: String { return self._s[988]! } - public var Channel_Stickers_NotFound: String { return self._s[990]! } - public var Group_About_Help: String { return self._s[991]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[992]! } - public var PeopleNearby_Title: String { return self._s[994]! } + public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[986]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[987]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[988]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[989]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[990]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[991]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[992]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[993]! } + public var Checkout_PaymentMethod_Title: String { return self._s[994]! } + public var SocksProxySetup_Connection: String { return self._s[995]! } + public var Group_MessagePhotoRemoved: String { return self._s[996]! } + public var Channel_Stickers_NotFound: String { return self._s[999]! } + public var Group_About_Help: String { return self._s[1000]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[1001]! } + public var PeopleNearby_Title: String { return self._s[1003]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[995]!, self._r[995]!, [_1]) + return formatWithArgumentRanges(self._s[1004]!, self._r[1004]!, [_1]) } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[997]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[998]! } - public var SocksProxySetup_Password: String { return self._s[999]! } - public var Notifications_PermissionsEnable: String { return self._s[1000]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[1002]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1006]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[1007]! } + public var SocksProxySetup_Password: String { return self._s[1008]! } + public var Notifications_PermissionsEnable: String { return self._s[1009]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[1011]! } public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1003]!, self._r[1003]!, [_1]) + return formatWithArgumentRanges(self._s[1012]!, self._r[1012]!, [_1]) } - public var EditTheme_ShortLinkInfo: String { return self._s[1004]! } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1006]!, self._r[1006]!, [_0]) + return formatWithArgumentRanges(self._s[1014]!, self._r[1014]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[1007]! } - public var ArchivedPacksAlert_Title: String { return self._s[1008]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[1015]! } + public var ArchivedPacksAlert_Title: String { return self._s[1016]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1009]!, self._r[1009]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1017]!, self._r[1017]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1010]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1012]! } - public var Conversation_StatusTyping: String { return self._s[1013]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[1014]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[1015]! } - public var UserInfo_CreateNewContact: String { return self._s[1016]! } - public var Passport_Identity_FrontSide: String { return self._s[1017]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1018]! } - public var Calls_CallTabTitle: String { return self._s[1019]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1020]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[1018]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[1020]! } + public var Conversation_StatusTyping: String { return self._s[1021]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[1022]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[1023]! } + public var UserInfo_CreateNewContact: String { return self._s[1024]! } + public var Passport_Identity_FrontSide: String { return self._s[1025]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[1026]! } + public var Calls_CallTabTitle: String { return self._s[1027]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[1028]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1022]!, self._r[1022]!, [_0]) + return formatWithArgumentRanges(self._s[1030]!, self._r[1030]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[1023]! } - public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1024]! } - public var SharedMedia_EmptyMusicText: String { return self._s[1025]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1026]! } - public var Paint_Stickers: String { return self._s[1027]! } - public var Privacy_GroupsAndChannels: String { return self._s[1028]! } - public var UserInfo_AddContact: String { return self._s[1030]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[1031]! } + public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[1032]! } + public var SharedMedia_EmptyMusicText: String { return self._s[1033]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[1034]! } + public var Paint_Stickers: String { return self._s[1035]! } + public var Privacy_GroupsAndChannels: String { return self._s[1036]! } + public var UserInfo_AddContact: String { return self._s[1038]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1031]!, self._r[1031]!, [_0]) + return formatWithArgumentRanges(self._s[1039]!, self._r[1039]!, [_0]) } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[1033]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[1041]! } public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1035]!, self._r[1035]!, [_0]) + return formatWithArgumentRanges(self._s[1043]!, self._r[1043]!, [_0]) } - public var DialogList_NoMessagesTitle: String { return self._s[1036]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[1037]! } - public var BlockedUsers_BlockUser: String { return self._s[1038]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[1039]! } - public var MediaPicker_UngroupDescription: String { return self._s[1040]! } - public var Watch_NoConnection: String { return self._s[1041]! } - public var Month_GenSeptember: String { return self._s[1042]! } - public var Conversation_ViewGroup: String { return self._s[1043]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1046]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[1047]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1048]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1049]! } - public var MediaPicker_CameraRoll: String { return self._s[1051]! } - public var Month_GenAugust: String { return self._s[1052]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[1053]! } - public var SharedMedia_EmptyText: String { return self._s[1054]! } - public var Map_ShareLiveLocation: String { return self._s[1055]! } - public var Calls_All: String { return self._s[1056]! } - public var Appearance_ThemeNight: String { return self._s[1059]! } - public var Conversation_HoldForAudio: String { return self._s[1060]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[1063]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[1064]! } - public var SocksProxySetup_Secret: String { return self._s[1065]! } + public var DialogList_NoMessagesTitle: String { return self._s[1044]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[1045]! } + public var BlockedUsers_BlockUser: String { return self._s[1046]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[1047]! } + public var MediaPicker_UngroupDescription: String { return self._s[1048]! } + public var Watch_NoConnection: String { return self._s[1049]! } + public var Month_GenSeptember: String { return self._s[1050]! } + public var Conversation_ViewGroup: String { return self._s[1051]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1054]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[1055]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1056]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1057]! } + public var MediaPicker_CameraRoll: String { return self._s[1059]! } + public var Month_GenAugust: String { return self._s[1060]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[1061]! } + public var SharedMedia_EmptyText: String { return self._s[1062]! } + public var Map_ShareLiveLocation: String { return self._s[1063]! } + public var Calls_All: String { return self._s[1064]! } + public var Appearance_ThemeNight: String { return self._s[1067]! } + public var Conversation_HoldForAudio: String { return self._s[1068]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[1071]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[1072]! } + public var SocksProxySetup_Secret: String { return self._s[1073]! } public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1066]!, self._r[1066]!, [_0]) + return formatWithArgumentRanges(self._s[1074]!, self._r[1074]!, [_0]) } - public var Channel_BanList_RestrictedTitle: String { return self._s[1068]! } - public var Conversation_Location: String { return self._s[1069]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[1076]! } + public var Conversation_Location: String { return self._s[1077]! } public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1070]!, self._r[1070]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1078]!, self._r[1078]!, [_1, _2]) } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[1072]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1073]! } - public var Notifications_PermissionsText: String { return self._s[1074]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1075]! } - public var Call_Flip: String { return self._s[1076]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1078]! } - public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1079]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1081]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1083]! } - public var Channel_TooMuchBots: String { return self._s[1085]! } - public var Passport_DeletePassportConfirmation: String { return self._s[1086]! } - public var Login_InvalidCodeError: String { return self._s[1087]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1088]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[1080]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1081]! } + public var Notifications_PermissionsText: String { return self._s[1082]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1083]! } + public var Call_Flip: String { return self._s[1084]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1086]! } + public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[1087]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1089]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1091]! } + public var Channel_TooMuchBots: String { return self._s[1093]! } + public var Passport_DeletePassportConfirmation: String { return self._s[1094]! } + public var Login_InvalidCodeError: String { return self._s[1095]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1096]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1089]!, self._r[1089]!, [_0]) + return formatWithArgumentRanges(self._s[1097]!, self._r[1097]!, [_0]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1090]!, self._r[1090]!, [_0]) + return formatWithArgumentRanges(self._s[1098]!, self._r[1098]!, [_0]) } - public var VoiceOver_Navigation_ProxySettings: String { return self._s[1091]! } - public var Call_CallInProgressTitle: String { return self._s[1092]! } - public var Month_ShortSeptember: String { return self._s[1093]! } - public var Watch_ChannelInfo_Title: String { return self._s[1094]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1097]! } - public var DialogList_PasscodeLockHelp: String { return self._s[1098]! } - public var Chat_MultipleTextMessagesDisabled: String { return self._s[1099]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[1100]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1101]! } - public var PhotoEditor_CropReset: String { return self._s[1102]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1104]! } - public var Channel_Management_LabelEditor: String { return self._s[1105]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1107]! } - public var PhotoEditor_HighlightsTool: String { return self._s[1108]! } - public var UserInfo_Title: String { return self._s[1109]! } - public var ChatList_HideAction: String { return self._s[1110]! } - public var AccessDenied_Title: String { return self._s[1111]! } - public var DialogList_SearchLabel: String { return self._s[1112]! } - public var Group_Setup_HistoryHidden: String { return self._s[1113]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1114]! } - public var State_Updating: String { return self._s[1116]! } - public var Contacts_TabTitle: String { return self._s[1117]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[1119]! } - public var GroupInfo_GroupHistory: String { return self._s[1120]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1121]! } - public var Wallpaper_SetColor: String { return self._s[1122]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1123]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1124]! } - public var Chat_AttachmentLimitReached: String { return self._s[1125]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1126]! } - public var Contacts_NotRegisteredSection: String { return self._s[1127]! } + public var VoiceOver_Navigation_ProxySettings: String { return self._s[1099]! } + public var Call_CallInProgressTitle: String { return self._s[1100]! } + public var Month_ShortSeptember: String { return self._s[1101]! } + public var Watch_ChannelInfo_Title: String { return self._s[1102]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1105]! } + public var DialogList_PasscodeLockHelp: String { return self._s[1106]! } + public var Chat_MultipleTextMessagesDisabled: String { return self._s[1107]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[1108]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1109]! } + public var PhotoEditor_CropReset: String { return self._s[1110]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1112]! } + public var Channel_Management_LabelEditor: String { return self._s[1113]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1115]! } + public var PhotoEditor_HighlightsTool: String { return self._s[1116]! } + public var UserInfo_Title: String { return self._s[1117]! } + public var ChatList_HideAction: String { return self._s[1118]! } + public var AccessDenied_Title: String { return self._s[1119]! } + public var DialogList_SearchLabel: String { return self._s[1120]! } + public var Group_Setup_HistoryHidden: String { return self._s[1121]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1122]! } + public var State_Updating: String { return self._s[1124]! } + public var Contacts_TabTitle: String { return self._s[1125]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[1127]! } + public var GroupInfo_GroupHistory: String { return self._s[1128]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1129]! } + public var Wallpaper_SetColor: String { return self._s[1130]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1131]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1132]! } + public var Chat_AttachmentLimitReached: String { return self._s[1133]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1134]! } + public var Contacts_NotRegisteredSection: String { return self._s[1135]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1128]!, self._r[1128]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1136]!, self._r[1136]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[1129]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[1130]! } - public var SocksProxySetup_Connecting: String { return self._s[1131]! } - public var ExplicitContent_AlertChannel: String { return self._s[1132]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[1133]! } - public var Conversation_Contact: String { return self._s[1134]! } - public var Login_CodeExpired: String { return self._s[1135]! } - public var Passport_DiscardMessageAction: String { return self._s[1136]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1137]! } + public var Paint_Clear: String { return self._s[1137]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[1138]! } + public var SocksProxySetup_Connecting: String { return self._s[1139]! } + public var ExplicitContent_AlertChannel: String { return self._s[1140]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[1141]! } + public var Conversation_Contact: String { return self._s[1142]! } + public var Login_CodeExpired: String { return self._s[1143]! } + public var Passport_DiscardMessageAction: String { return self._s[1144]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1145]! } public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1138]!, self._r[1138]!, [_0]) + return formatWithArgumentRanges(self._s[1146]!, self._r[1146]!, [_0]) } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[1139]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1140]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[1147]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1148]! } public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1141]!, self._r[1141]!, [_0]) + return formatWithArgumentRanges(self._s[1149]!, self._r[1149]!, [_0]) } - public var Month_ShortApril: String { return self._s[1142]! } - public var AuthSessions_CurrentSession: String { return self._s[1143]! } - public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1146]! } - public var WallpaperPreview_CropTopText: String { return self._s[1148]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1149]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1150]! } + public var Month_ShortApril: String { return self._s[1150]! } + public var AuthSessions_CurrentSession: String { return self._s[1151]! } + public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1154]! } + public var WallpaperPreview_CropTopText: String { return self._s[1156]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1157]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1158]! } public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1151]!, self._r[1151]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1159]!, self._r[1159]!, [_0, _1]) } - public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1152]! } - public var Channel_Setup_TypePrivate: String { return self._s[1154]! } - public var Forward_ChannelReadOnly: String { return self._s[1157]! } - public var PhotoEditor_CurvesBlue: String { return self._s[1158]! } - public var AddContact_SharedContactException: String { return self._s[1159]! } - public var UserInfo_BotPrivacy: String { return self._s[1161]! } - public var Notification_PassportValueEmail: String { return self._s[1162]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[1163]! } - public var GroupPermission_NewTitle: String { return self._s[1164]! } - public var CallFeedback_ReasonDropped: String { return self._s[1165]! } - public var GroupInfo_Permissions_AddException: String { return self._s[1166]! } - public var Channel_SignMessages_Help: String { return self._s[1168]! } - public var Undo_ChatDeleted: String { return self._s[1170]! } - public var Conversation_ChatBackground: String { return self._s[1171]! } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1172]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1173]! } - public var Passport_Language_pt: String { return self._s[1174]! } - public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1175]! } - public var NotificationsSound_Popcorn: String { return self._s[1178]! } - public var AutoNightTheme_Disabled: String { return self._s[1179]! } - public var BlockedUsers_LeavePrefix: String { return self._s[1180]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[1181]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1182]! } - public var WallpaperSearch_ColorBlue: String { return self._s[1183]! } + public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1160]! } + public var Channel_Setup_TypePrivate: String { return self._s[1162]! } + public var Forward_ChannelReadOnly: String { return self._s[1165]! } + public var PhotoEditor_CurvesBlue: String { return self._s[1166]! } + public var AddContact_SharedContactException: String { return self._s[1167]! } + public var UserInfo_BotPrivacy: String { return self._s[1169]! } + public var Notification_PassportValueEmail: String { return self._s[1170]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[1171]! } + public var GroupPermission_NewTitle: String { return self._s[1172]! } + public var CallFeedback_ReasonDropped: String { return self._s[1173]! } + public var GroupInfo_Permissions_AddException: String { return self._s[1174]! } + public var Channel_SignMessages_Help: String { return self._s[1176]! } + public var Undo_ChatDeleted: String { return self._s[1178]! } + public var Conversation_ChatBackground: String { return self._s[1179]! } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1180]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1181]! } + public var Passport_Language_pt: String { return self._s[1182]! } + public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[1183]! } + public var NotificationsSound_Popcorn: String { return self._s[1186]! } + public var AutoNightTheme_Disabled: String { return self._s[1187]! } + public var BlockedUsers_LeavePrefix: String { return self._s[1188]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[1189]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1190]! } + public var WallpaperSearch_ColorBlue: String { return self._s[1191]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1184]!, self._r[1184]!, [_0]) + return formatWithArgumentRanges(self._s[1192]!, self._r[1192]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1185]! } - public var SocksProxySetup_UseForCalls: String { return self._s[1186]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1188]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1193]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1194]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1196]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1189]!, self._r[1189]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1197]!, self._r[1197]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1192]! } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1193]! } - public var Compose_NewEncryptedChat: String { return self._s[1194]! } - public var Login_CodeFloodError: String { return self._s[1195]! } - public var Calls_TabTitle: String { return self._s[1196]! } - public var Privacy_ProfilePhoto: String { return self._s[1197]! } - public var Passport_Language_he: String { return self._s[1198]! } + public var SocksProxySetup_Hostname: String { return self._s[1200]! } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1201]! } + public var Compose_NewEncryptedChat: String { return self._s[1202]! } + public var Login_CodeFloodError: String { return self._s[1203]! } + public var Calls_TabTitle: String { return self._s[1204]! } + public var Privacy_ProfilePhoto: String { return self._s[1205]! } + public var Passport_Language_he: String { return self._s[1206]! } public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1199]!, self._r[1199]!, [_0]) + return formatWithArgumentRanges(self._s[1207]!, self._r[1207]!, [_0]) } - public var GroupPermission_Title: String { return self._s[1200]! } + public var GroupPermission_Title: String { return self._s[1208]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1201]!, self._r[1201]!, [_0]) + return formatWithArgumentRanges(self._s[1209]!, self._r[1209]!, [_0]) } - public var GroupPermission_NoChangeInfo: String { return self._s[1202]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[1203]! } - public var Tour_Text1: String { return self._s[1204]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[1205]! } - public var Month_ShortFebruary: String { return self._s[1206]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1207]! } - public var NotificationsSound_Glass: String { return self._s[1208]! } - public var Appearance_ThemeNightBlue: String { return self._s[1209]! } - public var CheckoutInfo_Pay: String { return self._s[1210]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1212]! } - public var Call_CallAgain: String { return self._s[1214]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1215]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1216]! } - public var Passport_InvalidPasswordError: String { return self._s[1217]! } - public var Watch_Message_Game: String { return self._s[1218]! } - public var Stickers_Install: String { return self._s[1219]! } - public var VoiceOver_Chat_Message: String { return self._s[1220]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1221]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1223]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1224]! } - public var AuthSessions_OtherSessions: String { return self._s[1225]! } - public var Channel_Username_Help: String { return self._s[1226]! } - public var Camera_Title: String { return self._s[1227]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1229]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1230]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1231]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1232]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1233]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1234]! } - public var ScheduledMessages_DeleteMany: String { return self._s[1235]! } - public var Conversation_RestrictedStickers: String { return self._s[1236]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1238]! } - public var UserInfo_TelegramCall: String { return self._s[1240]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1241]! } - public var CreatePoll_OptionsHeader: String { return self._s[1242]! } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1243]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1244]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1245]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1246]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1210]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[1211]! } + public var Tour_Text1: String { return self._s[1212]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[1213]! } + public var Month_ShortFebruary: String { return self._s[1214]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1215]! } + public var NotificationsSound_Glass: String { return self._s[1216]! } + public var Appearance_ThemeNightBlue: String { return self._s[1217]! } + public var CheckoutInfo_Pay: String { return self._s[1218]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1220]! } + public var Call_CallAgain: String { return self._s[1222]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1223]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1224]! } + public var Passport_InvalidPasswordError: String { return self._s[1225]! } + public var Watch_Message_Game: String { return self._s[1226]! } + public var Stickers_Install: String { return self._s[1227]! } + public var VoiceOver_Chat_Message: String { return self._s[1228]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1229]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1231]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1232]! } + public var AuthSessions_OtherSessions: String { return self._s[1233]! } + public var Channel_Username_Help: String { return self._s[1234]! } + public var Camera_Title: String { return self._s[1235]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1237]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1238]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1239]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1240]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1241]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1242]! } + public var ScheduledMessages_DeleteMany: String { return self._s[1243]! } + public var Conversation_RestrictedStickers: String { return self._s[1244]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1246]! } + public var UserInfo_TelegramCall: String { return self._s[1248]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1249]! } + public var CreatePoll_OptionsHeader: String { return self._s[1250]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1251]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1252]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1253]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1254]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1247]!, self._r[1247]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1255]!, self._r[1255]!, [_1, _2, _3]) } - public var Settings_SaveEditedPhotos: String { return self._s[1248]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1249]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1250]! } - public var Conversation_MessageDialogRetry: String { return self._s[1251]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1252]! } - public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1253]! } - public var Group_Setup_TypeHeader: String { return self._s[1254]! } - public var Paint_RecentStickers: String { return self._s[1255]! } - public var PhotoEditor_GrainTool: String { return self._s[1256]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1257]! } - public var EmptyGroupInfo_Line4: String { return self._s[1258]! } - public var Watch_AuthRequired: String { return self._s[1260]! } + public var Settings_SaveEditedPhotos: String { return self._s[1256]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1257]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1258]! } + public var Conversation_MessageDialogRetry: String { return self._s[1259]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1260]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1261]! } + public var Group_Setup_TypeHeader: String { return self._s[1262]! } + public var Paint_RecentStickers: String { return self._s[1263]! } + public var PhotoEditor_GrainTool: String { return self._s[1264]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1265]! } + public var EmptyGroupInfo_Line4: String { return self._s[1266]! } + public var Watch_AuthRequired: String { return self._s[1268]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1261]!, self._r[1261]!, [_0]) + return formatWithArgumentRanges(self._s[1269]!, self._r[1269]!, [_0]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1262]! } - public var ChannelIntro_Text: String { return self._s[1263]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1264]! } - public var GroupPermission_NoSendMedia: String { return self._s[1265]! } - public var Calls_AddTab: String { return self._s[1266]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1267]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1268]! } - public var Notification_MessageLifetime1d: String { return self._s[1269]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1270]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1271]! } - public var Passport_Identity_GenderFemale: String { return self._s[1272]! } - public var BlockedUsers_BlockTitle: String { return self._s[1273]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1270]! } + public var ChannelIntro_Text: String { return self._s[1271]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1272]! } + public var GroupPermission_NoSendMedia: String { return self._s[1273]! } + public var Calls_AddTab: String { return self._s[1274]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1275]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1276]! } + public var Notification_MessageLifetime1d: String { return self._s[1277]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1278]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1279]! } + public var Passport_Identity_GenderFemale: String { return self._s[1280]! } + public var BlockedUsers_BlockTitle: String { return self._s[1281]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1274]!, self._r[1274]!, [_1]) + return formatWithArgumentRanges(self._s[1282]!, self._r[1282]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1275]! } - public var WallpaperSearch_ColorBlack: String { return self._s[1276]! } - public var ChatList_ArchiveAction: String { return self._s[1277]! } - public var AutoNightTheme_Scheduled: String { return self._s[1278]! } + public var Weekday_Yesterday: String { return self._s[1283]! } + public var WallpaperSearch_ColorBlack: String { return self._s[1284]! } + public var ChatList_ArchiveAction: String { return self._s[1285]! } + public var AutoNightTheme_Scheduled: String { return self._s[1286]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1279]!, self._r[1279]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1287]!, self._r[1287]!, [_1, _2, _3, _4, _5, _6]) } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1280]! } + public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[1288]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1289]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1281]!, self._r[1281]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1290]!, self._r[1290]!, [_1, _2]) } - public var CreatePoll_Create: String { return self._s[1282]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1283]! } + public var CreatePoll_Create: String { return self._s[1291]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1292]! } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1284]!, self._r[1284]!, [_1, _2]) - } - public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1285]! } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1286]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1288]! } - public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1289]!, self._r[1289]!, [_1]) - } - public var Preview_OpenInInstagram: String { return self._s[1290]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1291]! } - public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1292]!, self._r[1292]!, [_1, _2, _3]) - } - public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1293]!, self._r[1293]!, [_1, _2]) } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1294]! } - public var ArchivedChats_IntroText3: String { return self._s[1295]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[1296]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1297]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1298]! } + public var ScheduledMessages_ClearAllConfirmation: String { return self._s[1294]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1295]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1297]! } + public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1298]!, self._r[1298]!, [_1]) + } + public var Preview_OpenInInstagram: String { return self._s[1299]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1300]! } + public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1301]!, self._r[1301]!, [_1, _2, _3]) + } + public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1302]!, self._r[1302]!, [_1, _2]) + } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1303]! } + public var ArchivedChats_IntroText3: String { return self._s[1304]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[1305]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1306]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1307]! } public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1299]!, self._r[1299]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1308]!, self._r[1308]!, [_1, _2, _3]) } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1301]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1302]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1303]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1304]! } - public var Gif_NoGifsFound: String { return self._s[1305]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1306]! } - public var VoiceOver_MessageContextDelete: String { return self._s[1307]! } - public var EditTheme_Preview: String { return self._s[1308]! } - public var GroupInfo_ActionPromote: String { return self._s[1309]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1310]! } - public var GroupInfo_Permissions_Title: String { return self._s[1311]! } - public var Permissions_ContactsText_v0: String { return self._s[1312]! } - public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1313]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1314]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1317]! } - public var Passport_FieldEmailHelp: String { return self._s[1318]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1310]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1311]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1312]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1313]! } + public var Gif_NoGifsFound: String { return self._s[1314]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1315]! } + public var VoiceOver_MessageContextDelete: String { return self._s[1316]! } + public var EditTheme_Preview: String { return self._s[1317]! } + public var GroupInfo_ActionPromote: String { return self._s[1318]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1319]! } + public var GroupInfo_Permissions_Title: String { return self._s[1320]! } + public var Permissions_ContactsText_v0: String { return self._s[1321]! } + public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[1322]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1323]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1326]! } + public var Passport_FieldEmailHelp: String { return self._s[1327]! } public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1319]!, self._r[1319]!, [_0]) + return formatWithArgumentRanges(self._s[1328]!, self._r[1328]!, [_0]) } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1320]! } - public var Weekday_ShortSaturday: String { return self._s[1321]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1322]! } - public var Watch_Conversation_UserInfo: String { return self._s[1323]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1324]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1325]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1326]! } - public var PhotoEditor_VignetteTool: String { return self._s[1327]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1328]! } - public var Passport_Language_et: String { return self._s[1329]! } - public var AppUpgrade_Running: String { return self._s[1330]! } - public var Channel_DiscussionGroup_Info: String { return self._s[1332]! } - public var Passport_Language_bg: String { return self._s[1333]! } - public var Stickers_NoStickersFound: String { return self._s[1335]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1329]! } + public var Weekday_ShortSaturday: String { return self._s[1330]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1331]! } + public var Watch_Conversation_UserInfo: String { return self._s[1332]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1333]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1334]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1335]! } + public var PhotoEditor_VignetteTool: String { return self._s[1336]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1337]! } + public var Passport_Language_et: String { return self._s[1338]! } + public var AppUpgrade_Running: String { return self._s[1339]! } + public var Channel_DiscussionGroup_Info: String { return self._s[1341]! } + public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[1342]! } + public var Passport_Language_bg: String { return self._s[1343]! } + public var Stickers_NoStickersFound: String { return self._s[1345]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1337]!, self._r[1337]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1347]!, self._r[1347]!, [_1, _2]) } public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1338]!, self._r[1338]!, [_0]) + return formatWithArgumentRanges(self._s[1348]!, self._r[1348]!, [_0]) } - public var Settings_About: String { return self._s[1339]! } + public var Settings_About: String { return self._s[1349]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1340]!, self._r[1340]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1350]!, self._r[1350]!, [_0, _1, _2]) } - public var KeyCommand_NewMessage: String { return self._s[1342]! } - public var Group_ErrorAddBlocked: String { return self._s[1343]! } + public var KeyCommand_NewMessage: String { return self._s[1352]! } + public var Group_ErrorAddBlocked: String { return self._s[1353]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1344]!, self._r[1344]!, [_0]) + return formatWithArgumentRanges(self._s[1354]!, self._r[1354]!, [_0]) } - public var Map_LocationTitle: String { return self._s[1345]! } - public var ReportGroupLocation_Title: String { return self._s[1346]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1347]! } - public var Cache_ClearProgress: String { return self._s[1348]! } + public var Map_LocationTitle: String { return self._s[1355]! } + public var ReportGroupLocation_Title: String { return self._s[1356]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1357]! } + public var Cache_ClearProgress: String { return self._s[1358]! } public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1349]!, self._r[1349]!, [_0]) + return formatWithArgumentRanges(self._s[1359]!, self._r[1359]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1350]! } - public var Passport_UpdateRequiredError: String { return self._s[1351]! } + public var GroupRemoved_AddToGroup: String { return self._s[1360]! } + public var Passport_UpdateRequiredError: String { return self._s[1361]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1352]!, self._r[1352]!, [_1]) + return formatWithArgumentRanges(self._s[1362]!, self._r[1362]!, [_1]) } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1354]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1355]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1356]! } - public var Passport_Language_ka: String { return self._s[1357]! } - public var Call_Decline: String { return self._s[1358]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1359]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1364]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1365]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1366]! } + public var Passport_Language_ka: String { return self._s[1367]! } + public var Call_Decline: String { return self._s[1368]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1369]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1362]!, self._r[1362]!, [_0]) + return formatWithArgumentRanges(self._s[1372]!, self._r[1372]!, [_0]) } - public var CallFeedback_Send: String { return self._s[1363]! } - public var EditTheme_EditTitle: String { return self._s[1364]! } + public var CallFeedback_Send: String { return self._s[1373]! } + public var EditTheme_EditTitle: String { return self._s[1374]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1365]!, self._r[1365]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1375]!, self._r[1375]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1366]! } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1368]! } - public var Passport_DeletePassport: String { return self._s[1369]! } - public var Appearance_AppIconFilled: String { return self._s[1370]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1371]! } - public var Month_ShortDecember: String { return self._s[1372]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1374]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1376]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1378]! } + public var Passport_DeletePassport: String { return self._s[1379]! } + public var Appearance_AppIconFilled: String { return self._s[1380]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1381]! } + public var Month_ShortDecember: String { return self._s[1382]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1384]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1375]!, self._r[1375]!, [_0]) + return formatWithArgumentRanges(self._s[1385]!, self._r[1385]!, [_0]) } - public var Channel_Stickers_Searching: String { return self._s[1376]! } - public var Conversation_EncryptedDescription1: String { return self._s[1377]! } - public var Conversation_EncryptedDescription2: String { return self._s[1378]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[1379]! } - public var Conversation_EncryptedDescription3: String { return self._s[1380]! } - public var PhotoEditor_SharpenTool: String { return self._s[1381]! } + public var Channel_Stickers_Searching: String { return self._s[1386]! } + public var Conversation_EncryptedDescription1: String { return self._s[1387]! } + public var Conversation_EncryptedDescription2: String { return self._s[1388]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[1389]! } + public var Conversation_EncryptedDescription3: String { return self._s[1390]! } + public var PhotoEditor_SharpenTool: String { return self._s[1391]! } public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1382]!, self._r[1382]!, [_0]) + return formatWithArgumentRanges(self._s[1392]!, self._r[1392]!, [_0]) } - public var Conversation_EncryptedDescription4: String { return self._s[1384]! } - public var Channel_Members_AddMembers: String { return self._s[1385]! } - public var Wallpaper_Search: String { return self._s[1386]! } - public var Weekday_Friday: String { return self._s[1387]! } - public var Privacy_ContactsSync: String { return self._s[1388]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1389]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1390]! } + public var Conversation_EncryptedDescription4: String { return self._s[1394]! } + public var Channel_Members_AddMembers: String { return self._s[1395]! } + public var Wallpaper_Search: String { return self._s[1396]! } + public var Weekday_Friday: String { return self._s[1397]! } + public var Privacy_ContactsSync: String { return self._s[1398]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1399]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1400]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1391]!, self._r[1391]!, [_0]) + return formatWithArgumentRanges(self._s[1401]!, self._r[1401]!, [_0]) } - public var GroupInfo_Permissions_Removed: String { return self._s[1392]! } - public var Passport_Identity_GenderMale: String { return self._s[1393]! } + public var GroupInfo_Permissions_Removed: String { return self._s[1402]! } + public var Passport_Identity_GenderMale: String { return self._s[1403]! } public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1394]!, self._r[1394]!, [_0]) + return formatWithArgumentRanges(self._s[1404]!, self._r[1404]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1395]! } - public var Conversation_JumpToDate: String { return self._s[1396]! } - public var Contacts_GlobalSearch: String { return self._s[1397]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1398]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[1399]! } - public var Profile_MessageLifetime1d: String { return self._s[1400]! } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1405]! } + public var Conversation_JumpToDate: String { return self._s[1406]! } + public var Contacts_GlobalSearch: String { return self._s[1407]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1408]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[1409]! } + public var Profile_MessageLifetime1d: String { return self._s[1410]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1401]!, self._r[1401]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1411]!, self._r[1411]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1404]! } + public var StickerPack_BuiltinPackName: String { return self._s[1414]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1405]!, self._r[1405]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1415]!, self._r[1415]!, [_1, _2]) } - public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1406]! } - public var Passport_InfoTitle: String { return self._s[1408]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1409]! } + public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[1416]! } + public var Passport_InfoTitle: String { return self._s[1418]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1419]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1413]!, self._r[1413]!, [_0]) + return formatWithArgumentRanges(self._s[1423]!, self._r[1423]!, [_0]) } public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1414]!, self._r[1414]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1424]!, self._r[1424]!, [_1, _2]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1415]! } - public var Profile_BotInfo: String { return self._s[1416]! } - public var Watch_Compose_CreateMessage: String { return self._s[1417]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1418]! } - public var Month_ShortNovember: String { return self._s[1419]! } - public var Conversation_ScamWarning: String { return self._s[1420]! } - public var Wallpaper_SetCustomBackground: String { return self._s[1421]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1422]! } - public var NotificationsSound_Chime: String { return self._s[1423]! } - public var Passport_Language_ko: String { return self._s[1425]! } - public var InviteText_URL: String { return self._s[1426]! } - public var TextFormat_Monospace: String { return self._s[1427]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1425]! } + public var Profile_BotInfo: String { return self._s[1426]! } + public var Watch_Compose_CreateMessage: String { return self._s[1427]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1428]! } + public var Month_ShortNovember: String { return self._s[1429]! } + public var Conversation_ScamWarning: String { return self._s[1430]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1431]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1432]! } + public var NotificationsSound_Chime: String { return self._s[1433]! } + public var Passport_Language_ko: String { return self._s[1435]! } + public var InviteText_URL: String { return self._s[1436]! } + public var TextFormat_Monospace: String { return self._s[1437]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1428]!, self._r[1428]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1438]!, self._r[1438]!, [_1, _2, _3]) } + public var EditTheme_Edit_BottomInfo: String { return self._s[1439]! } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1429]!, self._r[1429]!, [_0]) + return formatWithArgumentRanges(self._s[1440]!, self._r[1440]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1430]!, self._r[1430]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1441]!, self._r[1441]!, [_1, _2]) } - public var EditTheme_CreateTitle: String { return self._s[1432]! } - public var Passport_InfoLearnMore: String { return self._s[1433]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1434]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1435]! } - public var Your_card_has_expired: String { return self._s[1436]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1437]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1438]! } - public var Conversation_Report: String { return self._s[1442]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1443]! } - public var Notification_MessageLifetime1m: String { return self._s[1444]! } - public var Privacy_ContactsTitle: String { return self._s[1445]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1446]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1447]! } - public var Channel_Members_Title: String { return self._s[1448]! } - public var Map_OpenInWaze: String { return self._s[1449]! } - public var Login_PhoneBannedError: String { return self._s[1450]! } + public var EditTheme_CreateTitle: String { return self._s[1443]! } + public var Passport_InfoLearnMore: String { return self._s[1444]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1445]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1446]! } + public var Your_card_has_expired: String { return self._s[1447]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1448]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1449]! } + public var Conversation_Report: String { return self._s[1453]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1454]! } + public var Notification_MessageLifetime1m: String { return self._s[1455]! } + public var Privacy_ContactsTitle: String { return self._s[1456]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1457]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1458]! } + public var Channel_Members_Title: String { return self._s[1459]! } + public var Map_OpenInWaze: String { return self._s[1460]! } + public var Login_PhoneBannedError: String { return self._s[1461]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1451]!, self._r[1451]!, [_0]) - } - public var Group_Management_AddModeratorHelp: String { return self._s[1452]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[1453]! } - public var Common_OK: String { return self._s[1454]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1455]! } - public var Cache_Music: String { return self._s[1456]! } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1457]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1458]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1459]! } - public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1460]!, self._r[1460]!, [_1]) - } - public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1461]!, self._r[1461]!, [_0]) - } - public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1462]!, self._r[1462]!, [_0]) } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1464]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1465]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1467]! } - public var State_ConnectingToProxyInfo: String { return self._s[1468]! } - public var Message_VideoMessage: String { return self._s[1470]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1471]! } - public var ContactInfo_PhoneLabelOther: String { return self._s[1472]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1473]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1474]! } - public var WallpaperPreview_SwipeBottomText: String { return self._s[1475]! } - public var Activity_RecordingAudio: String { return self._s[1476]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[1477]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1478]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1463]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[1464]! } + public var Common_OK: String { return self._s[1465]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1466]! } + public var Cache_Music: String { return self._s[1467]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1468]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1469]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1470]! } + public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1471]!, self._r[1471]!, [_1]) + } + public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1472]!, self._r[1472]!, [_0]) + } + public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1473]!, self._r[1473]!, [_0]) + } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1475]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1476]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1478]! } + public var State_ConnectingToProxyInfo: String { return self._s[1479]! } + public var Message_VideoMessage: String { return self._s[1481]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1482]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1483]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1484]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1485]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[1486]! } + public var Activity_RecordingAudio: String { return self._s[1487]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[1488]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1489]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1480]!, self._r[1480]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1491]!, self._r[1491]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1484]!, self._r[1484]!, [_0]) + return formatWithArgumentRanges(self._s[1495]!, self._r[1495]!, [_0]) } - public var Conversation_ApplyLocalization: String { return self._s[1485]! } - public var UserInfo_AddPhone: String { return self._s[1486]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1487]! } + public var Conversation_ApplyLocalization: String { return self._s[1496]! } + public var UserInfo_AddPhone: String { return self._s[1497]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1498]! } public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1488]!, self._r[1488]!, [_0]) + return formatWithArgumentRanges(self._s[1499]!, self._r[1499]!, [_0]) } - public var Passport_Scans: String { return self._s[1490]! } - public var BlockedUsers_Unblock: String { return self._s[1491]! } + public var Passport_Scans: String { return self._s[1501]! } + public var BlockedUsers_Unblock: String { return self._s[1502]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1492]!, self._r[1492]!, [_1]) + return formatWithArgumentRanges(self._s[1503]!, self._r[1503]!, [_1]) } - public var Channel_Management_LabelCreator: String { return self._s[1493]! } - public var Conversation_ReportSpamAndLeave: String { return self._s[1494]! } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1495]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1496]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1497]! } + public var Channel_Management_LabelCreator: String { return self._s[1504]! } + public var Conversation_ReportSpamAndLeave: String { return self._s[1505]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1506]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1507]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1508]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1498]!, self._r[1498]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1509]!, self._r[1509]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1499]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1500]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1501]! } - public var ChannelIntro_CreateChannel: String { return self._s[1502]! } - public var Conversation_UnreadMessages: String { return self._s[1503]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1504]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1505]! } - public var Notification_GroupActivated: String { return self._s[1506]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1507]! } + public var Login_PhoneNumberHelp: String { return self._s[1510]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1511]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1512]! } + public var ChannelIntro_CreateChannel: String { return self._s[1513]! } + public var Conversation_UnreadMessages: String { return self._s[1514]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1515]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1516]! } + public var Notification_GroupActivated: String { return self._s[1517]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1518]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1508]!, self._r[1508]!, [_0]) + return formatWithArgumentRanges(self._s[1519]!, self._r[1519]!, [_0]) } public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1509]!, self._r[1509]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1520]!, self._r[1520]!, [_0, _1]) } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1511]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1522]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1512]!, self._r[1512]!, [_0]) + return formatWithArgumentRanges(self._s[1523]!, self._r[1523]!, [_0]) } - public var Undo_DeletedChannel: String { return self._s[1513]! } - public var CallFeedback_AddComment: String { return self._s[1514]! } + public var Undo_DeletedChannel: String { return self._s[1524]! } + public var CallFeedback_AddComment: String { return self._s[1525]! } public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1515]!, self._r[1515]!, [_0]) + return formatWithArgumentRanges(self._s[1526]!, self._r[1526]!, [_0]) } - public var Document_TargetConfirmationFormat: String { return self._s[1516]! } + public var Document_TargetConfirmationFormat: String { return self._s[1527]! } public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1517]!, self._r[1517]!, [_0]) + return formatWithArgumentRanges(self._s[1528]!, self._r[1528]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[1518]! } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[1529]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1519]!, self._r[1519]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[1530]!, self._r[1530]!, [_1, _2, _3, _4]) } - public var Theme_ErrorNotFound: String { return self._s[1520]! } - public var Contacts_SortByName: String { return self._s[1521]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1522]! } + public var Theme_ErrorNotFound: String { return self._s[1531]! } + public var Contacts_SortByName: String { return self._s[1532]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1533]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1524]!, self._r[1524]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1535]!, self._r[1535]!, [_1, _2, _3]) } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1525]! } - public var ScheduledMessages_EditTime: String { return self._s[1526]! } - public var Conversation_ClearSelfHistory: String { return self._s[1527]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1528]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[1529]! } - public var Stickers_SuggestNone: String { return self._s[1530]! } - public var ChatSettings_Cache: String { return self._s[1531]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1532]! } - public var Media_ShareThisPhoto: String { return self._s[1533]! } - public var Chat_SlowmodeTooltipPending: String { return self._s[1534]! } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[1535]! } - public var Conversation_ContextMenuCopyLink: String { return self._s[1536]! } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1537]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1538]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1539]! } - public var Permissions_CellularDataTitle_v0: String { return self._s[1540]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1542]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1543]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[1544]! } - public var Map_OpenIn: String { return self._s[1545]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1536]! } + public var ScheduledMessages_EditTime: String { return self._s[1537]! } + public var Conversation_ClearSelfHistory: String { return self._s[1538]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1539]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[1540]! } + public var Stickers_SuggestNone: String { return self._s[1541]! } + public var ChatSettings_Cache: String { return self._s[1542]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1543]! } + public var Media_ShareThisPhoto: String { return self._s[1544]! } + public var Chat_SlowmodeTooltipPending: String { return self._s[1545]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1546]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1547]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1548]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1549]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1550]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1551]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1553]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1554]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[1555]! } + public var Map_OpenIn: String { return self._s[1556]! } public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1548]!, self._r[1548]!, [_1]) + return formatWithArgumentRanges(self._s[1559]!, self._r[1559]!, [_1]) } public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1549]!, self._r[1549]!, [_0]) + return formatWithArgumentRanges(self._s[1560]!, self._r[1560]!, [_0]) } - public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1550]! } - public var MessagePoll_LabelClosed: String { return self._s[1551]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1553]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1554]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[1555]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1556]! } - public var Login_SelectCountry_Title: String { return self._s[1557]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1558]! } + public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1561]! } + public var MessagePoll_LabelClosed: String { return self._s[1562]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1564]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1565]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1566]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1567]! } + public var Login_SelectCountry_Title: String { return self._s[1568]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1569]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1559]!, self._r[1559]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1570]!, self._r[1570]!, [_1, _2]) } - public var Channel_AdminLog_ChangeInfo: String { return self._s[1560]! } - public var Watch_Suggestion_BRB: String { return self._s[1561]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[1562]! } - public var Contacts_PermissionsTitle: String { return self._s[1563]! } - public var Conversation_RestrictedInline: String { return self._s[1564]! } - public var StickerPack_ViewPack: String { return self._s[1566]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1571]! } + public var Watch_Suggestion_BRB: String { return self._s[1572]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1573]! } + public var Contacts_PermissionsTitle: String { return self._s[1574]! } + public var Conversation_RestrictedInline: String { return self._s[1575]! } + public var StickerPack_ViewPack: String { return self._s[1577]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1567]!, self._r[1567]!, [_0]) + return formatWithArgumentRanges(self._s[1578]!, self._r[1578]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1569]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1572]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1574]! } - public var Channel_Info_Stickers: String { return self._s[1575]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1576]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1577]! } - public var Passport_DeletePersonalDetails: String { return self._s[1578]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1579]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1580]! } - public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1581]! } - public var Conversation_SearchNoResults: String { return self._s[1583]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1584]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1585]! } - public var Login_Code: String { return self._s[1586]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1587]! } - public var Weekday_ShortThursday: String { return self._s[1588]! } - public var Resolve_ErrorNotFound: String { return self._s[1590]! } - public var LastSeen_Offline: String { return self._s[1591]! } - public var PeopleNearby_NoMembers: String { return self._s[1592]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1593]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1594]! } - public var GroupInfo_Title: String { return self._s[1596]! } - public var NotificationsSound_Note: String { return self._s[1597]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1598]! } - public var Watch_Message_Poll: String { return self._s[1599]! } - public var Privacy_Calls: String { return self._s[1600]! } + public var Compose_NewChannel: String { return self._s[1580]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1583]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1585]! } + public var Channel_Info_Stickers: String { return self._s[1586]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1587]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1588]! } + public var Passport_DeletePersonalDetails: String { return self._s[1589]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1590]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1591]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1592]! } + public var Conversation_SearchNoResults: String { return self._s[1594]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1595]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1596]! } + public var Login_Code: String { return self._s[1597]! } + public var EditTheme_Create_BottomInfo: String { return self._s[1598]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1599]! } + public var Weekday_ShortThursday: String { return self._s[1600]! } + public var Resolve_ErrorNotFound: String { return self._s[1602]! } + public var LastSeen_Offline: String { return self._s[1603]! } + public var PeopleNearby_NoMembers: String { return self._s[1604]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1605]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1606]! } + public var GroupInfo_Title: String { return self._s[1608]! } + public var NotificationsSound_Note: String { return self._s[1609]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1610]! } + public var Watch_Message_Poll: String { return self._s[1611]! } + public var Privacy_Calls: String { return self._s[1612]! } public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1601]!, self._r[1601]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1613]!, self._r[1613]!, [_1, _2, _3]) } - public var Month_ShortAugust: String { return self._s[1602]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1603]! } - public var Notifications_Reset: String { return self._s[1604]! } - public var Conversation_Pin: String { return self._s[1605]! } - public var Passport_Language_lv: String { return self._s[1606]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1607]! } - public var BlockedUsers_Info: String { return self._s[1608]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1610]! } - public var Watch_Conversation_Unblock: String { return self._s[1612]! } + public var Month_ShortAugust: String { return self._s[1614]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1615]! } + public var Notifications_Reset: String { return self._s[1616]! } + public var Conversation_Pin: String { return self._s[1617]! } + public var Passport_Language_lv: String { return self._s[1618]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1619]! } + public var BlockedUsers_Info: String { return self._s[1620]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1622]! } + public var Watch_Conversation_Unblock: String { return self._s[1624]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1613]!, self._r[1613]!, [_0]) + return formatWithArgumentRanges(self._s[1625]!, self._r[1625]!, [_0]) } - public var CloudStorage_Title: String { return self._s[1614]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1615]! } + public var CloudStorage_Title: String { return self._s[1626]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1627]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1616]!, self._r[1616]!, [_0]) + return formatWithArgumentRanges(self._s[1628]!, self._r[1628]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1617]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1618]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1619]! } - public var Passport_Address_EditBankStatement: String { return self._s[1620]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1629]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1630]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1631]! } + public var Passport_Address_EditBankStatement: String { return self._s[1632]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1621]!, self._r[1621]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1633]!, self._r[1633]!, [_1, _2]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1622]! } - public var ShareMenu_Comment: String { return self._s[1623]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1624]! } - public var Notifications_PermissionsTitle: String { return self._s[1625]! } - public var GroupPermission_NoSendLinks: String { return self._s[1626]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1627]! } - public var Settings_Support: String { return self._s[1628]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1629]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1630]! } - public var Privacy_Forwards_Preview: String { return self._s[1631]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1632]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1633]! } - public var Common_Select: String { return self._s[1635]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1636]! } - public var WallpaperSearch_ColorGray: String { return self._s[1638]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1639]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1640]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1641]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1642]! } - public var Widget_AuthRequired: String { return self._s[1643]! } - public var Camera_FlashOn: String { return self._s[1644]! } - public var Conversation_ContextMenuLookUp: String { return self._s[1645]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1646]! } - public var Watch_Suggestion_OK: String { return self._s[1647]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1634]! } + public var ShareMenu_Comment: String { return self._s[1635]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1636]! } + public var Notifications_PermissionsTitle: String { return self._s[1637]! } + public var GroupPermission_NoSendLinks: String { return self._s[1638]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1639]! } + public var Settings_Support: String { return self._s[1640]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1641]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1642]! } + public var Privacy_Forwards_Preview: String { return self._s[1643]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1644]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1645]! } + public var Common_Select: String { return self._s[1647]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1648]! } + public var WallpaperSearch_ColorGray: String { return self._s[1650]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1651]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1652]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1653]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1654]! } + public var Widget_AuthRequired: String { return self._s[1655]! } + public var Camera_FlashOn: String { return self._s[1656]! } + public var Conversation_ContextMenuLookUp: String { return self._s[1657]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1658]! } + public var Watch_Suggestion_OK: String { return self._s[1659]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1649]!, self._r[1649]!, [_0]) + return formatWithArgumentRanges(self._s[1661]!, self._r[1661]!, [_0]) } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1651]!, self._r[1651]!, [_0]) + return formatWithArgumentRanges(self._s[1663]!, self._r[1663]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[1652]! } - public var DialogList_AdLabel: String { return self._s[1653]! } - public var WatchRemote_NotificationText: String { return self._s[1654]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1655]! } - public var Conversation_ReportSpam: String { return self._s[1656]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1657]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1659]! } - public var PhoneLabel_Title: String { return self._s[1660]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1661]! } - public var Settings_ChangePhoneNumber: String { return self._s[1662]! } - public var Notifications_ExceptionsTitle: String { return self._s[1663]! } - public var Notifications_AlertTones: String { return self._s[1664]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1665]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1666]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1667]! } - public var VoiceOver_Chat_Photo: String { return self._s[1669]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1670]! } - public var ReportPeer_ReasonOther: String { return self._s[1671]! } - public var KeyCommand_ScrollDown: String { return self._s[1673]! } - public var Conversation_ScheduleMessage_Title: String { return self._s[1674]! } + public var TextFormat_Strikethrough: String { return self._s[1664]! } + public var DialogList_AdLabel: String { return self._s[1665]! } + public var WatchRemote_NotificationText: String { return self._s[1666]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1667]! } + public var Conversation_ReportSpam: String { return self._s[1668]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1669]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1671]! } + public var PhoneLabel_Title: String { return self._s[1672]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1673]! } + public var Settings_ChangePhoneNumber: String { return self._s[1674]! } + public var Notifications_ExceptionsTitle: String { return self._s[1675]! } + public var Notifications_AlertTones: String { return self._s[1676]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1677]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1678]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1679]! } + public var VoiceOver_Chat_Photo: String { return self._s[1681]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1682]! } + public var ReportPeer_ReasonOther: String { return self._s[1683]! } + public var KeyCommand_ScrollDown: String { return self._s[1685]! } + public var Conversation_ScheduleMessage_Title: String { return self._s[1686]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1675]!, self._r[1675]!, [_0]) + return formatWithArgumentRanges(self._s[1687]!, self._r[1687]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1676]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1677]! } - public var AuthSessions_LogOut: String { return self._s[1678]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1679]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1680]! } - public var Passport_Phone_Title: String { return self._s[1681]! } - public var Settings_PhoneNumber: String { return self._s[1682]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1688]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1689]! } + public var AuthSessions_LogOut: String { return self._s[1690]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1691]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1692]! } + public var Passport_Phone_Title: String { return self._s[1693]! } + public var Settings_PhoneNumber: String { return self._s[1694]! } public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1683]!, self._r[1683]!, [_0]) + return formatWithArgumentRanges(self._s[1695]!, self._r[1695]!, [_0]) } - public var NotificationsSound_Alert: String { return self._s[1684]! } - public var WebSearch_SearchNoResults: String { return self._s[1685]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1687]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1688]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1689]! } - public var PhotoEditor_CurvesTool: String { return self._s[1690]! } - public var Checkout_PaymentMethod: String { return self._s[1692]! } + public var NotificationsSound_Alert: String { return self._s[1696]! } + public var WebSearch_SearchNoResults: String { return self._s[1697]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1699]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1700]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1701]! } + public var PhotoEditor_CurvesTool: String { return self._s[1702]! } + public var Checkout_PaymentMethod: String { return self._s[1704]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1693]!, self._r[1693]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1705]!, self._r[1705]!, [_1, _2]) } - public var Contacts_AccessDeniedError: String { return self._s[1694]! } - public var Camera_PhotoMode: String { return self._s[1697]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1699]! } - public var CallSettings_OnMobile: String { return self._s[1700]! } - public var Tour_Text2: String { return self._s[1701]! } + public var Contacts_AccessDeniedError: String { return self._s[1706]! } + public var Camera_PhotoMode: String { return self._s[1709]! } + public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1710]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1712]! } + public var CallSettings_OnMobile: String { return self._s[1713]! } + public var Tour_Text2: String { return self._s[1714]! } public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1702]!, self._r[1702]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1715]!, self._r[1715]!, [_1, _2]) } - public var DialogList_EncryptionProcessing: String { return self._s[1704]! } - public var Permissions_Skip: String { return self._s[1705]! } - public var SecretImage_Title: String { return self._s[1706]! } - public var Watch_MessageView_Title: String { return self._s[1707]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1708]! } - public var AttachmentMenu_Poll: String { return self._s[1709]! } + public var DialogList_EncryptionProcessing: String { return self._s[1717]! } + public var Permissions_Skip: String { return self._s[1718]! } + public var SecretImage_Title: String { return self._s[1719]! } + public var Watch_MessageView_Title: String { return self._s[1720]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1721]! } + public var AttachmentMenu_Poll: String { return self._s[1722]! } public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1710]!, self._r[1710]!, [_0]) + return formatWithArgumentRanges(self._s[1723]!, self._r[1723]!, [_0]) } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1711]!, self._r[1711]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1724]!, self._r[1724]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1712]! } - public var WallpaperPreview_Title: String { return self._s[1713]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1714]! } - public var Settings_ProxyConnecting: String { return self._s[1715]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1717]! } - public var VoiceOver_Chat_YourVideo: String { return self._s[1718]! } - public var Profile_MessageLifetime5s: String { return self._s[1719]! } - public var Username_InvalidCharacters: String { return self._s[1720]! } - public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1721]! } - public var ScheduledMessages_ClearAll: String { return self._s[1722]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1723]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1724]! } - public var Settings_AddAccount: String { return self._s[1725]! } - public var Notification_CreatedChannel: String { return self._s[1728]! } + public var Notification_CallCanceled: String { return self._s[1725]! } + public var WallpaperPreview_Title: String { return self._s[1726]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1727]! } + public var Settings_ProxyConnecting: String { return self._s[1728]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1730]! } + public var VoiceOver_Chat_YourVideo: String { return self._s[1731]! } + public var Profile_MessageLifetime5s: String { return self._s[1732]! } + public var Username_InvalidCharacters: String { return self._s[1733]! } + public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1734]! } + public var ScheduledMessages_ClearAll: String { return self._s[1735]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1736]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1737]! } + public var Settings_AddAccount: String { return self._s[1738]! } + public var Notification_CreatedChannel: String { return self._s[1741]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1729]!, self._r[1729]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1742]!, self._r[1742]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1731]! } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1732]! } - public var VoiceOver_Media_PlaybackStop: String { return self._s[1733]! } - public var Contacts_TopSection: String { return self._s[1734]! } + public var Passcode_AppLockedAlert: String { return self._s[1744]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1745]! } + public var VoiceOver_Media_PlaybackStop: String { return self._s[1746]! } + public var Contacts_TopSection: String { return self._s[1747]! } public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1735]!, self._r[1735]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1748]!, self._r[1748]!, [_0, _1]) } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1736]!, self._r[1736]!, [_0]) - } - public var ReportPeer_ReasonSpam: String { return self._s[1737]! } - public var UserInfo_TapToCall: String { return self._s[1738]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1740]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1741]! } - public var Common_Search: String { return self._s[1742]! } - public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1743]! } - public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1744]!, self._r[1744]!, [_0]) - } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1745]! } - public var Message_InvoiceLabel: String { return self._s[1746]! } - public var Conversation_InputTextPlaceholder: String { return self._s[1747]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1748]! } - public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1749]!, self._r[1749]!, [_0]) } - public var Conversation_Info: String { return self._s[1750]! } - public var Login_InfoDeletePhoto: String { return self._s[1751]! } - public var Passport_Language_vi: String { return self._s[1753]! } - public var UserInfo_ScamUserWarning: String { return self._s[1754]! } - public var Conversation_Search: String { return self._s[1755]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1756]! } - public var ReportPeer_ReasonPornography: String { return self._s[1757]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1758]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1759]! } - public var Map_LiveLocationGroupDescription: String { return self._s[1760]! } - public var Channel_Setup_TypeHeader: String { return self._s[1761]! } - public var AuthSessions_LoggedIn: String { return self._s[1762]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1763]! } - public var Login_SmsRequestState3: String { return self._s[1764]! } - public var Passport_Address_EditUtilityBill: String { return self._s[1765]! } - public var Appearance_ReduceMotionInfo: String { return self._s[1766]! } - public var Join_ChannelsTooMuch: String { return self._s[1767]! } - public var Channel_Edit_LinkItem: String { return self._s[1768]! } - public var Privacy_Calls_P2PNever: String { return self._s[1769]! } - public var Conversation_AddToReadingList: String { return self._s[1771]! } - public var Share_MultipleMessagesDisabled: String { return self._s[1772]! } - public var Message_Animation: String { return self._s[1773]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[1774]! } - public var Map_Unknown: String { return self._s[1775]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[1776]! } + public var ReportPeer_ReasonSpam: String { return self._s[1750]! } + public var UserInfo_TapToCall: String { return self._s[1751]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1753]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1754]! } + public var Common_Search: String { return self._s[1755]! } + public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1756]! } + public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1757]!, self._r[1757]!, [_0]) + } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1758]! } + public var Message_InvoiceLabel: String { return self._s[1759]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1760]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1761]! } + public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1762]!, self._r[1762]!, [_0]) + } + public var Conversation_Info: String { return self._s[1763]! } + public var Login_InfoDeletePhoto: String { return self._s[1764]! } + public var Passport_Language_vi: String { return self._s[1766]! } + public var UserInfo_ScamUserWarning: String { return self._s[1767]! } + public var Conversation_Search: String { return self._s[1768]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1770]! } + public var ReportPeer_ReasonPornography: String { return self._s[1771]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[1772]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1773]! } + public var Map_LiveLocationGroupDescription: String { return self._s[1774]! } + public var Channel_Setup_TypeHeader: String { return self._s[1775]! } + public var AuthSessions_LoggedIn: String { return self._s[1776]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1777]! } + public var Login_SmsRequestState3: String { return self._s[1778]! } + public var Passport_Address_EditUtilityBill: String { return self._s[1779]! } + public var Appearance_ReduceMotionInfo: String { return self._s[1780]! } + public var Join_ChannelsTooMuch: String { return self._s[1781]! } + public var Channel_Edit_LinkItem: String { return self._s[1782]! } + public var Privacy_Calls_P2PNever: String { return self._s[1783]! } + public var Conversation_AddToReadingList: String { return self._s[1785]! } + public var Share_MultipleMessagesDisabled: String { return self._s[1786]! } + public var Message_Animation: String { return self._s[1787]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[1788]! } + public var Map_Unknown: String { return self._s[1789]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[1790]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1777]!, self._r[1777]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1791]!, self._r[1791]!, [_1, _2]) } public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1778]!, self._r[1778]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1792]!, self._r[1792]!, [_1, _2]) } - public var Call_StatusRequesting: String { return self._s[1779]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[1780]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1781]! } + public var Call_StatusRequesting: String { return self._s[1793]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[1794]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1795]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1782]!, self._r[1782]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1796]!, self._r[1796]!, [_1, _2]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1783]!, self._r[1783]!, [_0]) + return formatWithArgumentRanges(self._s[1797]!, self._r[1797]!, [_0]) } - public var Update_Skip: String { return self._s[1784]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1785]! } - public var Message_PinnedPollMessage: String { return self._s[1786]! } - public var BlockedUsers_Title: String { return self._s[1787]! } + public var Update_Skip: String { return self._s[1798]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1799]! } + public var Message_PinnedPollMessage: String { return self._s[1800]! } + public var BlockedUsers_Title: String { return self._s[1801]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1788]!, self._r[1788]!, [_1]) + return formatWithArgumentRanges(self._s[1802]!, self._r[1802]!, [_1]) } - public var Username_CheckingUsername: String { return self._s[1789]! } - public var NotificationsSound_Bell: String { return self._s[1790]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[1791]! } - public var Weekday_Monday: String { return self._s[1792]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1793]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1794]! } - public var ChatSettings_Groups: String { return self._s[1795]! } + public var Username_CheckingUsername: String { return self._s[1803]! } + public var NotificationsSound_Bell: String { return self._s[1804]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[1805]! } + public var Weekday_Monday: String { return self._s[1806]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1807]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1808]! } + public var ChatSettings_Groups: String { return self._s[1809]! } public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1796]!, self._r[1796]!, [_0]) - } - public var Your_card_was_declined: String { return self._s[1797]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1799]! } - public var ChatList_Unmute: String { return self._s[1800]! } - public var PhotoEditor_CurvesAll: String { return self._s[1801]! } - public var Weekday_ShortTuesday: String { return self._s[1802]! } - public var DialogList_Read: String { return self._s[1803]! } - public var Appearance_AppIconClassic: String { return self._s[1804]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1805]! } - public var Passport_Identity_Gender: String { return self._s[1806]! } - public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1807]!, self._r[1807]!, [_0]) - } - public var Target_SelectGroup: String { return self._s[1808]! } - public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1810]!, self._r[1810]!, [_0]) } - public var Passport_Language_en: String { return self._s[1811]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1812]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1813]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[1814]! } - public var ScheduledMessages_SendNow: String { return self._s[1815]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[1817]! } - public var Login_InfoHelp: String { return self._s[1818]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1819]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1820]! } + public var Your_card_was_declined: String { return self._s[1811]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1813]! } + public var ChatList_Unmute: String { return self._s[1814]! } + public var PhotoEditor_CurvesAll: String { return self._s[1815]! } + public var Weekday_ShortTuesday: String { return self._s[1816]! } + public var DialogList_Read: String { return self._s[1817]! } + public var Appearance_AppIconClassic: String { return self._s[1818]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1819]! } + public var Passport_Identity_Gender: String { return self._s[1820]! } + public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1821]!, self._r[1821]!, [_0]) + } + public var Target_SelectGroup: String { return self._s[1822]! } + public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1824]!, self._r[1824]!, [_0]) + } + public var Passport_Language_en: String { return self._s[1825]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1826]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1827]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[1828]! } + public var ScheduledMessages_SendNow: String { return self._s[1829]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[1831]! } + public var Login_InfoHelp: String { return self._s[1832]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1833]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1834]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1821]!, self._r[1821]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1835]!, self._r[1835]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[1824]! } - public var CreatePoll_Title: String { return self._s[1825]! } - public var Conversation_ViewTheme: String { return self._s[1826]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1827]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1828]! } - public var UserInfo_GroupsInCommon: String { return self._s[1829]! } - public var Call_AudioRouteHide: String { return self._s[1830]! } - public var ContactInfo_PhoneLabelMobile: String { return self._s[1832]! } + public var SocksProxySetup_AddProxy: String { return self._s[1838]! } + public var CreatePoll_Title: String { return self._s[1839]! } + public var Conversation_ViewTheme: String { return self._s[1840]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1841]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1842]! } + public var UserInfo_GroupsInCommon: String { return self._s[1843]! } + public var Call_AudioRouteHide: String { return self._s[1844]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[1846]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1833]!, self._r[1833]!, [_0]) - } - public var TextFormat_Bold: String { return self._s[1834]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[1835]! } - public var Notifications_Title: String { return self._s[1836]! } - public var Group_Username_InvalidTooShort: String { return self._s[1837]! } - public var Channel_ErrorAddTooMuch: String { return self._s[1838]! } - public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1839]!, self._r[1839]!, ["\(_0)"]) - } - public var VoiceOver_DiscardPreparedContent: String { return self._s[1841]! } - public var Stickers_SuggestAdded: String { return self._s[1842]! } - public var Login_CountryCode: String { return self._s[1843]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[1844]! } - public var Map_GetDirections: String { return self._s[1845]! } - public var Login_PhoneFloodError: String { return self._s[1846]! } - public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1847]!, self._r[1847]!, [_0]) } - public var Settings_SetUsername: String { return self._s[1849]! } - public var Group_Location_ChangeLocation: String { return self._s[1850]! } - public var Notification_GroupInviterSelf: String { return self._s[1851]! } - public var InstantPage_TapToOpenLink: String { return self._s[1852]! } + public var TextFormat_Bold: String { return self._s[1848]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[1849]! } + public var Notifications_Title: String { return self._s[1850]! } + public var Group_Username_InvalidTooShort: String { return self._s[1851]! } + public var Channel_ErrorAddTooMuch: String { return self._s[1852]! } + public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1853]!, self._r[1853]!, ["\(_0)"]) + } + public var VoiceOver_DiscardPreparedContent: String { return self._s[1855]! } + public var Stickers_SuggestAdded: String { return self._s[1856]! } + public var Login_CountryCode: String { return self._s[1857]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[1858]! } + public var Map_GetDirections: String { return self._s[1859]! } + public var Login_PhoneFloodError: String { return self._s[1860]! } + public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1861]!, self._r[1861]!, [_0]) + } + public var Settings_SetUsername: String { return self._s[1863]! } + public var Group_Location_ChangeLocation: String { return self._s[1864]! } + public var Notification_GroupInviterSelf: String { return self._s[1865]! } + public var InstantPage_TapToOpenLink: String { return self._s[1866]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1853]!, self._r[1853]!, [_0]) + return formatWithArgumentRanges(self._s[1867]!, self._r[1867]!, [_0]) } - public var Watch_Suggestion_TalkLater: String { return self._s[1854]! } - public var SecretChat_Title: String { return self._s[1855]! } - public var Group_UpgradeNoticeText1: String { return self._s[1856]! } - public var AuthSessions_Title: String { return self._s[1857]! } + public var Watch_Suggestion_TalkLater: String { return self._s[1868]! } + public var SecretChat_Title: String { return self._s[1869]! } + public var Group_UpgradeNoticeText1: String { return self._s[1870]! } + public var AuthSessions_Title: String { return self._s[1871]! } public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1858]!, self._r[1858]!, [_0]) + return formatWithArgumentRanges(self._s[1872]!, self._r[1872]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[1859]! } - public var Channel_About_Title: String { return self._s[1860]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[1861]! } + public var PhotoEditor_CropAuto: String { return self._s[1873]! } + public var Channel_About_Title: String { return self._s[1874]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[1875]! } public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1863]!, self._r[1863]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1877]!, self._r[1877]!, ["\(_0)"]) } - public var VoiceOver_MessageContextReport: String { return self._s[1864]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1866]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[1867]! } + public var VoiceOver_MessageContextReport: String { return self._s[1878]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1880]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[1881]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1868]!, self._r[1868]!, [_1]) + return formatWithArgumentRanges(self._s[1882]!, self._r[1882]!, [_1]) } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1870]!, self._r[1870]!, [_0]) + return formatWithArgumentRanges(self._s[1884]!, self._r[1884]!, [_0]) } public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1871]!, self._r[1871]!, [_0]) - } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[1872]! } - public var Presence_online: String { return self._s[1874]! } - public var PasscodeSettings_Title: String { return self._s[1875]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1876]! } - public var Web_OpenExternal: String { return self._s[1877]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[1879]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[1880]! } - public var LocalGroup_Title: String { return self._s[1881]! } - public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1882]!, self._r[1882]!, [_0]) - } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[1883]! } - public var Map_YouAreHere: String { return self._s[1884]! } - public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1885]!, self._r[1885]!, [_0]) } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[1886]! } + public var Presence_online: String { return self._s[1888]! } + public var PasscodeSettings_Title: String { return self._s[1889]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1890]! } + public var Web_OpenExternal: String { return self._s[1891]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[1893]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[1894]! } + public var LocalGroup_Title: String { return self._s[1895]! } + public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1896]!, self._r[1896]!, [_0]) + } + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[1897]! } + public var Map_YouAreHere: String { return self._s[1898]! } + public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1899]!, self._r[1899]!, [_0]) + } public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1886]!, self._r[1886]!, [_0]) - } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[1887]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[1888]! } - public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1889]!, self._r[1889]!, [_0]) - } - public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1890]!, self._r[1890]!, [_0]) - } - public var SocksProxySetup_Username: String { return self._s[1891]! } - public var Bot_Start: String { return self._s[1892]! } - public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1893]!, self._r[1893]!, [_0]) - } - public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1894]!, self._r[1894]!, [_0]) - } - public var Contacts_SortByPresence: String { return self._s[1895]! } - public var AccentColor_Title: String { return self._s[1897]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[1898]! } - public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1899]!, self._r[1899]!, [_1, _2]) - } - public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1900]!, self._r[1900]!, [_0]) } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[1901]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[1902]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1903]!, self._r[1903]!, [_0]) + } + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1904]!, self._r[1904]!, [_0]) + } + public var SocksProxySetup_Username: String { return self._s[1905]! } + public var Bot_Start: String { return self._s[1906]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1907]!, self._r[1907]!, [_0]) + } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1908]!, self._r[1908]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[1909]! } + public var AccentColor_Title: String { return self._s[1911]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[1912]! } + public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1913]!, self._r[1913]!, [_1, _2]) + } + public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1914]!, self._r[1914]!, [_0]) + } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1915]!, self._r[1915]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[1902]! } - public var Login_InfoAvatarPhoto: String { return self._s[1903]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[1904]! } - public var Tour_Title4: String { return self._s[1905]! } - public var Passport_Identity_Translation: String { return self._s[1906]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1907]! } - public var Login_TermsOfServiceLabel: String { return self._s[1909]! } - public var Passport_Language_it: String { return self._s[1910]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1911]! } - public var Passport_Identity_SelfieHelp: String { return self._s[1912]! } - public var Conversation_ClearAll: String { return self._s[1914]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[1916]! } - public var TwoStepAuth_FloodError: String { return self._s[1917]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[1916]! } + public var Login_InfoAvatarPhoto: String { return self._s[1917]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[1918]! } + public var Tour_Title4: String { return self._s[1919]! } + public var Passport_Identity_Translation: String { return self._s[1920]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1921]! } + public var Login_TermsOfServiceLabel: String { return self._s[1923]! } + public var Passport_Language_it: String { return self._s[1924]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1925]! } + public var Passport_Identity_SelfieHelp: String { return self._s[1926]! } + public var Conversation_ClearAll: String { return self._s[1928]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[1930]! } + public var TwoStepAuth_FloodError: String { return self._s[1931]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1918]!, self._r[1918]!, [_1]) + return formatWithArgumentRanges(self._s[1932]!, self._r[1932]!, [_1]) } - public var Paint_Delete: String { return self._s[1919]! } - public var Privacy_AddNewPeer: String { return self._s[1920]! } + public var Paint_Delete: String { return self._s[1933]! } + public var Privacy_AddNewPeer: String { return self._s[1934]! } public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1921]!, self._r[1921]!, [_1]) + return formatWithArgumentRanges(self._s[1935]!, self._r[1935]!, [_1]) } - public var LogoutOptions_SetPasscodeText: String { return self._s[1922]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[1936]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1923]!, self._r[1923]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1937]!, self._r[1937]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[1924]! } + public var Message_PinnedAudioMessage: String { return self._s[1938]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1925]!, self._r[1925]!, [_0]) + return formatWithArgumentRanges(self._s[1939]!, self._r[1939]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[1926]! } - public var Notifications_GroupNotificationsSound: String { return self._s[1927]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[1928]! } - public var Conversation_MessageEditedLabel: String { return self._s[1929]! } - public var Notification_Exceptions_AlwaysOff: String { return self._s[1930]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[1931]! } + public var Notification_Mute1hMin: String { return self._s[1940]! } + public var Notifications_GroupNotificationsSound: String { return self._s[1941]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[1942]! } + public var Conversation_MessageEditedLabel: String { return self._s[1943]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[1944]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[1945]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1932]!, self._r[1932]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1946]!, self._r[1946]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[1933]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[1947]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1934]!, self._r[1934]!, [_1]) + return formatWithArgumentRanges(self._s[1948]!, self._r[1948]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[1935]! } - public var Month_GenOctober: String { return self._s[1936]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[1937]! } - public var EnterPasscode_EnterPasscode: String { return self._s[1938]! } - public var MediaPicker_TimerTooltip: String { return self._s[1940]! } - public var SharedMedia_TitleAll: String { return self._s[1941]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[1944]! } - public var Conversation_RestrictedMedia: String { return self._s[1945]! } - public var AccessDenied_PhotosRestricted: String { return self._s[1946]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[1948]! } - public var ChangePhoneNumberCode_Called: String { return self._s[1949]! } + public var AccessDenied_LocationTracking: String { return self._s[1949]! } + public var Month_GenOctober: String { return self._s[1950]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[1951]! } + public var EnterPasscode_EnterPasscode: String { return self._s[1952]! } + public var MediaPicker_TimerTooltip: String { return self._s[1954]! } + public var SharedMedia_TitleAll: String { return self._s[1955]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[1958]! } + public var Conversation_RestrictedMedia: String { return self._s[1959]! } + public var AccessDenied_PhotosRestricted: String { return self._s[1960]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[1962]! } + public var ChangePhoneNumberCode_Called: String { return self._s[1963]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1950]!, self._r[1950]!, [_0]) + return formatWithArgumentRanges(self._s[1964]!, self._r[1964]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[1953]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[1955]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[1956]! } + public var Conversation_SavedMessages: String { return self._s[1967]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[1969]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[1970]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1958]!, self._r[1958]!, [_0]) + return formatWithArgumentRanges(self._s[1972]!, self._r[1972]!, [_0]) } - public var VoiceOver_Chat_YourMessage: String { return self._s[1959]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[1973]! } public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1960]!, self._r[1960]!, [_0]) + return formatWithArgumentRanges(self._s[1974]!, self._r[1974]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[1961]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[1962]! } + public var ReportPeer_AlertSuccess: String { return self._s[1975]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[1976]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1963]!, self._r[1963]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1977]!, self._r[1977]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[1964]! } - public var PhotoEditor_FadeTool: String { return self._s[1965]! } - public var Privacy_ContactsReset: String { return self._s[1966]! } + public var Checkout_PasswordEntry_Title: String { return self._s[1978]! } + public var PhotoEditor_FadeTool: String { return self._s[1979]! } + public var Privacy_ContactsReset: String { return self._s[1980]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1968]!, self._r[1968]!, [_0]) + return formatWithArgumentRanges(self._s[1982]!, self._r[1982]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[1969]! } - public var ChatList_Mute: String { return self._s[1970]! } - public var Permissions_CellularDataText_v0: String { return self._s[1971]! } - public var ShareMenu_SelectChats: String { return self._s[1973]! } - public var MusicPlayer_VoiceNote: String { return self._s[1974]! } - public var Conversation_RestrictedText: String { return self._s[1975]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[1976]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[1977]! } - public var Cache_Videos: String { return self._s[1978]! } - public var PrivacySettings_PhoneNumber: String { return self._s[1979]! } - public var FeatureDisabled_Oops: String { return self._s[1981]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[1982]! } + public var Message_PinnedVideoMessage: String { return self._s[1983]! } + public var ChatList_Mute: String { return self._s[1984]! } + public var Permissions_CellularDataText_v0: String { return self._s[1985]! } + public var ShareMenu_SelectChats: String { return self._s[1988]! } + public var MusicPlayer_VoiceNote: String { return self._s[1989]! } + public var Conversation_RestrictedText: String { return self._s[1990]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[1991]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[1992]! } + public var Cache_Videos: String { return self._s[1993]! } + public var PrivacySettings_PhoneNumber: String { return self._s[1994]! } + public var FeatureDisabled_Oops: String { return self._s[1996]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[1997]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1983]!, self._r[1983]!, [_0]) + return formatWithArgumentRanges(self._s[1998]!, self._r[1998]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[1984]! } - public var GroupPermission_NoSendPolls: String { return self._s[1985]! } - public var Message_VideoExpired: String { return self._s[1987]! } - public var Notifications_Badge: String { return self._s[1988]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[1989]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[1990]! } - public var Username_InvalidTooShort: String { return self._s[1991]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[1992]! } - public var Channel_AdminLog_PinMessages: String { return self._s[1993]! } - public var ArchivedChats_IntroTitle3: String { return self._s[1994]! } + public var Stickers_GroupStickersHelp: String { return self._s[1999]! } + public var GroupPermission_NoSendPolls: String { return self._s[2000]! } + public var Message_VideoExpired: String { return self._s[2002]! } + public var Notifications_Badge: String { return self._s[2003]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[2004]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[2005]! } + public var Username_InvalidTooShort: String { return self._s[2006]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2007]! } + public var Channel_AdminLog_PinMessages: String { return self._s[2008]! } + public var ArchivedChats_IntroTitle3: String { return self._s[2009]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1995]!, self._r[1995]!, [_1]) + return formatWithArgumentRanges(self._s[2010]!, self._r[2010]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[1996]! } - public var Conversation_DefaultRestrictedText: String { return self._s[1997]! } - public var SharedMedia_CategoryDocs: String { return self._s[2000]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[2011]! } + public var Conversation_DefaultRestrictedText: String { return self._s[2012]! } + public var SharedMedia_CategoryDocs: String { return self._s[2015]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2001]!, self._r[2001]!, [_1]) + return formatWithArgumentRanges(self._s[2016]!, self._r[2016]!, [_1]) } - public var Privacy_Forwards_NeverLink: String { return self._s[2003]! } + public var Privacy_Forwards_NeverLink: String { return self._s[2018]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2004]!, self._r[2004]!, [_1]) + return formatWithArgumentRanges(self._s[2019]!, self._r[2019]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2005]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2020]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2006]!, self._r[2006]!, [_0]) + return formatWithArgumentRanges(self._s[2021]!, self._r[2021]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[2007]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2008]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[2009]! } - public var Channel_UpdatePhotoItem: String { return self._s[2010]! } - public var GroupInfo_LeftStatus: String { return self._s[2011]! } - public var Watch_MessageView_Forward: String { return self._s[2013]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[2014]! } - public var Cache_ClearEmpty: String { return self._s[2016]! } - public var Localization_LanguageName: String { return self._s[2017]! } - public var WebSearch_GIFs: String { return self._s[2018]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2019]! } - public var Username_InvalidStartsWithNumber: String { return self._s[2020]! } - public var Common_Back: String { return self._s[2021]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2022]! } + public var ChatSettings_PrivateChats: String { return self._s[2022]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2023]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[2024]! } + public var Channel_UpdatePhotoItem: String { return self._s[2025]! } + public var GroupInfo_LeftStatus: String { return self._s[2026]! } + public var Watch_MessageView_Forward: String { return self._s[2028]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[2029]! } + public var Cache_ClearEmpty: String { return self._s[2031]! } + public var Localization_LanguageName: String { return self._s[2032]! } + public var WebSearch_GIFs: String { return self._s[2033]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2034]! } + public var Username_InvalidStartsWithNumber: String { return self._s[2035]! } + public var Common_Back: String { return self._s[2036]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2037]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2023]!, self._r[2023]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2038]!, self._r[2038]!, [_1, _2]) } - public var Passport_Email_Help: String { return self._s[2024]! } - public var Watch_Conversation_Reply: String { return self._s[2026]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[2028]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2029]! } - public var Channel_BanUser_Unban: String { return self._s[2031]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2032]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2033]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2035]! } - public var Passport_Identity_Name: String { return self._s[2036]! } + public var Passport_Email_Help: String { return self._s[2039]! } + public var Watch_Conversation_Reply: String { return self._s[2041]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[2043]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2044]! } + public var Channel_BanUser_Unban: String { return self._s[2046]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2047]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2048]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2050]! } + public var Passport_Identity_Name: String { return self._s[2051]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2037]!, self._r[2037]!, [_0]) + return formatWithArgumentRanges(self._s[2052]!, self._r[2052]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[2038]! } - public var Conversation_BlockUser: String { return self._s[2039]! } - public var Month_GenJanuary: String { return self._s[2040]! } - public var ChatSettings_TextSize: String { return self._s[2041]! } - public var Notification_PassportValuePhone: String { return self._s[2042]! } - public var Passport_Language_ne: String { return self._s[2043]! } - public var Notification_CallBack: String { return self._s[2044]! } - public var TwoStepAuth_EmailHelp: String { return self._s[2045]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[2053]! } + public var Conversation_BlockUser: String { return self._s[2054]! } + public var Month_GenJanuary: String { return self._s[2055]! } + public var ChatSettings_TextSize: String { return self._s[2056]! } + public var Notification_PassportValuePhone: String { return self._s[2057]! } + public var Passport_Language_ne: String { return self._s[2058]! } + public var Notification_CallBack: String { return self._s[2059]! } + public var TwoStepAuth_EmailHelp: String { return self._s[2060]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2046]!, self._r[2046]!, [_0]) + return formatWithArgumentRanges(self._s[2061]!, self._r[2061]!, [_0]) } - public var Channel_Info_Management: String { return self._s[2047]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[2048]! } - public var Stickers_FrequentlyUsed: String { return self._s[2049]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2050]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2052]! } + public var Channel_Info_Management: String { return self._s[2062]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[2063]! } + public var Stickers_FrequentlyUsed: String { return self._s[2064]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2065]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2067]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2053]!, self._r[2053]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2068]!, self._r[2068]!, [_1, "\(_2)"]) } - public var Passport_Address_EditResidentialAddress: String { return self._s[2054]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[2055]! } - public var CreatePoll_TextHeader: String { return self._s[2056]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[2069]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[2070]! } + public var CreatePoll_TextHeader: String { return self._s[2071]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2057]!, self._r[2057]!, [_0]) + return formatWithArgumentRanges(self._s[2072]!, self._r[2072]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[2058]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2059]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[2061]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[2062]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[2063]! } + public var PhotoEditor_QualityMedium: String { return self._s[2073]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2074]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[2076]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[2077]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[2078]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2064]!, self._r[2064]!, [_0]) + return formatWithArgumentRanges(self._s[2079]!, self._r[2079]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2065]!, self._r[2065]!, [_1]) + return formatWithArgumentRanges(self._s[2080]!, self._r[2080]!, [_1]) } - public var Conversation_LinkDialogOpen: String { return self._s[2067]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[2068]! } - public var Settings_Username: String { return self._s[2070]! } - public var Conversation_Block: String { return self._s[2072]! } - public var Wallpaper_Wallpaper: String { return self._s[2073]! } - public var SocksProxySetup_UseProxy: String { return self._s[2075]! } - public var EditTheme_UploadEditedTheme: String { return self._s[2076]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[2077]! } - public var MessageTimer_Forever: String { return self._s[2078]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[2079]! } - public var PhotoEditor_DiscardChanges: String { return self._s[2080]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2081]! } - public var Passport_Language_da: String { return self._s[2082]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[2083]! } + public var Conversation_LinkDialogOpen: String { return self._s[2082]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[2083]! } + public var Settings_Username: String { return self._s[2085]! } + public var Conversation_Block: String { return self._s[2087]! } + public var Wallpaper_Wallpaper: String { return self._s[2088]! } + public var SocksProxySetup_UseProxy: String { return self._s[2090]! } + public var EditTheme_UploadEditedTheme: String { return self._s[2091]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[2092]! } + public var MessageTimer_Forever: String { return self._s[2093]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[2094]! } + public var PhotoEditor_DiscardChanges: String { return self._s[2095]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2096]! } + public var Passport_Language_da: String { return self._s[2097]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[2098]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2084]!, self._r[2084]!, [_0]) + return formatWithArgumentRanges(self._s[2099]!, self._r[2099]!, [_0]) } - public var Passport_Address_EditPassportRegistration: String { return self._s[2085]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[2100]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2087]!, self._r[2087]!, [_0]) + return formatWithArgumentRanges(self._s[2102]!, self._r[2102]!, [_0]) } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2089]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2090]! } - public var Conversation_PinnedPoll: String { return self._s[2091]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2092]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2104]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2105]! } + public var Conversation_PinnedPoll: String { return self._s[2106]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2107]! } public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2093]!, self._r[2093]!, [_1]) + return formatWithArgumentRanges(self._s[2108]!, self._r[2108]!, [_1]) } - public var WallpaperSearch_ColorPurple: String { return self._s[2094]! } - public var Cache_ByPeerHeader: String { return self._s[2095]! } + public var WallpaperSearch_ColorPurple: String { return self._s[2109]! } + public var Cache_ByPeerHeader: String { return self._s[2110]! } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2096]!, self._r[2096]!, [_0]) + return formatWithArgumentRanges(self._s[2111]!, self._r[2111]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[2097]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2100]! } - public var Notification_PinnedMessage: String { return self._s[2101]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2103]! } - public var Contacts_SortBy: String { return self._s[2104]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2112]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2115]! } + public var Notification_PinnedMessage: String { return self._s[2116]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2118]! } + public var Contacts_SortBy: String { return self._s[2119]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2105]!, self._r[2105]!, [_1]) + return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, [_1]) } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2107]!, self._r[2107]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2122]!, self._r[2122]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[2108]! } - public var Watch_UserInfo_Service: String { return self._s[2109]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2111]! } - public var Conversation_Unpin: String { return self._s[2113]! } - public var CancelResetAccount_Title: String { return self._s[2114]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2115]! } + public var Call_EncryptionKey_Title: String { return self._s[2123]! } + public var Watch_UserInfo_Service: String { return self._s[2124]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2126]! } + public var Conversation_Unpin: String { return self._s[2128]! } + public var CancelResetAccount_Title: String { return self._s[2129]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2130]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2117]!, self._r[2117]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2132]!, self._r[2132]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2118]! } - public var CallSettings_Title: String { return self._s[2119]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2120]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2122]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2123]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2133]! } + public var CallSettings_Title: String { return self._s[2134]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2135]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2137]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2138]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2124]!, self._r[2124]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2139]!, self._r[2139]!, [_1, _2]) } - public var Passport_Identity_DocumentDetails: String { return self._s[2125]! } - public var LoginPassword_PasswordHelp: String { return self._s[2126]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2127]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2128]! } - public var Checkout_TotalPaidAmount: String { return self._s[2129]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2140]! } + public var LoginPassword_PasswordHelp: String { return self._s[2141]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2142]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2143]! } + public var Checkout_TotalPaidAmount: String { return self._s[2144]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_0]) + return formatWithArgumentRanges(self._s[2145]!, self._r[2145]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[2131]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2133]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2134]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2146]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2148]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2149]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2135]!, self._r[2135]!, [_1]) + return formatWithArgumentRanges(self._s[2150]!, self._r[2150]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2136]! } - public var Contacts_InviteFriends: String { return self._s[2138]! } - public var Map_ChooseLocationTitle: String { return self._s[2139]! } - public var Conversation_StopPoll: String { return self._s[2141]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2151]! } + public var Contacts_InviteFriends: String { return self._s[2153]! } + public var Map_ChooseLocationTitle: String { return self._s[2154]! } + public var Conversation_StopPoll: String { return self._s[2156]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2142]!, self._r[2142]!, [_0]) + return formatWithArgumentRanges(self._s[2157]!, self._r[2157]!, [_0]) } - public var Call_Camera: String { return self._s[2143]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2144]! } - public var Calls_RatingFeedback: String { return self._s[2145]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2146]! } - public var NotificationsSound_Pulse: String { return self._s[2147]! } - public var Watch_LastSeen_Lately: String { return self._s[2148]! } - public var ReportGroupLocation_Report: String { return self._s[2151]! } - public var Widget_NoUsers: String { return self._s[2152]! } - public var Conversation_UnvotePoll: String { return self._s[2153]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2155]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2156]! } - public var NotificationsSound_Circles: String { return self._s[2157]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2159]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2160]! } - public var Proxy_TooltipUnavailable: String { return self._s[2161]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2163]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2165]! } - public var Conversation_FileDropbox: String { return self._s[2166]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2167]! } - public var Tour_Text3: String { return self._s[2169]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2171]! } - public var GroupPermission_NoSendMessages: String { return self._s[2172]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2173]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2174]! } + public var Call_Camera: String { return self._s[2158]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2159]! } + public var Calls_RatingFeedback: String { return self._s[2160]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2161]! } + public var NotificationsSound_Pulse: String { return self._s[2162]! } + public var Watch_LastSeen_Lately: String { return self._s[2163]! } + public var ReportGroupLocation_Report: String { return self._s[2166]! } + public var Widget_NoUsers: String { return self._s[2167]! } + public var Conversation_UnvotePoll: String { return self._s[2168]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2170]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2171]! } + public var NotificationsSound_Circles: String { return self._s[2172]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2175]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2176]! } + public var Proxy_TooltipUnavailable: String { return self._s[2177]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2179]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2181]! } + public var Conversation_FileDropbox: String { return self._s[2182]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2183]! } + public var Tour_Text3: String { return self._s[2185]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2187]! } + public var GroupPermission_NoSendMessages: String { return self._s[2188]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2189]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2190]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2176]!, self._r[2176]!, [_0]) + return formatWithArgumentRanges(self._s[2192]!, self._r[2192]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2177]! } - public var Checkout_ShippingOption_Title: String { return self._s[2178]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2179]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2193]! } + public var Checkout_ShippingOption_Title: String { return self._s[2194]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2195]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2180]!, self._r[2180]!, [_0]) + return formatWithArgumentRanges(self._s[2196]!, self._r[2196]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2181]!, self._r[2181]!, [_0]) + return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2182]! } - public var EditTheme_FileReadError: String { return self._s[2183]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2184]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2185]! } - public var AutoDownloadSettings_Photos: String { return self._s[2187]! } - public var Appearance_PreviewIncomingText: String { return self._s[2188]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2189]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2190]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2191]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2192]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2193]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2194]! } - public var Notification_SecretChatScreenshot: String { return self._s[2195]! } - public var AccessDenied_Wallpapers: String { return self._s[2196]! } - public var Passport_Address_City: String { return self._s[2198]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2199]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2200]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2201]! } - public var AccessDenied_LocationDisabled: String { return self._s[2202]! } - public var Group_Location_Title: String { return self._s[2203]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2205]! } - public var GroupInfo_Sound: String { return self._s[2206]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2207]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2208]! } - public var Contacts_Title: String { return self._s[2209]! } - public var Passport_Language_fr: String { return self._s[2210]! } - public var Notifications_ResetAllNotifications: String { return self._s[2211]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2214]! } - public var Checkout_NewCard_Title: String { return self._s[2215]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2216]! } - public var Conversation_ForwardChats: String { return self._s[2217]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2219]! } - public var Settings_FAQ: String { return self._s[2221]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2222]! } - public var Conversation_ContextMenuForward: String { return self._s[2223]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2226]! } - public var PrivacyPolicy_Title: String { return self._s[2229]! } - public var Notifications_TextTone: String { return self._s[2230]! } - public var Profile_CreateNewContact: String { return self._s[2231]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2232]! } - public var Call_Speaker: String { return self._s[2234]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2235]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2237]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2238]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2198]! } + public var EditTheme_FileReadError: String { return self._s[2199]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2200]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2201]! } + public var AutoDownloadSettings_Photos: String { return self._s[2203]! } + public var Appearance_PreviewIncomingText: String { return self._s[2204]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2205]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2206]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2207]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2208]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2209]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2210]! } + public var Notification_SecretChatScreenshot: String { return self._s[2211]! } + public var AccessDenied_Wallpapers: String { return self._s[2212]! } + public var Passport_Address_City: String { return self._s[2214]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2215]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2216]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2217]! } + public var AccessDenied_LocationDisabled: String { return self._s[2218]! } + public var Group_Location_Title: String { return self._s[2219]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2221]! } + public var GroupInfo_Sound: String { return self._s[2222]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2223]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2224]! } + public var Contacts_Title: String { return self._s[2225]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2226]! } + public var Passport_Language_fr: String { return self._s[2227]! } + public var Notifications_ResetAllNotifications: String { return self._s[2228]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2231]! } + public var Checkout_NewCard_Title: String { return self._s[2232]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2233]! } + public var Conversation_ForwardChats: String { return self._s[2234]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2236]! } + public var Settings_FAQ: String { return self._s[2238]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2239]! } + public var Conversation_ContextMenuForward: String { return self._s[2240]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2243]! } + public var PrivacyPolicy_Title: String { return self._s[2246]! } + public var Notifications_TextTone: String { return self._s[2247]! } + public var Profile_CreateNewContact: String { return self._s[2248]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2249]! } + public var Call_Speaker: String { return self._s[2251]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2252]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2254]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2255]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2239]!, self._r[2239]!, [_0]) + return formatWithArgumentRanges(self._s[2256]!, self._r[2256]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2240]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2241]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2242]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2243]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2244]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2245]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2246]! } - public var Bot_Unblock: String { return self._s[2247]! } - public var TextFormat_Italic: String { return self._s[2248]! } - public var WallpaperSearch_ColorPink: String { return self._s[2249]! } - public var Settings_About_Help: String { return self._s[2250]! } - public var SearchImages_Title: String { return self._s[2251]! } - public var Weekday_Wednesday: String { return self._s[2252]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2253]! } - public var ExplicitContent_AlertTitle: String { return self._s[2254]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2257]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2258]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2259]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2260]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2261]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2262]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2263]! } + public var Bot_Unblock: String { return self._s[2264]! } + public var TextFormat_Italic: String { return self._s[2265]! } + public var WallpaperSearch_ColorPink: String { return self._s[2266]! } + public var Settings_About_Help: String { return self._s[2267]! } + public var SearchImages_Title: String { return self._s[2268]! } + public var Weekday_Wednesday: String { return self._s[2269]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2270]! } + public var ExplicitContent_AlertTitle: String { return self._s[2271]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2255]!, self._r[2255]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2272]!, self._r[2272]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2256]! } - public var Weekday_Thursday: String { return self._s[2257]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2258]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2259]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2273]! } + public var Weekday_Thursday: String { return self._s[2274]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2275]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2276]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2260]!, self._r[2260]!, [_0]) + return formatWithArgumentRanges(self._s[2277]!, self._r[2277]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2261]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2262]! } - public var Passport_RequestedInformation: String { return self._s[2263]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2264]! } - public var Conversation_EncryptionProcessing: String { return self._s[2266]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2267]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2269]! } - public var Channel_Setup_Title: String { return self._s[2270]! } - public var Conversation_SearchPlaceholder: String { return self._s[2271]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2272]! } - public var Checkout_ErrorGeneric: String { return self._s[2273]! } - public var Passport_Language_hu: String { return self._s[2274]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2278]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2279]! } + public var Passport_RequestedInformation: String { return self._s[2280]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2281]! } + public var Conversation_EncryptionProcessing: String { return self._s[2283]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2284]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2286]! } + public var Channel_Setup_Title: String { return self._s[2287]! } + public var Conversation_SearchPlaceholder: String { return self._s[2288]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2289]! } + public var Checkout_ErrorGeneric: String { return self._s[2290]! } + public var Passport_Language_hu: String { return self._s[2291]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2276]!, self._r[2276]!, [_0]) + return formatWithArgumentRanges(self._s[2293]!, self._r[2293]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2279]!, self._r[2279]!, [_1]) + return formatWithArgumentRanges(self._s[2296]!, self._r[2296]!, [_1]) } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2280]!, self._r[2280]!, [_0]) + return formatWithArgumentRanges(self._s[2297]!, self._r[2297]!, [_0]) } - public var Group_Location_Info: String { return self._s[2281]! } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2282]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2283]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2284]! } + public var Group_Location_Info: String { return self._s[2298]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2299]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2300]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2301]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2285]!, self._r[2285]!, [_0]) + return formatWithArgumentRanges(self._s[2302]!, self._r[2302]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2286]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2287]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2288]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2289]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2303]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2304]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2305]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2306]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2290]!, self._r[2290]!, [_0]) + return formatWithArgumentRanges(self._s[2307]!, self._r[2307]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2291]! } - public var Message_PinnedAnimationMessage: String { return self._s[2293]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2295]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2296]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2298]! } - public var Embed_PlayingInPIP: String { return self._s[2299]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2300]! } + public var Passport_Language_cs: String { return self._s[2308]! } + public var Message_PinnedAnimationMessage: String { return self._s[2310]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2312]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2313]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2315]! } + public var Embed_PlayingInPIP: String { return self._s[2316]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2317]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2301]!, self._r[2301]!, [_0]) + return formatWithArgumentRanges(self._s[2318]!, self._r[2318]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2302]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2319]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2303]!, self._r[2303]!, [_1]) + return formatWithArgumentRanges(self._s[2320]!, self._r[2320]!, [_1]) } - public var Notification_PaymentSent: String { return self._s[2304]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2305]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2306]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2307]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2308]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2309]! } + public var Notification_PaymentSent: String { return self._s[2321]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2322]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2323]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2324]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2325]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2326]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2312]!, self._r[2312]!, [_1]) + return formatWithArgumentRanges(self._s[2329]!, self._r[2329]!, [_1]) } public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2313]!, self._r[2313]!, [_1]) + return formatWithArgumentRanges(self._s[2330]!, self._r[2330]!, [_1]) } public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2314]!, self._r[2314]!, [_1]) + return formatWithArgumentRanges(self._s[2331]!, self._r[2331]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2316]! } - public var PasscodeSettings_HelpTop: String { return self._s[2317]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2318]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2319]! } - public var EditTheme_ShortLink: String { return self._s[2320]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2321]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2322]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2323]! } - public var Call_Accept: String { return self._s[2325]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2326]! } - public var Month_GenMarch: String { return self._s[2328]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2329]! } - public var LoginPassword_Title: String { return self._s[2330]! } - public var Call_End: String { return self._s[2331]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2332]! } - public var VoiceOver_Chat_Contact: String { return self._s[2333]! } - public var CallSettings_Always: String { return self._s[2334]! } - public var CallFeedback_Success: String { return self._s[2335]! } - public var TwoStepAuth_SetupHint: String { return self._s[2336]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2333]! } + public var PasscodeSettings_HelpTop: String { return self._s[2334]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2335]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2336]! } + public var EditTheme_ShortLink: String { return self._s[2337]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2338]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2339]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2340]! } + public var Call_Accept: String { return self._s[2342]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2343]! } + public var Month_GenMarch: String { return self._s[2345]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2346]! } + public var LoginPassword_Title: String { return self._s[2347]! } + public var Call_End: String { return self._s[2348]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2349]! } + public var VoiceOver_Chat_Contact: String { return self._s[2350]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2351]! } + public var CallSettings_Always: String { return self._s[2352]! } + public var CallFeedback_Success: String { return self._s[2353]! } + public var TwoStepAuth_SetupHint: String { return self._s[2354]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2337]!, self._r[2337]!, [_1]) + return formatWithArgumentRanges(self._s[2355]!, self._r[2355]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2338]! } - public var Login_PhoneTitle: String { return self._s[2339]! } - public var Passport_FieldPhoneHelp: String { return self._s[2340]! } - public var Weekday_ShortSunday: String { return self._s[2341]! } - public var Passport_InfoFAQ_URL: String { return self._s[2342]! } - public var ContactInfo_Job: String { return self._s[2344]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2345]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2346]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2347]! } - public var Invite_ChannelsTooMuch: String { return self._s[2348]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2349]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2350]! } - public var CallFeedback_ReasonNoise: String { return self._s[2351]! } - public var Appearance_AppIconDefault: String { return self._s[2353]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2354]! } - public var MediaPicker_AddCaption: String { return self._s[2355]! } - public var CallSettings_TabIconDescription: String { return self._s[2356]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2356]! } + public var Login_PhoneTitle: String { return self._s[2357]! } + public var Passport_FieldPhoneHelp: String { return self._s[2358]! } + public var Weekday_ShortSunday: String { return self._s[2359]! } + public var Passport_InfoFAQ_URL: String { return self._s[2360]! } + public var ContactInfo_Job: String { return self._s[2362]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2363]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2364]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2365]! } + public var Invite_ChannelsTooMuch: String { return self._s[2366]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2367]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2368]! } + public var CallFeedback_ReasonNoise: String { return self._s[2369]! } + public var Appearance_AppIconDefault: String { return self._s[2371]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2372]! } + public var MediaPicker_AddCaption: String { return self._s[2373]! } + public var CallSettings_TabIconDescription: String { return self._s[2374]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2357]!, self._r[2357]!, [_0]) + return formatWithArgumentRanges(self._s[2375]!, self._r[2375]!, [_0]) } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2358]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2359]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2360]! } - public var DialogList_SearchSectionRecent: String { return self._s[2361]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2362]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2365]! } - public var LastSeen_WithinAWeek: String { return self._s[2366]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2367]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2369]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2370]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2376]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2377]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2378]! } + public var DialogList_SearchSectionRecent: String { return self._s[2379]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2380]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2383]! } + public var LastSeen_WithinAWeek: String { return self._s[2384]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2385]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2387]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2388]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2371]!, self._r[2371]!, [_0]) + return formatWithArgumentRanges(self._s[2389]!, self._r[2389]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2372]! } - public var Conversation_StatusLeftGroup: String { return self._s[2373]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2374]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2376]! } - public var GroupPermission_AddSuccess: String { return self._s[2377]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2379]! } - public var Conversation_ContextMenuCopy: String { return self._s[2380]! } - public var AccessDenied_CallMicrophone: String { return self._s[2381]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2390]! } + public var Conversation_StatusLeftGroup: String { return self._s[2391]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2392]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2394]! } + public var GroupPermission_AddSuccess: String { return self._s[2395]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2397]! } + public var Conversation_ContextMenuCopy: String { return self._s[2398]! } + public var AccessDenied_CallMicrophone: String { return self._s[2399]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2382]!, self._r[2382]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2400]!, self._r[2400]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2383]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2384]! } - public var Checkout_PaymentMethod_New: String { return self._s[2385]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2386]! } - public var PhotoEditor_QualityTool: String { return self._s[2387]! } - public var Login_SendCodeViaSms: String { return self._s[2388]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2389]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2390]! } - public var Login_EmailNotConfiguredError: String { return self._s[2391]! } - public var SocksProxySetup_Status: String { return self._s[2392]! } - public var PrivacyPolicy_Accept: String { return self._s[2393]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2394]! } - public var Appearance_AppIconClassicX: String { return self._s[2395]! } + public var Login_InvalidFirstNameError: String { return self._s[2401]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2402]! } + public var Checkout_PaymentMethod_New: String { return self._s[2403]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2404]! } + public var PhotoEditor_QualityTool: String { return self._s[2405]! } + public var Login_SendCodeViaSms: String { return self._s[2406]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2407]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2408]! } + public var Login_EmailNotConfiguredError: String { return self._s[2409]! } + public var SocksProxySetup_Status: String { return self._s[2410]! } + public var PrivacyPolicy_Accept: String { return self._s[2411]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2412]! } + public var Appearance_AppIconClassicX: String { return self._s[2413]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2396]!, self._r[2396]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2414]!, self._r[2414]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2397]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2398]! } - public var AutoNightTheme_Automatic: String { return self._s[2399]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2400]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2401]! } - public var Cache_Help: String { return self._s[2402]! } - public var Group_ErrorAccessDenied: String { return self._s[2403]! } - public var Passport_Language_fa: String { return self._s[2404]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2405]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2406]! } - public var PrivacySettings_LastSeen: String { return self._s[2407]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2415]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2416]! } + public var AutoNightTheme_Automatic: String { return self._s[2417]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2418]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2419]! } + public var Cache_Help: String { return self._s[2420]! } + public var Group_ErrorAccessDenied: String { return self._s[2421]! } + public var Passport_Language_fa: String { return self._s[2422]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2423]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2424]! } + public var PrivacySettings_LastSeen: String { return self._s[2425]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2408]!, self._r[2408]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2426]!, self._r[2426]!, [_0, _1]) } - public var Preview_SaveGif: String { return self._s[2412]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2413]! } - public var Profile_About: String { return self._s[2414]! } - public var Channel_About_Placeholder: String { return self._s[2415]! } - public var Login_InfoTitle: String { return self._s[2416]! } + public var Preview_SaveGif: String { return self._s[2430]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2431]! } + public var Profile_About: String { return self._s[2432]! } + public var Channel_About_Placeholder: String { return self._s[2433]! } + public var Login_InfoTitle: String { return self._s[2434]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2417]!, self._r[2417]!, [_0]) + return formatWithArgumentRanges(self._s[2435]!, self._r[2435]!, [_0]) } - public var Watch_Suggestion_CantTalk: String { return self._s[2419]! } - public var ContactInfo_Title: String { return self._s[2420]! } - public var Media_ShareThisVideo: String { return self._s[2421]! } - public var Weekday_ShortFriday: String { return self._s[2422]! } - public var AccessDenied_Contacts: String { return self._s[2424]! } - public var Notification_CallIncomingShort: String { return self._s[2425]! } - public var Group_Setup_TypePublic: String { return self._s[2426]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2427]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2428]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2431]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2432]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2433]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2434]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2435]! } - public var DialogList_Typing: String { return self._s[2436]! } - public var CallFeedback_IncludeLogs: String { return self._s[2438]! } - public var Checkout_Phone: String { return self._s[2440]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2443]! } - public var Privacy_Calls_Integration: String { return self._s[2444]! } - public var Notifications_PermissionsAllow: String { return self._s[2445]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2449]! } - public var Settings_ChatSettings: String { return self._s[2450]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2436]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2438]! } + public var ContactInfo_Title: String { return self._s[2439]! } + public var Media_ShareThisVideo: String { return self._s[2440]! } + public var Weekday_ShortFriday: String { return self._s[2441]! } + public var AccessDenied_Contacts: String { return self._s[2443]! } + public var Notification_CallIncomingShort: String { return self._s[2444]! } + public var Group_Setup_TypePublic: String { return self._s[2445]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2446]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2447]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2450]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2451]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2452]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2453]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2454]! } + public var DialogList_Typing: String { return self._s[2455]! } + public var CallFeedback_IncludeLogs: String { return self._s[2457]! } + public var Checkout_Phone: String { return self._s[2459]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2462]! } + public var Privacy_Calls_Integration: String { return self._s[2463]! } + public var Notifications_PermissionsAllow: String { return self._s[2464]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2468]! } + public var Settings_ChatSettings: String { return self._s[2469]! } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2451]!, self._r[2451]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2470]!, self._r[2470]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2453]! } + public var GroupRemoved_DeleteUser: String { return self._s[2472]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2454]!, self._r[2454]!, [_0]) + return formatWithArgumentRanges(self._s[2473]!, self._r[2473]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2455]!, self._r[2455]!, [_1]) + return formatWithArgumentRanges(self._s[2474]!, self._r[2474]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2456]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2457]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2459]! } - public var Conversation_Unblock: String { return self._s[2460]! } - public var PrivacySettings_DataSettings: String { return self._s[2461]! } - public var Group_PublicLink_Info: String { return self._s[2462]! } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2463]! } + public var Login_ContinueWithLocalization: String { return self._s[2475]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2476]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2478]! } + public var Conversation_Unblock: String { return self._s[2479]! } + public var PrivacySettings_DataSettings: String { return self._s[2480]! } + public var Group_PublicLink_Info: String { return self._s[2481]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2482]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2464]!, self._r[2464]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2483]!, self._r[2483]!, [_0, _1]) } - public var PrivacySettings_Passcode: String { return self._s[2467]! } - public var Call_Mute: String { return self._s[2468]! } - public var Passport_Language_dz: String { return self._s[2469]! } - public var Passport_Language_tk: String { return self._s[2470]! } + public var PrivacySettings_Passcode: String { return self._s[2486]! } + public var Call_Mute: String { return self._s[2487]! } + public var Passport_Language_dz: String { return self._s[2488]! } + public var Passport_Language_tk: String { return self._s[2489]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2471]!, self._r[2471]!, [_0]) + return formatWithArgumentRanges(self._s[2490]!, self._r[2490]!, [_0]) } - public var Settings_Search: String { return self._s[2472]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2473]! } - public var Conversation_ContextMenuReply: String { return self._s[2474]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2475]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2476]! } - public var Tour_Title1: String { return self._s[2477]! } - public var Conversation_ClearGroupHistory: String { return self._s[2479]! } - public var WallpaperPreview_Motion: String { return self._s[2480]! } + public var Settings_Search: String { return self._s[2491]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2492]! } + public var Conversation_ContextMenuReply: String { return self._s[2493]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2494]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2495]! } + public var Tour_Title1: String { return self._s[2496]! } + public var Conversation_ClearGroupHistory: String { return self._s[2498]! } + public var WallpaperPreview_Motion: String { return self._s[2499]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2481]!, self._r[2481]!, [_0]) + return formatWithArgumentRanges(self._s[2500]!, self._r[2500]!, [_0]) } - public var Call_RateCall: String { return self._s[2482]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2483]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2484]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2485]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2487]! } + public var Call_RateCall: String { return self._s[2501]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2502]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2503]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2504]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2506]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2489]!, self._r[2489]!, [_0]) + return formatWithArgumentRanges(self._s[2508]!, self._r[2508]!, [_0]) } - public var Compose_Create: String { return self._s[2490]! } - public var Contacts_InviteToTelegram: String { return self._s[2491]! } - public var GroupInfo_Notifications: String { return self._s[2492]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2494]! } - public var Month_GenApril: String { return self._s[2495]! } - public var Appearance_AutoNightTheme: String { return self._s[2496]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2498]! } - public var Login_CodeSentSms: String { return self._s[2500]! } + public var Compose_Create: String { return self._s[2509]! } + public var Contacts_InviteToTelegram: String { return self._s[2510]! } + public var GroupInfo_Notifications: String { return self._s[2511]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2513]! } + public var Month_GenApril: String { return self._s[2514]! } + public var Appearance_AutoNightTheme: String { return self._s[2515]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2517]! } + public var Login_CodeSentSms: String { return self._s[2519]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2501]!, self._r[2501]!, [_0]) - } - public var EmptyGroupInfo_Line3: String { return self._s[2502]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2503]! } - public var Passport_Language_hr: String { return self._s[2504]! } - public var Common_ActionNotAllowedError: String { return self._s[2505]! } - public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2506]!, self._r[2506]!, [_0]) - } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2507]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2508]! } - public var Privacy_SecretChatsTitle: String { return self._s[2509]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2511]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2512]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2513]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2514]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2515]! } - public var Preview_DeleteGif: String { return self._s[2516]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2517]! } - public var Group_ErrorNotMutualContact: String { return self._s[2518]! } - public var Notification_MessageLifetime5s: String { return self._s[2519]! } - public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2520]!, self._r[2520]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2521]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2523]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2524]! } - public var Passport_Address_AddBankStatement: String { return self._s[2525]! } - public var Notification_CallIncoming: String { return self._s[2526]! } - public var Compose_NewGroupTitle: String { return self._s[2527]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2529]! } - public var Passport_Address_Postcode: String { return self._s[2531]! } - public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2532]!, self._r[2532]!, [_0]) + public var EmptyGroupInfo_Line3: String { return self._s[2521]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2522]! } + public var Passport_Language_hr: String { return self._s[2523]! } + public var Common_ActionNotAllowedError: String { return self._s[2524]! } + public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2525]!, self._r[2525]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2533]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2534]! } - public var WallpaperColors_Title: String { return self._s[2535]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2536]! } - public var VoiceOver_MessageContextForward: String { return self._s[2537]! } - public var GroupPermission_Duration: String { return self._s[2538]! } - public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2526]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2527]! } + public var Privacy_SecretChatsTitle: String { return self._s[2528]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2530]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2531]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2532]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2533]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2534]! } + public var Preview_DeleteGif: String { return self._s[2535]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2536]! } + public var Group_ErrorNotMutualContact: String { return self._s[2537]! } + public var Notification_MessageLifetime5s: String { return self._s[2538]! } + public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2539]!, self._r[2539]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2540]! } - public var Username_Placeholder: String { return self._s[2541]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2542]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2543]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2544]! } - public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2546]!, self._r[2546]!, [_1, _2]) + public var VoiceOver_Chat_Video: String { return self._s[2540]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2542]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2543]! } + public var Passport_Address_AddBankStatement: String { return self._s[2544]! } + public var Notification_CallIncoming: String { return self._s[2545]! } + public var Compose_NewGroupTitle: String { return self._s[2546]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2548]! } + public var Passport_Address_Postcode: String { return self._s[2550]! } + public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2551]!, self._r[2551]!, [_0]) } - public var Passport_PasswordDescription: String { return self._s[2547]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2548]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2549]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2550]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2551]! } - public var Conversation_ContextMenuMore: String { return self._s[2552]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2553]! } - public var CallSettings_TabIcon: String { return self._s[2554]! } - public var KeyCommand_Find: String { return self._s[2555]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2556]! } - public var Message_PinnedGame: String { return self._s[2557]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2558]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2560]! } - public var Login_CallRequestState2: String { return self._s[2562]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2564]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2552]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2553]! } + public var WallpaperColors_Title: String { return self._s[2554]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2555]! } + public var VoiceOver_MessageContextForward: String { return self._s[2556]! } + public var GroupPermission_Duration: String { return self._s[2557]! } + public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2558]!, self._r[2558]!, [_0]) + } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2559]! } + public var Username_Placeholder: String { return self._s[2560]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2561]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2562]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2563]! } + public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2565]!, self._r[2565]!, [_1, _2]) + } + public var Passport_PasswordDescription: String { return self._s[2566]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2567]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2568]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2569]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2570]! } + public var Conversation_ContextMenuMore: String { return self._s[2571]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2572]! } + public var CallSettings_TabIcon: String { return self._s[2573]! } + public var KeyCommand_Find: String { return self._s[2574]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2575]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2576]! } + public var Message_PinnedGame: String { return self._s[2577]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2578]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2580]! } + public var Login_CallRequestState2: String { return self._s[2582]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2584]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2565]!, self._r[2565]!, [_0]) + return formatWithArgumentRanges(self._s[2585]!, self._r[2585]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2567]!, self._r[2567]!, [_0]) + return formatWithArgumentRanges(self._s[2587]!, self._r[2587]!, [_0]) } - public var WallpaperPreview_Blurred: String { return self._s[2568]! } - public var Conversation_InstantPagePreview: String { return self._s[2569]! } + public var WallpaperPreview_Blurred: String { return self._s[2588]! } + public var Conversation_InstantPagePreview: String { return self._s[2589]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2570]!, self._r[2570]!, [_0]) + return formatWithArgumentRanges(self._s[2590]!, self._r[2590]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2573]! } - public var WallpaperSearch_ColorRed: String { return self._s[2574]! } - public var GroupPermission_NoPinMessages: String { return self._s[2575]! } - public var Passport_Language_es: String { return self._s[2576]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2578]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2579]! } + public var SecretTimer_VideoDescription: String { return self._s[2593]! } + public var WallpaperSearch_ColorRed: String { return self._s[2594]! } + public var GroupPermission_NoPinMessages: String { return self._s[2595]! } + public var Passport_Language_es: String { return self._s[2596]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2598]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2599]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2580]!, self._r[2580]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2600]!, self._r[2600]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2581]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2582]! } - public var Watch_UserInfo_Unmute: String { return self._s[2583]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2584]! } - public var AccessDenied_CameraRestricted: String { return self._s[2586]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2601]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2602]! } + public var Watch_UserInfo_Unmute: String { return self._s[2603]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2604]! } + public var AccessDenied_CameraRestricted: String { return self._s[2606]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2587]!, self._r[2587]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2607]!, self._r[2607]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2589]! } - public var Settings_CopyUsername: String { return self._s[2590]! } - public var Contacts_SearchLabel: String { return self._s[2591]! } - public var Map_OpenInYandexNavigator: String { return self._s[2593]! } - public var PasscodeSettings_EncryptData: String { return self._s[2594]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2595]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2596]! } - public var DialogList_AdNoticeAlert: String { return self._s[2597]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2599]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2600]! } - public var Localization_LanguageCustom: String { return self._s[2601]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2602]! } - public var CallFeedback_Title: String { return self._s[2603]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2606]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2607]! } - public var Conversation_InfoGroup: String { return self._s[2608]! } - public var Compose_NewMessage: String { return self._s[2609]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2610]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2611]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2612]! } + public var ChatList_ReadAll: String { return self._s[2609]! } + public var Settings_CopyUsername: String { return self._s[2610]! } + public var Contacts_SearchLabel: String { return self._s[2611]! } + public var Map_OpenInYandexNavigator: String { return self._s[2613]! } + public var PasscodeSettings_EncryptData: String { return self._s[2614]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2615]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2616]! } + public var DialogList_AdNoticeAlert: String { return self._s[2617]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2619]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2620]! } + public var Localization_LanguageCustom: String { return self._s[2621]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2622]! } + public var CallFeedback_Title: String { return self._s[2623]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2626]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2627]! } + public var Conversation_InfoGroup: String { return self._s[2628]! } + public var Compose_NewMessage: String { return self._s[2629]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2630]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2631]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2632]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2613]!, self._r[2613]!, [_0]) + return formatWithArgumentRanges(self._s[2633]!, self._r[2633]!, [_0]) + } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2634]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2635]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2636]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2637]! } + public var Channel_BlackList_Title: String { return self._s[2638]! } + public var UserInfo_PhoneCall: String { return self._s[2639]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2641]! } + public var State_connecting: String { return self._s[2642]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2643]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[2644]! } + public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2645]!, self._r[2645]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2614]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2615]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2616]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2617]! } - public var Channel_BlackList_Title: String { return self._s[2618]! } - public var UserInfo_PhoneCall: String { return self._s[2619]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2621]! } - public var State_connecting: String { return self._s[2622]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2623]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2624]! } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2625]!, self._r[2625]!, [_0]) + return formatWithArgumentRanges(self._s[2646]!, self._r[2646]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2626]! } - public var Passport_Identity_EditPassport: String { return self._s[2627]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2629]! } - public var Localization_EnglishLanguageName: String { return self._s[2630]! } - public var Share_AuthDescription: String { return self._s[2631]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2632]! } - public var Passport_Identity_Surname: String { return self._s[2633]! } - public var Compose_TokenListPlaceholder: String { return self._s[2634]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[2635]! } - public var Settings_AboutEmpty: String { return self._s[2636]! } - public var Conversation_Unmute: String { return self._s[2637]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[2639]! } + public var Notifications_GroupNotifications: String { return self._s[2647]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2648]! } + public var Passport_Identity_EditPassport: String { return self._s[2649]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2651]! } + public var Localization_EnglishLanguageName: String { return self._s[2652]! } + public var Share_AuthDescription: String { return self._s[2653]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2654]! } + public var Passport_Identity_Surname: String { return self._s[2655]! } + public var Compose_TokenListPlaceholder: String { return self._s[2656]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2657]! } + public var Settings_AboutEmpty: String { return self._s[2658]! } + public var Conversation_Unmute: String { return self._s[2659]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[2661]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2640]!, self._r[2640]!, [_1]) + return formatWithArgumentRanges(self._s[2662]!, self._r[2662]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[2641]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2643]! } - public var ChatSettings_Appearance: String { return self._s[2644]! } - public var Appearance_PickAccentColor: String { return self._s[2645]! } + public var Login_CodeSentCall: String { return self._s[2663]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2665]! } + public var ChatSettings_Appearance: String { return self._s[2666]! } + public var Appearance_PickAccentColor: String { return self._s[2667]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2646]!, self._r[2646]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2668]!, self._r[2668]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2647]!, self._r[2647]!, [_1]) + return formatWithArgumentRanges(self._s[2669]!, self._r[2669]!, [_1]) } - public var Notification_CallMissed: String { return self._s[2648]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2649]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2650]! } - public var ChatAdmins_AdminLabel: String { return self._s[2652]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2653]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[2655]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2656]! } - public var Month_GenJune: String { return self._s[2657]! } - public var Watch_Location_Current: String { return self._s[2658]! } - public var Conversation_TitleMute: String { return self._s[2659]! } + public var Notification_CallMissed: String { return self._s[2670]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2671]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2672]! } + public var ChatAdmins_AdminLabel: String { return self._s[2674]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2675]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2677]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2678]! } + public var Month_GenJune: String { return self._s[2679]! } + public var Watch_Location_Current: String { return self._s[2680]! } + public var Conversation_TitleMute: String { return self._s[2681]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2660]!, self._r[2660]!, [_1]) + return formatWithArgumentRanges(self._s[2682]!, self._r[2682]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[2661]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2683]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2662]!, self._r[2662]!, [_0]) + return formatWithArgumentRanges(self._s[2684]!, self._r[2684]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[2663]! } - public var Chat_SlowmodeSendError: String { return self._s[2664]! } - public var MaskStickerSettings_Info: String { return self._s[2665]! } + public var Call_ReportPlaceholder: String { return self._s[2685]! } + public var Chat_SlowmodeSendError: String { return self._s[2686]! } + public var MaskStickerSettings_Info: String { return self._s[2687]! } + public var EditTheme_Expand_TopInfo: String { return self._s[2688]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2666]!, self._r[2666]!, [_0]) + return formatWithArgumentRanges(self._s[2689]!, self._r[2689]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[2667]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[2669]! } - public var Contacts_ShareTelegram: String { return self._s[2670]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2671]! } - public var Channel_ErrorAccessDenied: String { return self._s[2672]! } - public var UserInfo_ScamBotWarning: String { return self._s[2674]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[2675]! } - public var Call_ConnectionErrorTitle: String { return self._s[2676]! } - public var UserInfo_NotificationsEnable: String { return self._s[2677]! } - public var ArchivedChats_IntroText1: String { return self._s[2678]! } - public var Tour_Text4: String { return self._s[2681]! } - public var WallpaperSearch_Recent: String { return self._s[2682]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[2683]! } - public var Profile_MessageLifetime2s: String { return self._s[2685]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2686]! } - public var Notification_MessageLifetime2s: String { return self._s[2687]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2690]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2692]! } + public var Contacts_ShareTelegram: String { return self._s[2693]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2694]! } + public var Channel_ErrorAccessDenied: String { return self._s[2695]! } + public var UserInfo_ScamBotWarning: String { return self._s[2697]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2698]! } + public var Call_ConnectionErrorTitle: String { return self._s[2699]! } + public var UserInfo_NotificationsEnable: String { return self._s[2700]! } + public var ArchivedChats_IntroText1: String { return self._s[2701]! } + public var Tour_Text4: String { return self._s[2704]! } + public var WallpaperSearch_Recent: String { return self._s[2705]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[2706]! } + public var Profile_MessageLifetime2s: String { return self._s[2708]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2709]! } + public var Notification_MessageLifetime2s: String { return self._s[2710]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2688]!, self._r[2688]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2711]!, self._r[2711]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[2689]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[2690]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2691]! } + public var Cache_ClearCache: String { return self._s[2712]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[2713]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2714]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2695]!, self._r[2695]!, [_0]) + return formatWithArgumentRanges(self._s[2718]!, self._r[2718]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2697]!, self._r[2697]!, [_0]) + return formatWithArgumentRanges(self._s[2720]!, self._r[2720]!, [_0]) } - public var LocalGroup_Text: String { return self._s[2698]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2699]! } - public var SocksProxySetup_TypeSocks: String { return self._s[2700]! } - public var ChatList_UnarchiveAction: String { return self._s[2701]! } - public var AutoNightTheme_Title: String { return self._s[2702]! } - public var InstantPage_FeedbackButton: String { return self._s[2703]! } - public var Passport_FieldAddress: String { return self._s[2704]! } + public var LocalGroup_Text: String { return self._s[2721]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2722]! } + public var SocksProxySetup_TypeSocks: String { return self._s[2723]! } + public var ChatList_UnarchiveAction: String { return self._s[2724]! } + public var AutoNightTheme_Title: String { return self._s[2725]! } + public var InstantPage_FeedbackButton: String { return self._s[2726]! } + public var Passport_FieldAddress: String { return self._s[2727]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2705]!, self._r[2705]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2728]!, self._r[2728]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[2706]! } + public var Month_ShortMarch: String { return self._s[2729]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2707]!, self._r[2707]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2730]!, self._r[2730]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2708]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2709]! } - public var Passport_FloodError: String { return self._s[2710]! } - public var SecretGif_Title: String { return self._s[2711]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2712]! } - public var Passport_Language_th: String { return self._s[2714]! } - public var Passport_Address_Address: String { return self._s[2715]! } - public var Login_InvalidLastNameError: String { return self._s[2716]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[2717]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[2718]! } - public var SettingsSearch_FAQ: String { return self._s[2719]! } - public var ShareMenu_Send: String { return self._s[2720]! } - public var WallpaperSearch_ColorYellow: String { return self._s[2722]! } - public var Month_GenNovember: String { return self._s[2724]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2726]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2731]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2732]! } + public var Passport_FloodError: String { return self._s[2733]! } + public var SecretGif_Title: String { return self._s[2734]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2735]! } + public var Passport_Language_th: String { return self._s[2737]! } + public var Passport_Address_Address: String { return self._s[2738]! } + public var Login_InvalidLastNameError: String { return self._s[2739]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[2740]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[2741]! } + public var SettingsSearch_FAQ: String { return self._s[2742]! } + public var ShareMenu_Send: String { return self._s[2743]! } + public var WallpaperSearch_ColorYellow: String { return self._s[2745]! } + public var Month_GenNovember: String { return self._s[2747]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2749]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2727]!, self._r[2727]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2750]!, self._r[2750]!, [_1, _2]) } - public var Checkout_Email: String { return self._s[2728]! } - public var NotificationsSound_Tritone: String { return self._s[2729]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[2731]! } + public var Checkout_Email: String { return self._s[2751]! } + public var NotificationsSound_Tritone: String { return self._s[2752]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[2754]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2734]!, self._r[2734]!, [_1]) + return formatWithArgumentRanges(self._s[2757]!, self._r[2757]!, [_1]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[2735]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[2758]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2736]!, self._r[2736]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[2759]!, self._r[2759]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[2737]! } - public var Notification_Exceptions_Add: String { return self._s[2738]! } - public var DialogList_You: String { return self._s[2739]! } - public var MediaPicker_Send: String { return self._s[2742]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2743]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[2744]! } - public var Call_AudioRouteSpeaker: String { return self._s[2745]! } - public var Watch_UserInfo_Title: String { return self._s[2746]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[2747]! } - public var Appearance_AccentColor: String { return self._s[2748]! } + public var ChatList_UndoArchiveTitle: String { return self._s[2760]! } + public var Notification_Exceptions_Add: String { return self._s[2761]! } + public var DialogList_You: String { return self._s[2762]! } + public var MediaPicker_Send: String { return self._s[2765]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2766]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[2767]! } + public var Call_AudioRouteSpeaker: String { return self._s[2768]! } + public var Watch_UserInfo_Title: String { return self._s[2769]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[2770]! } + public var Appearance_AccentColor: String { return self._s[2771]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2749]!, self._r[2749]!, [_0]) + return formatWithArgumentRanges(self._s[2772]!, self._r[2772]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2750]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2773]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2751]!, self._r[2751]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2774]!, self._r[2774]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[2752]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[2753]! } - public var Notification_CallOutgoing: String { return self._s[2754]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2755]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[2756]! } - public var Call_RecordingDisabledMessage: String { return self._s[2757]! } - public var Message_Game: String { return self._s[2758]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[2759]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2760]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[2761]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2762]! } - public var Date_DialogDateFormat: String { return self._s[2763]! } - public var WallpaperColors_SetCustomColor: String { return self._s[2764]! } - public var Notifications_InAppNotifications: String { return self._s[2765]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[2775]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[2776]! } + public var Notification_CallOutgoing: String { return self._s[2777]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2778]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[2779]! } + public var Call_RecordingDisabledMessage: String { return self._s[2780]! } + public var Message_Game: String { return self._s[2781]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[2782]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2783]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[2784]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2785]! } + public var Date_DialogDateFormat: String { return self._s[2786]! } + public var WallpaperColors_SetCustomColor: String { return self._s[2787]! } + public var Notifications_InAppNotifications: String { return self._s[2788]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2766]!, self._r[2766]!, [_0]) + return formatWithArgumentRanges(self._s[2789]!, self._r[2789]!, [_0]) } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2767]!, self._r[2767]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2790]!, self._r[2790]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[2768]! } + public var NewContact_Title: String { return self._s[2791]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2769]!, self._r[2769]!, [_0]) + return formatWithArgumentRanges(self._s[2792]!, self._r[2792]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[2770]! } + public var Conversation_ViewContactDetails: String { return self._s[2793]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2772]!, self._r[2772]!, [_1]) + return formatWithArgumentRanges(self._s[2795]!, self._r[2795]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2773]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[2774]! } - public var PrivacySettings_Title: String { return self._s[2775]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2778]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[2779]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[2780]! } - public var Contacts_PhoneNumber: String { return self._s[2781]! } - public var Map_ShowPlaces: String { return self._s[2783]! } - public var ChatAdmins_Title: String { return self._s[2784]! } - public var InstantPage_Reference: String { return self._s[2786]! } - public var ReportGroupLocation_Text: String { return self._s[2787]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2796]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[2797]! } + public var PrivacySettings_Title: String { return self._s[2798]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2801]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[2802]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[2803]! } + public var Contacts_PhoneNumber: String { return self._s[2804]! } + public var Map_ShowPlaces: String { return self._s[2806]! } + public var ChatAdmins_Title: String { return self._s[2807]! } + public var InstantPage_Reference: String { return self._s[2809]! } + public var ReportGroupLocation_Text: String { return self._s[2810]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2788]!, self._r[2788]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2811]!, self._r[2811]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[2789]! } - public var Watch_UserInfo_Block: String { return self._s[2790]! } - public var ChatSettings_Stickers: String { return self._s[2791]! } - public var ChatSettings_DownloadInBackground: String { return self._s[2792]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[2793]! } + public var Camera_FlashOff: String { return self._s[2812]! } + public var Watch_UserInfo_Block: String { return self._s[2813]! } + public var ChatSettings_Stickers: String { return self._s[2814]! } + public var ChatSettings_DownloadInBackground: String { return self._s[2815]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[2816]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2794]!, self._r[2794]!, [_0]) + return formatWithArgumentRanges(self._s[2817]!, self._r[2817]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[2795]! } - public var Login_CheckOtherSessionMessages: String { return self._s[2796]! } - public var AutoDownloadSettings_Cellular: String { return self._s[2797]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2798]! } - public var VoiceOver_MessageContextShare: String { return self._s[2799]! } + public var Settings_ViewPhoto: String { return self._s[2818]! } + public var Login_CheckOtherSessionMessages: String { return self._s[2819]! } + public var AutoDownloadSettings_Cellular: String { return self._s[2820]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2821]! } + public var VoiceOver_MessageContextShare: String { return self._s[2822]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2801]!, self._r[2801]!, [_0]) + return formatWithArgumentRanges(self._s[2824]!, self._r[2824]!, [_0]) } - public var Privacy_DeleteDrafts: String { return self._s[2802]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2803]! } + public var Privacy_DeleteDrafts: String { return self._s[2825]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2826]! } public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_0]) + return formatWithArgumentRanges(self._s[2827]!, self._r[2827]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[2805]! } - public var DialogList_SavedMessages: String { return self._s[2806]! } - public var GroupInfo_UpgradeButton: String { return self._s[2807]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[2809]! } - public var DialogList_Pin: String { return self._s[2810]! } + public var DialogList_SavedMessagesHelp: String { return self._s[2828]! } + public var DialogList_SavedMessages: String { return self._s[2829]! } + public var GroupInfo_UpgradeButton: String { return self._s[2830]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[2832]! } + public var DialogList_Pin: String { return self._s[2833]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2811]!, self._r[2811]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2834]!, self._r[2834]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2812]!, self._r[2812]!, [_0]) + return formatWithArgumentRanges(self._s[2835]!, self._r[2835]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[2813]! } - public var UserInfo_NotificationsDisable: String { return self._s[2814]! } - public var Paint_Outlined: String { return self._s[2815]! } - public var Activity_PlayingGame: String { return self._s[2816]! } - public var SearchImages_NoImagesFound: String { return self._s[2817]! } - public var SocksProxySetup_ProxyType: String { return self._s[2818]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[2820]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[2821]! } - public var Settings_AppLanguage: String { return self._s[2822]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[2823]! } - public var Common_ChoosePhoto: String { return self._s[2824]! } - public var CallFeedback_ReasonEcho: String { return self._s[2825]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[2836]! } + public var UserInfo_NotificationsDisable: String { return self._s[2837]! } + public var Paint_Outlined: String { return self._s[2838]! } + public var Activity_PlayingGame: String { return self._s[2839]! } + public var SearchImages_NoImagesFound: String { return self._s[2840]! } + public var SocksProxySetup_ProxyType: String { return self._s[2841]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[2843]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[2844]! } + public var Settings_AppLanguage: String { return self._s[2845]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[2846]! } + public var Common_ChoosePhoto: String { return self._s[2847]! } + public var CallFeedback_ReasonEcho: String { return self._s[2848]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2826]!, self._r[2826]!, [_1]) + return formatWithArgumentRanges(self._s[2849]!, self._r[2849]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[2827]! } - public var Activity_UploadingVideo: String { return self._s[2828]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2829]! } - public var NetworkUsageSettings_Wifi: String { return self._s[2830]! } - public var VoiceOver_Editing_ClearText: String { return self._s[2831]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[2832]! } - public var Checkout_PayWithTouchId: String { return self._s[2833]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2834]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[2850]! } + public var Activity_UploadingVideo: String { return self._s[2851]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2852]! } + public var NetworkUsageSettings_Wifi: String { return self._s[2853]! } + public var VoiceOver_Editing_ClearText: String { return self._s[2854]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[2855]! } + public var Checkout_PayWithTouchId: String { return self._s[2856]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2857]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2836]!, self._r[2836]!, [_1]) + return formatWithArgumentRanges(self._s[2859]!, self._r[2859]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[2837]! } + public var Notifications_ExceptionsNone: String { return self._s[2860]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2838]!, self._r[2838]!, [_0]) + return formatWithArgumentRanges(self._s[2861]!, self._r[2861]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2839]!, self._r[2839]!, [_1]) + return formatWithArgumentRanges(self._s[2862]!, self._r[2862]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[2841]! } - public var Passport_Address_Region: String { return self._s[2844]! } - public var ChatList_DeleteChat: String { return self._s[2845]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[2846]! } - public var PhotoEditor_TiltShift: String { return self._s[2847]! } - public var Settings_FAQ_URL: String { return self._s[2848]! } - public var Passport_Language_sl: String { return self._s[2849]! } - public var Settings_PrivacySettings: String { return self._s[2851]! } - public var SharedMedia_TitleLink: String { return self._s[2852]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[2853]! } - public var Settings_SetProfilePhoto: String { return self._s[2854]! } - public var Channel_About_Help: String { return self._s[2855]! } - public var Contacts_PermissionsEnable: String { return self._s[2856]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[2857]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[2858]! } - public var CallFeedback_ReasonInterruption: String { return self._s[2860]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[2861]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[2862]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[2863]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[2864]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[2866]! } - public var Map_OpenInYandexMaps: String { return self._s[2868]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[2869]! } - public var VoiceOver_MessageContextReply: String { return self._s[2870]! } - public var PhotoEditor_SaturationTool: String { return self._s[2871]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[2864]! } + public var Passport_Address_Region: String { return self._s[2867]! } + public var ChatList_DeleteChat: String { return self._s[2868]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[2869]! } + public var PhotoEditor_TiltShift: String { return self._s[2870]! } + public var Settings_FAQ_URL: String { return self._s[2871]! } + public var Passport_Language_sl: String { return self._s[2872]! } + public var Settings_PrivacySettings: String { return self._s[2874]! } + public var SharedMedia_TitleLink: String { return self._s[2875]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[2876]! } + public var Settings_SetProfilePhoto: String { return self._s[2877]! } + public var Channel_About_Help: String { return self._s[2878]! } + public var Contacts_PermissionsEnable: String { return self._s[2879]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[2880]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[2881]! } + public var CallFeedback_ReasonInterruption: String { return self._s[2883]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[2884]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[2885]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[2886]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[2887]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[2889]! } + public var Map_OpenInYandexMaps: String { return self._s[2891]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[2892]! } + public var VoiceOver_MessageContextReply: String { return self._s[2893]! } + public var PhotoEditor_SaturationTool: String { return self._s[2894]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2872]!, self._r[2872]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2895]!, self._r[2895]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[2873]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2874]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[2875]! } - public var Appearance_TextSize: String { return self._s[2876]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[2896]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2897]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[2898]! } + public var Appearance_TextSize: String { return self._s[2899]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2877]!, self._r[2877]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2900]!, self._r[2900]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[2878]! } - public var Channel_Username_InvalidTooShort: String { return self._s[2880]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[2901]! } + public var Channel_Username_InvalidTooShort: String { return self._s[2903]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2881]!, self._r[2881]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2904]!, self._r[2904]!, [_1, _2]) } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2882]!, self._r[2882]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2905]!, self._r[2905]!, [_1, _2, _3]) } - public var GroupInfo_PublicLinkAdd: String { return self._s[2883]! } - public var Passport_PassportInformation: String { return self._s[2886]! } - public var Theme_Unsupported: String { return self._s[2887]! } - public var WatchRemote_AlertTitle: String { return self._s[2888]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2889]! } - public var ConvertToSupergroup_HelpText: String { return self._s[2891]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[2906]! } + public var Passport_PassportInformation: String { return self._s[2909]! } + public var Theme_Unsupported: String { return self._s[2910]! } + public var WatchRemote_AlertTitle: String { return self._s[2911]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2912]! } + public var ConvertToSupergroup_HelpText: String { return self._s[2914]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2892]!, self._r[2892]!, [_0]) + return formatWithArgumentRanges(self._s[2915]!, self._r[2915]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2893]!, self._r[2893]!, [_1]) + return formatWithArgumentRanges(self._s[2916]!, self._r[2916]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2894]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2896]! } - public var AccessDenied_CameraDisabled: String { return self._s[2897]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2917]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2919]! } + public var AccessDenied_CameraDisabled: String { return self._s[2920]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2898]!, self._r[2898]!, [_0]) + return formatWithArgumentRanges(self._s[2921]!, self._r[2921]!, [_0]) } - public var PhotoEditor_ContrastTool: String { return self._s[2901]! } + public var PhotoEditor_ContrastTool: String { return self._s[2924]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2902]!, self._r[2902]!, [_1]) + return formatWithArgumentRanges(self._s[2925]!, self._r[2925]!, [_1]) } - public var DialogList_Draft: String { return self._s[2903]! } - public var Privacy_TopPeersDelete: String { return self._s[2905]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[2906]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2907]! } - public var WebSearch_RecentSectionClear: String { return self._s[2908]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[2910]! } - public var Common_Done: String { return self._s[2912]! } - public var AuthSessions_EmptyText: String { return self._s[2913]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[2914]! } - public var Tour_Title5: String { return self._s[2915]! } + public var DialogList_Draft: String { return self._s[2926]! } + public var Privacy_TopPeersDelete: String { return self._s[2928]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[2929]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2930]! } + public var WebSearch_RecentSectionClear: String { return self._s[2931]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[2932]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[2934]! } + public var Common_Done: String { return self._s[2936]! } + public var AuthSessions_EmptyText: String { return self._s[2937]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[2938]! } + public var Tour_Title5: String { return self._s[2939]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2916]!, self._r[2916]!, [_0]) + return formatWithArgumentRanges(self._s[2940]!, self._r[2940]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2917]! } - public var Conversation_LinkDialogSave: String { return self._s[2918]! } - public var GroupInfo_ActionRestrict: String { return self._s[2919]! } - public var Checkout_Title: String { return self._s[2920]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[2922]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[2924]! } - public var Notification_RenamedGroup: String { return self._s[2925]! } - public var PeopleNearby_Groups: String { return self._s[2926]! } - public var Checkout_PayWithFaceId: String { return self._s[2927]! } - public var Channel_BanList_BlockedTitle: String { return self._s[2928]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2930]! } - public var Checkout_WebConfirmation_Title: String { return self._s[2931]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[2932]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2941]! } + public var Conversation_LinkDialogSave: String { return self._s[2942]! } + public var GroupInfo_ActionRestrict: String { return self._s[2943]! } + public var Checkout_Title: String { return self._s[2944]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[2946]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[2948]! } + public var Notification_RenamedGroup: String { return self._s[2949]! } + public var PeopleNearby_Groups: String { return self._s[2950]! } + public var Checkout_PayWithFaceId: String { return self._s[2951]! } + public var Channel_BanList_BlockedTitle: String { return self._s[2952]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2954]! } + public var Checkout_WebConfirmation_Title: String { return self._s[2955]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[2956]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2933]!, self._r[2933]!, [_0]) - } - public var Profile_AddToExisting: String { return self._s[2935]! } - public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2936]!, self._r[2936]!, [_0, _1]) - } - public var Cache_Files: String { return self._s[2938]! } - public var Permissions_PrivacyPolicy: String { return self._s[2939]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[2940]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2941]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[2943]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[2945]! } - public var Calls_NoCallsPlaceholder: String { return self._s[2946]! } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2947]! } - public var VoiceOver_AttachMedia: String { return self._s[2949]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2950]! } - public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2951]!, self._r[2951]!, [_1, _2, _3]) - } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2952]! } - public var Conversation_SetReminder_Title: String { return self._s[2953]! } - public var Passport_FieldAddressHelp: String { return self._s[2954]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2955]! } - public var PUSH_REMINDER_TITLE: String { return self._s[2956]! } - public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2957]!, self._r[2957]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[2958]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[2959]! } - public var Login_UnknownError: String { return self._s[2960]! } - public var Group_UpgradeNoticeText2: String { return self._s[2963]! } - public var Watch_Compose_AddContact: String { return self._s[2964]! } - public var Web_Error: String { return self._s[2965]! } - public var Gif_Search: String { return self._s[2966]! } - public var Profile_MessageLifetime1h: String { return self._s[2967]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2968]! } - public var Channel_Username_CheckingUsername: String { return self._s[2969]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[2970]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[2971]! } - public var Channel_AboutItem: String { return self._s[2972]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2974]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[2975]! } - public var GroupInfo_SharedMedia: String { return self._s[2976]! } + public var Profile_AddToExisting: String { return self._s[2959]! } + public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2960]!, self._r[2960]!, [_0, _1]) + } + public var Cache_Files: String { return self._s[2962]! } + public var Permissions_PrivacyPolicy: String { return self._s[2963]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[2964]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2965]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[2967]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[2969]! } + public var Calls_NoCallsPlaceholder: String { return self._s[2970]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2971]! } + public var VoiceOver_AttachMedia: String { return self._s[2973]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2974]! } + public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2975]!, self._r[2975]!, [_1, _2, _3]) + } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2976]! } + public var Conversation_SetReminder_Title: String { return self._s[2977]! } + public var Passport_FieldAddressHelp: String { return self._s[2978]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2979]! } + public var PUSH_REMINDER_TITLE: String { return self._s[2980]! } + public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2981]!, self._r[2981]!, [_0]) + } + public var Channel_AdminLog_EmptyTitle: String { return self._s[2982]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[2983]! } + public var Login_UnknownError: String { return self._s[2984]! } + public var Group_UpgradeNoticeText2: String { return self._s[2987]! } + public var Watch_Compose_AddContact: String { return self._s[2988]! } + public var Web_Error: String { return self._s[2989]! } + public var Gif_Search: String { return self._s[2990]! } + public var Profile_MessageLifetime1h: String { return self._s[2991]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2992]! } + public var Channel_Username_CheckingUsername: String { return self._s[2993]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[2994]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[2995]! } + public var Channel_AboutItem: String { return self._s[2996]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2998]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[2999]! } + public var GroupInfo_SharedMedia: String { return self._s[3000]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2977]!, self._r[2977]!, [_1]) + return formatWithArgumentRanges(self._s[3001]!, self._r[3001]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[2978]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3002]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2979]!, self._r[2979]!, [_1]) + return formatWithArgumentRanges(self._s[3003]!, self._r[3003]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[2980]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2981]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[2982]! } - public var CreatePoll_AddOption: String { return self._s[2983]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[2984]! } - public var Group_UpgradeNoticeHeader: String { return self._s[2985]! } - public var Channel_Management_AddModerator: String { return self._s[2986]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[2987]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[2988]! } - public var NotificationsSound_Hello: String { return self._s[2989]! } - public var SocksProxySetup_SavedProxies: String { return self._s[2990]! } - public var Channel_Stickers_Placeholder: String { return self._s[2992]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3004]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3005]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3006]! } + public var CreatePoll_AddOption: String { return self._s[3007]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3008]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3009]! } + public var Channel_Management_AddModerator: String { return self._s[3010]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3011]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3012]! } + public var NotificationsSound_Hello: String { return self._s[3013]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3014]! } + public var Channel_Stickers_Placeholder: String { return self._s[3016]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2993]!, self._r[2993]!, [_0]) + return formatWithArgumentRanges(self._s[3017]!, self._r[3017]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[2994]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[2995]! } - public var ContactInfo_BirthdayLabel: String { return self._s[2996]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[2997]! } - public var AutoDownloadSettings_Channels: String { return self._s[2998]! } - public var Passport_Language_mn: String { return self._s[2999]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3002]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3003]! } - public var Passport_Language_ja: String { return self._s[3005]! } - public var Settings_About_Title: String { return self._s[3006]! } - public var Settings_NotificationsAndSounds: String { return self._s[3007]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3008]! } - public var Settings_BlockedUsers: String { return self._s[3009]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3018]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3019]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3020]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3021]! } + public var AutoDownloadSettings_Channels: String { return self._s[3022]! } + public var Passport_Language_mn: String { return self._s[3023]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3026]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3027]! } + public var Passport_Language_ja: String { return self._s[3029]! } + public var Settings_About_Title: String { return self._s[3030]! } + public var Settings_NotificationsAndSounds: String { return self._s[3031]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3032]! } + public var Settings_BlockedUsers: String { return self._s[3033]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3010]!, self._r[3010]!, [_0]) + return formatWithArgumentRanges(self._s[3034]!, self._r[3034]!, [_0]) } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3011]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3012]! } - public var Channel_Username_Title: String { return self._s[3013]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3035]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3036]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3037]! } + public var Channel_Username_Title: String { return self._s[3038]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3014]!, self._r[3014]!, [_0]) + return formatWithArgumentRanges(self._s[3039]!, self._r[3039]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3016]! } - public var AppleWatch_Title: String { return self._s[3017]! } - public var Activity_RecordingVideoMessage: String { return self._s[3018]! } + public var AttachmentMenu_File: String { return self._s[3041]! } + public var AppleWatch_Title: String { return self._s[3042]! } + public var Activity_RecordingVideoMessage: String { return self._s[3043]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3019]!, self._r[3019]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3044]!, self._r[3044]!, [_1, _2]) } - public var Weekday_Saturday: String { return self._s[3020]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3021]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3022]! } - public var Common_Next: String { return self._s[3024]! } - public var Channel_Stickers_YourStickers: String { return self._s[3026]! } - public var Message_Theme: String { return self._s[3027]! } - public var Call_AudioRouteHeadphones: String { return self._s[3028]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3030]! } - public var Watch_Contacts_NoResults: String { return self._s[3032]! } - public var PhotoEditor_TintTool: String { return self._s[3035]! } - public var LoginPassword_ResetAccount: String { return self._s[3037]! } - public var Settings_SavedMessages: String { return self._s[3038]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3039]! } - public var Bot_GenericSupportStatus: String { return self._s[3040]! } - public var StickerPack_Add: String { return self._s[3041]! } - public var Checkout_TotalAmount: String { return self._s[3042]! } - public var Your_cards_number_is_invalid: String { return self._s[3043]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3044]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3045]! } + public var Weekday_Saturday: String { return self._s[3045]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3046]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3047]! } + public var Common_Next: String { return self._s[3049]! } + public var Channel_Stickers_YourStickers: String { return self._s[3051]! } + public var Message_Theme: String { return self._s[3052]! } + public var Call_AudioRouteHeadphones: String { return self._s[3053]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3055]! } + public var Watch_Contacts_NoResults: String { return self._s[3057]! } + public var PhotoEditor_TintTool: String { return self._s[3060]! } + public var LoginPassword_ResetAccount: String { return self._s[3062]! } + public var Settings_SavedMessages: String { return self._s[3063]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3064]! } + public var Bot_GenericSupportStatus: String { return self._s[3065]! } + public var StickerPack_Add: String { return self._s[3066]! } + public var Checkout_TotalAmount: String { return self._s[3067]! } + public var Your_cards_number_is_invalid: String { return self._s[3068]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3069]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3070]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3046]!, self._r[3046]!, [_0]) + return formatWithArgumentRanges(self._s[3071]!, self._r[3071]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3047]!, self._r[3047]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3072]!, self._r[3072]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3048]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3073]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3050]!, self._r[3050]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3075]!, self._r[3075]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3051]!, self._r[3051]!, [_0]) + return formatWithArgumentRanges(self._s[3076]!, self._r[3076]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3052]! } - public var StickerPack_Share: String { return self._s[3053]! } - public var Passport_DeleteAddress: String { return self._s[3054]! } - public var Settings_Passport: String { return self._s[3055]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3056]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3057]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3058]! } - public var Contacts_PermissionsText: String { return self._s[3059]! } - public var Group_Setup_HistoryVisible: String { return self._s[3060]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3062]! } - public var SocksProxySetup_Title: String { return self._s[3063]! } - public var Notification_Mute1h: String { return self._s[3064]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3077]! } + public var StickerPack_Share: String { return self._s[3078]! } + public var Passport_DeleteAddress: String { return self._s[3079]! } + public var Settings_Passport: String { return self._s[3080]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3081]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3082]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3083]! } + public var Contacts_PermissionsText: String { return self._s[3084]! } + public var Group_Setup_HistoryVisible: String { return self._s[3085]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3087]! } + public var SocksProxySetup_Title: String { return self._s[3088]! } + public var Notification_Mute1h: String { return self._s[3089]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3065]!, self._r[3065]!, [_0]) - } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3066]! } - public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3067]!, self._r[3067]!, [_1]) - } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3068]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3071]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3073]! } - public var DialogList_NoMessagesText: String { return self._s[3074]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3075]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3076]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3078]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3079]! } - public var Common_TakePhotoOrVideo: String { return self._s[3080]! } - public var Call_StatusBusy: String { return self._s[3081]! } - public var Conversation_PinnedMessage: String { return self._s[3082]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3083]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3084]! } - public var Undo_ChatCleared: String { return self._s[3085]! } - public var AppleWatch_ReplyPresets: String { return self._s[3086]! } - public var Passport_DiscardMessageDescription: String { return self._s[3088]! } - public var Login_NetworkError: String { return self._s[3089]! } - public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3090]!, self._r[3090]!, [_0]) } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3091]! } + public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3092]!, self._r[3092]!, [_1]) + } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3093]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3096]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3098]! } + public var DialogList_NoMessagesText: String { return self._s[3099]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3100]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3101]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3103]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3104]! } + public var Common_TakePhotoOrVideo: String { return self._s[3105]! } + public var Call_StatusBusy: String { return self._s[3106]! } + public var Conversation_PinnedMessage: String { return self._s[3107]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3108]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3109]! } + public var Undo_ChatCleared: String { return self._s[3110]! } + public var AppleWatch_ReplyPresets: String { return self._s[3111]! } + public var Passport_DiscardMessageDescription: String { return self._s[3113]! } + public var Login_NetworkError: String { return self._s[3114]! } + public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3115]!, self._r[3115]!, [_0]) + } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3091]!, self._r[3091]!, [_0]) + return formatWithArgumentRanges(self._s[3116]!, self._r[3116]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3092]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3094]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3117]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3119]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3096]!, self._r[3096]!, [_0]) + return formatWithArgumentRanges(self._s[3121]!, self._r[3121]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[3097]! } - public var VoiceOver_Chat_Music: String { return self._s[3098]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3099]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3101]! } - public var ConversationMedia_Title: String { return self._s[3102]! } - public var EncryptionKey_Title: String { return self._s[3104]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3105]! } - public var Notification_Exceptions_AddException: String { return self._s[3106]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3107]! } - public var Profile_MessageLifetime1m: String { return self._s[3108]! } + public var Call_ConnectionErrorMessage: String { return self._s[3122]! } + public var VoiceOver_Chat_Music: String { return self._s[3123]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3124]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3126]! } + public var ConversationMedia_Title: String { return self._s[3127]! } + public var EncryptionKey_Title: String { return self._s[3129]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3130]! } + public var Notification_Exceptions_AddException: String { return self._s[3131]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3132]! } + public var Profile_MessageLifetime1m: String { return self._s[3133]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3109]!, self._r[3109]!, [_1]) + return formatWithArgumentRanges(self._s[3134]!, self._r[3134]!, [_1]) } - public var Month_GenMay: String { return self._s[3110]! } + public var Month_GenMay: String { return self._s[3135]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3111]!, self._r[3111]!, [_0]) + return formatWithArgumentRanges(self._s[3136]!, self._r[3136]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[3112]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3113]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3114]! } - public var Conversation_EmptyPlaceholder: String { return self._s[3116]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3117]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3118]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3119]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3120]! } - public var Channel_JoinChannel: String { return self._s[3122]! } - public var Appearance_Animations: String { return self._s[3125]! } + public var PeopleNearby_Users: String { return self._s[3137]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3138]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3139]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3141]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3142]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3143]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3144]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3145]! } + public var Channel_JoinChannel: String { return self._s[3147]! } + public var Appearance_Animations: String { return self._s[3150]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3126]!, self._r[3126]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3151]!, self._r[3151]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[3128]! } - public var Appearance_ShareTheme: String { return self._s[3129]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3131]! } - public var Passport_Address_Street: String { return self._s[3132]! } - public var Conversation_AddContact: String { return self._s[3133]! } - public var Login_PhonePlaceholder: String { return self._s[3134]! } - public var Channel_Members_InviteLink: String { return self._s[3136]! } - public var Bot_Stop: String { return self._s[3137]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3139]! } - public var Notification_PassportValueAddress: String { return self._s[3140]! } - public var Month_ShortJuly: String { return self._s[3141]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3142]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3143]! } - public var Passport_Identity_ReverseSide: String { return self._s[3144]! } - public var Watch_Stickers_Recents: String { return self._s[3147]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3149]! } - public var Map_SendThisLocation: String { return self._s[3150]! } + public var Stickers_GroupStickers: String { return self._s[3153]! } + public var Appearance_ShareTheme: String { return self._s[3154]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3156]! } + public var Passport_Address_Street: String { return self._s[3157]! } + public var Conversation_AddContact: String { return self._s[3158]! } + public var Login_PhonePlaceholder: String { return self._s[3159]! } + public var Channel_Members_InviteLink: String { return self._s[3161]! } + public var Bot_Stop: String { return self._s[3162]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3164]! } + public var Notification_PassportValueAddress: String { return self._s[3165]! } + public var Month_ShortJuly: String { return self._s[3166]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3167]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3168]! } + public var Passport_Identity_ReverseSide: String { return self._s[3169]! } + public var Watch_Stickers_Recents: String { return self._s[3172]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3174]! } + public var Map_SendThisLocation: String { return self._s[3175]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3151]!, self._r[3151]!, [_0]) + return formatWithArgumentRanges(self._s[3176]!, self._r[3176]!, [_0]) } public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3152]!, self._r[3152]!, [_0]) + return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_0]) } - public var ConvertToSupergroup_Note: String { return self._s[3153]! } + public var ConvertToSupergroup_Note: String { return self._s[3178]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3154]!, self._r[3154]!, [_0]) + return formatWithArgumentRanges(self._s[3179]!, self._r[3179]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3155]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3180]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3156]!, self._r[3156]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3181]!, self._r[3181]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3158]! } - public var Wallpaper_SearchShort: String { return self._s[3159]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3161]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3162]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3163]! } + public var Login_CallRequestState3: String { return self._s[3183]! } + public var Wallpaper_SearchShort: String { return self._s[3184]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3186]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3187]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3188]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3164]!, self._r[3164]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3189]!, self._r[3189]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3165]! } - public var EditTheme_UploadNewInfo: String { return self._s[3168]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3170]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3190]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3194]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3171]!, self._r[3171]!, [_0]) + return formatWithArgumentRanges(self._s[3195]!, self._r[3195]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[3172]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3173]! } + public var Passport_CorrectErrors: String { return self._s[3196]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3197]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3174]!, self._r[3174]!, [_0]) + return formatWithArgumentRanges(self._s[3198]!, self._r[3198]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[3175]! } - public var Channel_DiscussionGroup: String { return self._s[3176]! } + public var Map_SendMyCurrentLocation: String { return self._s[3199]! } + public var Channel_DiscussionGroup: String { return self._s[3200]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3201]!, self._r[3201]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[3178]! } - public var Permissions_NotificationsText_v0: String { return self._s[3179]! } - public var Appearance_AppIcon: String { return self._s[3180]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3181]! } - public var LoginPassword_FloodError: String { return self._s[3182]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3184]! } + public var SharedMedia_SearchNoResults: String { return self._s[3202]! } + public var Permissions_NotificationsText_v0: String { return self._s[3203]! } + public var Appearance_AppIcon: String { return self._s[3204]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3205]! } + public var LoginPassword_FloodError: String { return self._s[3206]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3208]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3185]!, self._r[3185]!, [_0]) + return formatWithArgumentRanges(self._s[3209]!, self._r[3209]!, [_0]) } - public var Passport_Language_bn: String { return self._s[3186]! } + public var Passport_Language_bn: String { return self._s[3210]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3187]!, self._r[3187]!, [_0]) + return formatWithArgumentRanges(self._s[3211]!, self._r[3211]!, [_0]) } public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3188]!, self._r[3188]!, [_0]) + return formatWithArgumentRanges(self._s[3212]!, self._r[3212]!, [_0]) } public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3189]!, self._r[3189]!, [_0]) + return formatWithArgumentRanges(self._s[3213]!, self._r[3213]!, [_0]) } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3192]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3194]! } - public var Contacts_PermissionsAllow: String { return self._s[3195]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3196]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3197]! } - public var WallpaperPreview_Pattern: String { return self._s[3198]! } - public var Paint_Duplicate: String { return self._s[3199]! } - public var Passport_Address_Country: String { return self._s[3200]! } - public var Notification_RenamedChannel: String { return self._s[3202]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3203]! } - public var Group_MessagePhotoUpdated: String { return self._s[3204]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3205]! } - public var Conversation_ContextMenuBan: String { return self._s[3206]! } - public var TwoStepAuth_EmailSent: String { return self._s[3207]! } - public var MessagePoll_NoVotes: String { return self._s[3208]! } - public var Passport_Language_is: String { return self._s[3209]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3211]! } - public var Tour_Text5: String { return self._s[3212]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3216]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3218]! } + public var Contacts_PermissionsAllow: String { return self._s[3219]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3220]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3221]! } + public var WallpaperPreview_Pattern: String { return self._s[3222]! } + public var Paint_Duplicate: String { return self._s[3223]! } + public var Passport_Address_Country: String { return self._s[3224]! } + public var Notification_RenamedChannel: String { return self._s[3226]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3227]! } + public var Group_MessagePhotoUpdated: String { return self._s[3228]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3229]! } + public var Conversation_ContextMenuBan: String { return self._s[3230]! } + public var TwoStepAuth_EmailSent: String { return self._s[3231]! } + public var MessagePoll_NoVotes: String { return self._s[3232]! } + public var Passport_Language_is: String { return self._s[3233]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3235]! } + public var Tour_Text5: String { return self._s[3236]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3214]!, self._r[3214]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3238]!, self._r[3238]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3215]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3216]! } + public var Undo_SecretChatDeleted: String { return self._s[3239]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3240]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3217]!, self._r[3217]!, [_0]) + return formatWithArgumentRanges(self._s[3241]!, self._r[3241]!, [_0]) } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3218]! } - public var Paint_Edit: String { return self._s[3220]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3222]! } - public var Undo_DeletedGroup: String { return self._s[3224]! } - public var LoginPassword_ForgotPassword: String { return self._s[3225]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3226]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3242]! } + public var Paint_Edit: String { return self._s[3244]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3246]! } + public var Undo_DeletedGroup: String { return self._s[3248]! } + public var LoginPassword_ForgotPassword: String { return self._s[3249]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3250]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3227]!, self._r[3227]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3251]!, self._r[3251]!, [_0, _1]) } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3228]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3229]! } - public var Passport_Language_uz: String { return self._s[3230]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3231]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3232]! } - public var Map_StopLiveLocation: String { return self._s[3234]! } - public var VoiceOver_MessageContextSend: String { return self._s[3236]! } - public var PasscodeSettings_Help: String { return self._s[3237]! } - public var NotificationsSound_Input: String { return self._s[3238]! } - public var Share_Title: String { return self._s[3241]! } - public var LogoutOptions_Title: String { return self._s[3242]! } - public var Login_TermsOfServiceAgree: String { return self._s[3243]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3244]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3245]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3246]! } - public var EnterPasscode_EnterTitle: String { return self._s[3247]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3252]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3253]! } + public var Passport_Language_uz: String { return self._s[3254]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3255]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3256]! } + public var Map_StopLiveLocation: String { return self._s[3258]! } + public var VoiceOver_MessageContextSend: String { return self._s[3260]! } + public var PasscodeSettings_Help: String { return self._s[3261]! } + public var NotificationsSound_Input: String { return self._s[3262]! } + public var Share_Title: String { return self._s[3265]! } + public var LogoutOptions_Title: String { return self._s[3266]! } + public var Login_TermsOfServiceAgree: String { return self._s[3267]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3268]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3269]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3270]! } + public var EnterPasscode_EnterTitle: String { return self._s[3271]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3248]!, self._r[3248]!, [_0]) + return formatWithArgumentRanges(self._s[3272]!, self._r[3272]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3249]! } - public var Conversation_AddToContacts: String { return self._s[3250]! } + public var Settings_CopyPhoneNumber: String { return self._s[3273]! } + public var Conversation_AddToContacts: String { return self._s[3274]! } public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3251]!, self._r[3251]!, [_0]) + return formatWithArgumentRanges(self._s[3275]!, self._r[3275]!, [_0]) } - public var NotificationsSound_Keys: String { return self._s[3252]! } + public var NotificationsSound_Keys: String { return self._s[3276]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3253]!, self._r[3253]!, [_0]) + return formatWithArgumentRanges(self._s[3277]!, self._r[3277]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3254]! } - public var Message_Video: String { return self._s[3255]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3256]! } + public var Notification_MessageLifetime1w: String { return self._s[3278]! } + public var Message_Video: String { return self._s[3279]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3280]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3257]!, self._r[3257]!, [_1]) + return formatWithArgumentRanges(self._s[3281]!, self._r[3281]!, [_1]) } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_0]) + return formatWithArgumentRanges(self._s[3284]!, self._r[3284]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3261]!, self._r[3261]!, [_0]) + return formatWithArgumentRanges(self._s[3285]!, self._r[3285]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3262]! } - public var CreatePoll_CancelConfirmation: String { return self._s[3263]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3265]! } - public var PrivacyPolicy_Decline: String { return self._s[3266]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3267]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3268]! } - public var Permissions_SiriAllow_v0: String { return self._s[3270]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3271]! } + public var Passport_Language_mk: String { return self._s[3286]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3287]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3289]! } + public var PrivacyPolicy_Decline: String { return self._s[3290]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3291]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3292]! } + public var Permissions_SiriAllow_v0: String { return self._s[3294]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3295]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3272]!, self._r[3272]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3296]!, self._r[3296]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3273]!, self._r[3273]!, [_0]) + return formatWithArgumentRanges(self._s[3297]!, self._r[3297]!, [_0]) } - public var Paint_Regular: String { return self._s[3274]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3275]! } - public var SocksProxySetup_ShareLink: String { return self._s[3276]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3277]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3279]! } - public var GroupInfo_InviteByLink: String { return self._s[3280]! } - public var MessageTimer_Custom: String { return self._s[3281]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3282]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3284]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3285]! } - public var VoiceOver_Chat_Selected: String { return self._s[3286]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3287]! } - public var Channel_Username_InvalidTaken: String { return self._s[3288]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3289]! } - public var Settings_ChatBackground: String { return self._s[3290]! } - public var Channel_Subscribers_Title: String { return self._s[3291]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3292]! } - public var Watch_ConnectionDescription: String { return self._s[3293]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3297]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3298]! } - public var EditProfile_Title: String { return self._s[3299]! } - public var NotificationsSound_Bamboo: String { return self._s[3301]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3303]! } - public var Login_SmsRequestState2: String { return self._s[3304]! } - public var Passport_Language_ar: String { return self._s[3305]! } + public var Paint_Regular: String { return self._s[3298]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3299]! } + public var SocksProxySetup_ShareLink: String { return self._s[3300]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3301]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3303]! } + public var GroupInfo_InviteByLink: String { return self._s[3304]! } + public var MessageTimer_Custom: String { return self._s[3305]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3306]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3308]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3309]! } + public var VoiceOver_Chat_Selected: String { return self._s[3310]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3311]! } + public var Channel_Username_InvalidTaken: String { return self._s[3312]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3313]! } + public var Settings_ChatBackground: String { return self._s[3314]! } + public var Channel_Subscribers_Title: String { return self._s[3315]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3316]! } + public var Watch_ConnectionDescription: String { return self._s[3317]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3321]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3322]! } + public var EditProfile_Title: String { return self._s[3323]! } + public var NotificationsSound_Bamboo: String { return self._s[3325]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3327]! } + public var Login_SmsRequestState2: String { return self._s[3328]! } + public var Passport_Language_ar: String { return self._s[3329]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3306]!, self._r[3306]!, [_0]) + return formatWithArgumentRanges(self._s[3330]!, self._r[3330]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3307]! } - public var Conversation_MessageDialogEdit: String { return self._s[3308]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3309]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3331]! } + public var Conversation_MessageDialogEdit: String { return self._s[3332]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3333]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3310]!, self._r[3310]!, [_1]) + return formatWithArgumentRanges(self._s[3334]!, self._r[3334]!, [_1]) } - public var Common_Close: String { return self._s[3311]! } - public var GroupInfo_PublicLink: String { return self._s[3312]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3313]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3314]! } + public var Common_Close: String { return self._s[3335]! } + public var GroupInfo_PublicLink: String { return self._s[3336]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3337]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3338]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3318]!, self._r[3318]!, [_0]) + return formatWithArgumentRanges(self._s[3342]!, self._r[3342]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3319]! } + public var UserInfo_About_Placeholder: String { return self._s[3343]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3320]!, self._r[3320]!, [_0]) - } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3321]! } - public var Channel_Info_Banned: String { return self._s[3323]! } - public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3324]!, self._r[3324]!, [_0]) - } - public var Appearance_Other: String { return self._s[3325]! } - public var Passport_Language_my: String { return self._s[3326]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3327]! } - public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3328]!, self._r[3328]!, [_1, _2, _3]) - } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3329]! } - public var Preview_CopyAddress: String { return self._s[3330]! } - public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3331]!, self._r[3331]!, [_0]) - } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3332]! } - public var UserInfo_BotSettings: String { return self._s[3333]! } - public var LiveLocation_MenuStopAll: String { return self._s[3335]! } - public var Passport_PasswordCreate: String { return self._s[3336]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3337]! } - public var Message_PinnedLocationMessage: String { return self._s[3338]! } - public var Map_Satellite: String { return self._s[3339]! } - public var Watch_Message_Unsupported: String { return self._s[3340]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3341]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3342]! } - public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3343]!, self._r[3343]!, [_0, _1]) - } - public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3344]!, self._r[3344]!, [_0]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3345]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3346]! } - public var NotificationsSound_None: String { return self._s[3347]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3349]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3350]! } - public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3351]!, self._r[3351]!, [_1]) + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3345]! } + public var Channel_Info_Banned: String { return self._s[3347]! } + public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3348]!, self._r[3348]!, [_0]) } - public var Cache_Indexing: String { return self._s[3352]! } - public var DialogList_RecentTitlePeople: String { return self._s[3354]! } - public var DialogList_EncryptionRejected: String { return self._s[3355]! } - public var GroupInfo_Administrators: String { return self._s[3356]! } - public var Passport_ScanPassportHelp: String { return self._s[3357]! } - public var Application_Name: String { return self._s[3358]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3359]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3361]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3362]! } + public var Appearance_Other: String { return self._s[3349]! } + public var Passport_Language_my: String { return self._s[3350]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3351]! } + public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3352]!, self._r[3352]!, [_1, _2, _3]) + } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3353]! } + public var Preview_CopyAddress: String { return self._s[3354]! } + public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3355]!, self._r[3355]!, [_0]) + } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3356]! } + public var UserInfo_BotSettings: String { return self._s[3357]! } + public var LiveLocation_MenuStopAll: String { return self._s[3359]! } + public var Passport_PasswordCreate: String { return self._s[3360]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3361]! } + public var Message_PinnedLocationMessage: String { return self._s[3362]! } + public var Map_Satellite: String { return self._s[3363]! } + public var Watch_Message_Unsupported: String { return self._s[3364]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3365]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3366]! } + public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3367]!, self._r[3367]!, [_0, _1]) + } + public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3368]!, self._r[3368]!, [_0]) + } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3369]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3370]! } + public var NotificationsSound_None: String { return self._s[3371]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3373]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3374]! } + public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3375]!, self._r[3375]!, [_1]) + } + public var Cache_Indexing: String { return self._s[3376]! } + public var DialogList_RecentTitlePeople: String { return self._s[3378]! } + public var DialogList_EncryptionRejected: String { return self._s[3379]! } + public var GroupInfo_Administrators: String { return self._s[3380]! } + public var Passport_ScanPassportHelp: String { return self._s[3381]! } + public var Application_Name: String { return self._s[3382]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3383]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3385]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3386]! } public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3363]!, self._r[3363]!, [_0]) + return formatWithArgumentRanges(self._s[3387]!, self._r[3387]!, [_0]) } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3364]!, self._r[3364]!, [_0]) + return formatWithArgumentRanges(self._s[3388]!, self._r[3388]!, [_0]) } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3365]!, self._r[3365]!, [_0]) + return formatWithArgumentRanges(self._s[3389]!, self._r[3389]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3366]! } - public var Privacy_ChatsTitle: String { return self._s[3367]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3368]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3369]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3370]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3371]! } - public var Group_LinkedChannel: String { return self._s[3372]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3373]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3374]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3375]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3376]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3378]! } - public var Channel_Setup_TypePublic: String { return self._s[3380]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3390]! } + public var Privacy_ChatsTitle: String { return self._s[3391]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3392]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3393]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3394]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3395]! } + public var Group_LinkedChannel: String { return self._s[3396]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3397]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3398]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3399]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3400]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3402]! } + public var Channel_Setup_TypePublic: String { return self._s[3404]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3381]!, self._r[3381]!, [_0]) + return formatWithArgumentRanges(self._s[3405]!, self._r[3405]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3383]! } - public var Map_OpenInMaps: String { return self._s[3385]! } + public var Channel_TypeSetup_Title: String { return self._s[3407]! } + public var Map_OpenInMaps: String { return self._s[3409]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3386]!, self._r[3386]!, [_1]) + return formatWithArgumentRanges(self._s[3410]!, self._r[3410]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3388]! } + public var NotificationsSound_Tremolo: String { return self._s[3412]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3389]!, self._r[3389]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3413]!, self._r[3413]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3390]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3391]! } - public var Passport_PasswordHelp: String { return self._s[3392]! } - public var Login_CodeExpiredError: String { return self._s[3393]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3394]! } - public var Conversation_TitleUnmute: String { return self._s[3395]! } - public var Passport_Identity_ScansHelp: String { return self._s[3396]! } - public var Passport_Language_lo: String { return self._s[3397]! } - public var Camera_FlashAuto: String { return self._s[3398]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3399]! } - public var Common_Cancel: String { return self._s[3400]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3401]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3402]! } - public var Appearance_TintAllColors: String { return self._s[3403]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3414]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3415]! } + public var Passport_PasswordHelp: String { return self._s[3416]! } + public var Login_CodeExpiredError: String { return self._s[3417]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3418]! } + public var Conversation_TitleUnmute: String { return self._s[3419]! } + public var Passport_Identity_ScansHelp: String { return self._s[3420]! } + public var Passport_Language_lo: String { return self._s[3421]! } + public var Camera_FlashAuto: String { return self._s[3422]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3423]! } + public var Common_Cancel: String { return self._s[3424]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3425]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3426]! } + public var Appearance_TintAllColors: String { return self._s[3427]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3404]!, self._r[3404]!, [_1]) + return formatWithArgumentRanges(self._s[3428]!, self._r[3428]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3405]! } - public var ChatSettings_Title: String { return self._s[3407]! } - public var Passport_PasswordReset: String { return self._s[3408]! } - public var SocksProxySetup_TypeNone: String { return self._s[3409]! } - public var EditTheme_Title: String { return self._s[3411]! } - public var PhoneNumberHelp_Help: String { return self._s[3412]! } - public var Checkout_EnterPassword: String { return self._s[3413]! } - public var Share_AuthTitle: String { return self._s[3415]! } - public var Activity_UploadingDocument: String { return self._s[3416]! } - public var State_Connecting: String { return self._s[3417]! } - public var Profile_MessageLifetime1w: String { return self._s[3418]! } - public var Conversation_ContextMenuReport: String { return self._s[3419]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3420]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3421]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3429]! } + public var ChatSettings_Title: String { return self._s[3431]! } + public var Passport_PasswordReset: String { return self._s[3432]! } + public var SocksProxySetup_TypeNone: String { return self._s[3433]! } + public var EditTheme_Title: String { return self._s[3435]! } + public var PhoneNumberHelp_Help: String { return self._s[3436]! } + public var Checkout_EnterPassword: String { return self._s[3437]! } + public var Share_AuthTitle: String { return self._s[3439]! } + public var Activity_UploadingDocument: String { return self._s[3440]! } + public var State_Connecting: String { return self._s[3441]! } + public var Profile_MessageLifetime1w: String { return self._s[3442]! } + public var Conversation_ContextMenuReport: String { return self._s[3443]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3444]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3445]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3422]!, self._r[3422]!, [_0]) + return formatWithArgumentRanges(self._s[3446]!, self._r[3446]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3423]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3424]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3425]! } - public var PhotoEditor_Set: String { return self._s[3426]! } - public var EmptyGroupInfo_Title: String { return self._s[3427]! } - public var Login_PadPhoneHelp: String { return self._s[3428]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3430]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3432]! } - public var NotificationsSound_Complete: String { return self._s[3433]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3434]! } - public var Group_Info_AdminLog: String { return self._s[3435]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3436]! } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3437]! } - public var Conversation_Admin: String { return self._s[3439]! } - public var Conversation_GifTooltip: String { return self._s[3440]! } - public var Passport_NotLoggedInMessage: String { return self._s[3441]! } + public var AuthSessions_Terminate: String { return self._s[3447]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3448]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3449]! } + public var PhotoEditor_Set: String { return self._s[3450]! } + public var EmptyGroupInfo_Title: String { return self._s[3451]! } + public var Login_PadPhoneHelp: String { return self._s[3452]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3454]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3456]! } + public var NotificationsSound_Complete: String { return self._s[3457]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3458]! } + public var Group_Info_AdminLog: String { return self._s[3459]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3460]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3461]! } + public var Conversation_Admin: String { return self._s[3463]! } + public var Conversation_GifTooltip: String { return self._s[3464]! } + public var Passport_NotLoggedInMessage: String { return self._s[3465]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3442]!, self._r[3442]!, [_0]) + return formatWithArgumentRanges(self._s[3467]!, self._r[3467]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3443]! } - public var SharedMedia_EmptyTitle: String { return self._s[3445]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3447]! } - public var Username_Help: String { return self._s[3448]! } - public var DialogList_LanguageTooltip: String { return self._s[3450]! } - public var Map_LoadError: String { return self._s[3451]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3452]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3453]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3454]! } - public var Notification_Exceptions_NewException: String { return self._s[3455]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3456]! } - public var WatchRemote_AlertText: String { return self._s[3457]! } - public var EditTheme_UploadEditedInfo: String { return self._s[3458]! } - public var ChatSettings_ConnectionType_Title: String { return self._s[3461]! } + public var Profile_MessageLifetimeForever: String { return self._s[3468]! } + public var SharedMedia_EmptyTitle: String { return self._s[3470]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3472]! } + public var Username_Help: String { return self._s[3473]! } + public var DialogList_LanguageTooltip: String { return self._s[3475]! } + public var Map_LoadError: String { return self._s[3476]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3477]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3478]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3479]! } + public var Notification_Exceptions_NewException: String { return self._s[3480]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3481]! } + public var WatchRemote_AlertText: String { return self._s[3482]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3485]! } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3462]!, self._r[3462]!, [_0]) + return formatWithArgumentRanges(self._s[3486]!, self._r[3486]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3463]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3464]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3487]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3488]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3465]!, self._r[3465]!, [_0]) + return formatWithArgumentRanges(self._s[3489]!, self._r[3489]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3466]!, self._r[3466]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3490]!, self._r[3490]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3467]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3468]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3470]! } - public var ChatList_UndoArchiveText1: String { return self._s[3471]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3472]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3473]! } - public var Cache_ClearNone: String { return self._s[3474]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3475]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3476]! } + public var Group_AdminLog_EmptyText: String { return self._s[3491]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3492]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3494]! } + public var ChatList_UndoArchiveText1: String { return self._s[3495]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3496]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3497]! } + public var Cache_ClearNone: String { return self._s[3498]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3499]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3500]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3477]!, self._r[3477]!, [_0]) + return formatWithArgumentRanges(self._s[3501]!, self._r[3501]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[3478]! } + public var Passport_Identity_Country: String { return self._s[3502]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3479]!, self._r[3479]!, [_0]) + return formatWithArgumentRanges(self._s[3503]!, self._r[3503]!, [_0]) } public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3480]!, self._r[3480]!, [_0]) + return formatWithArgumentRanges(self._s[3504]!, self._r[3504]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3481]! } - public var AccessDenied_Settings: String { return self._s[3482]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3483]! } - public var Month_ShortMay: String { return self._s[3484]! } - public var Compose_NewGroup: String { return self._s[3485]! } - public var Group_Setup_TypePrivate: String { return self._s[3487]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3489]! } - public var Appearance_ThemeDayClassic: String { return self._s[3490]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3491]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3492]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3493]! } - public var Conversation_typing: String { return self._s[3495]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[3496]! } - public var Paint_Masks: String { return self._s[3497]! } - public var Contacts_DeselectAll: String { return self._s[3498]! } - public var Username_InvalidTaken: String { return self._s[3499]! } - public var Call_StatusNoAnswer: String { return self._s[3500]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3501]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3502]! } - public var Passport_Identity_Selfie: String { return self._s[3503]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3504]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3505]! } - public var Conversation_ClearSecretHistory: String { return self._s[3506]! } - public var PeopleNearby_Description: String { return self._s[3508]! } - public var NetworkUsageSettings_Title: String { return self._s[3509]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3511]! } + public var Exceptions_AddToExceptions: String { return self._s[3505]! } + public var AccessDenied_Settings: String { return self._s[3506]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3507]! } + public var Month_ShortMay: String { return self._s[3508]! } + public var Compose_NewGroup: String { return self._s[3510]! } + public var Group_Setup_TypePrivate: String { return self._s[3512]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3514]! } + public var Appearance_ThemeDayClassic: String { return self._s[3515]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3516]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3517]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3518]! } + public var Conversation_typing: String { return self._s[3520]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[3521]! } + public var Paint_Masks: String { return self._s[3522]! } + public var Contacts_DeselectAll: String { return self._s[3523]! } + public var Username_InvalidTaken: String { return self._s[3524]! } + public var Call_StatusNoAnswer: String { return self._s[3525]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[3526]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3527]! } + public var Passport_Identity_Selfie: String { return self._s[3528]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[3529]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3530]! } + public var Conversation_ClearSecretHistory: String { return self._s[3531]! } + public var PeopleNearby_Description: String { return self._s[3533]! } + public var NetworkUsageSettings_Title: String { return self._s[3534]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3536]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3513]!, self._r[3513]!, [_0]) + return formatWithArgumentRanges(self._s[3538]!, self._r[3538]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3514]!, self._r[3514]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3539]!, self._r[3539]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[3516]! } - public var VoiceOver_Navigation_Search: String { return self._s[3517]! } - public var Map_LiveLocationTitle: String { return self._s[3518]! } - public var Login_InfoAvatarAdd: String { return self._s[3519]! } - public var Passport_Identity_FilesView: String { return self._s[3520]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[3521]! } - public var Privacy_Calls_NeverAllow: String { return self._s[3522]! } - public var VoiceOver_Chat_File: String { return self._s[3523]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[3541]! } + public var VoiceOver_Navigation_Search: String { return self._s[3542]! } + public var Map_LiveLocationTitle: String { return self._s[3543]! } + public var Login_InfoAvatarAdd: String { return self._s[3544]! } + public var Passport_Identity_FilesView: String { return self._s[3545]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[3546]! } + public var Privacy_Calls_NeverAllow: String { return self._s[3547]! } + public var VoiceOver_Chat_File: String { return self._s[3548]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3524]!, self._r[3524]!, [_0]) + return formatWithArgumentRanges(self._s[3549]!, self._r[3549]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[3525]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[3526]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3527]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[3550]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[3551]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3552]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3528]!, self._r[3528]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3553]!, self._r[3553]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3529]! } - public var Tour_Title2: String { return self._s[3530]! } - public var Conversation_FileOpenIn: String { return self._s[3531]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3532]! } - public var Wallpaper_Set: String { return self._s[3533]! } - public var Passport_Identity_Translations: String { return self._s[3535]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3554]! } + public var Tour_Title2: String { return self._s[3555]! } + public var Conversation_FileOpenIn: String { return self._s[3556]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3557]! } + public var Wallpaper_Set: String { return self._s[3558]! } + public var Passport_Identity_Translations: String { return self._s[3560]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3536]!, self._r[3536]!, [_0]) + return formatWithArgumentRanges(self._s[3561]!, self._r[3561]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[3537]! } + public var Channel_LeaveChannel: String { return self._s[3562]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3538]!, self._r[3538]!, [_1]) + return formatWithArgumentRanges(self._s[3563]!, self._r[3563]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3540]! } - public var PhotoEditor_HighlightsTint: String { return self._s[3541]! } - public var Passport_Email_Delete: String { return self._s[3542]! } - public var Conversation_Mute: String { return self._s[3544]! } - public var Channel_AddBotAsAdmin: String { return self._s[3545]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[3547]! } - public var Channel_Management_LabelOwner: String { return self._s[3549]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3565]! } + public var PhotoEditor_HighlightsTint: String { return self._s[3566]! } + public var Passport_Email_Delete: String { return self._s[3567]! } + public var Conversation_Mute: String { return self._s[3569]! } + public var Channel_AddBotAsAdmin: String { return self._s[3570]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[3572]! } + public var Channel_Management_LabelOwner: String { return self._s[3574]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3550]!, self._r[3550]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3575]!, self._r[3575]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[3551]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[3552]! } - public var Common_No: String { return self._s[3553]! } - public var Weekday_Sunday: String { return self._s[3554]! } - public var Notification_Reply: String { return self._s[3555]! } - public var Conversation_ViewMessage: String { return self._s[3556]! } + public var Calls_CallTabDescription: String { return self._s[3576]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[3577]! } + public var Common_No: String { return self._s[3578]! } + public var Weekday_Sunday: String { return self._s[3579]! } + public var Notification_Reply: String { return self._s[3580]! } + public var Conversation_ViewMessage: String { return self._s[3581]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3557]!, self._r[3557]!, [_0]) + return formatWithArgumentRanges(self._s[3582]!, self._r[3582]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3558]!, self._r[3558]!, [_0]) + return formatWithArgumentRanges(self._s[3583]!, self._r[3583]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3559]! } - public var Message_PinnedDocumentMessage: String { return self._s[3560]! } - public var DialogList_TabTitle: String { return self._s[3562]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[3563]! } - public var Passport_FieldEmail: String { return self._s[3564]! } - public var Conversation_UnpinMessageAlert: String { return self._s[3565]! } - public var Passport_Address_TypeBankStatement: String { return self._s[3566]! } - public var Passport_Identity_ExpiryDate: String { return self._s[3567]! } - public var Privacy_Calls_P2P: String { return self._s[3568]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3584]! } + public var Message_PinnedDocumentMessage: String { return self._s[3585]! } + public var DialogList_TabTitle: String { return self._s[3587]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[3588]! } + public var Passport_FieldEmail: String { return self._s[3589]! } + public var Conversation_UnpinMessageAlert: String { return self._s[3590]! } + public var Passport_Address_TypeBankStatement: String { return self._s[3591]! } + public var Passport_Identity_ExpiryDate: String { return self._s[3592]! } + public var Privacy_Calls_P2P: String { return self._s[3593]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3570]!, self._r[3570]!, [_0]) - } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[3571]! } - public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3572]!, self._r[3572]!, [_1, _2]) - } - public var Stickers_ClearRecent: String { return self._s[3573]! } - public var EnterPasscode_ChangeTitle: String { return self._s[3574]! } - public var Passport_InfoText: String { return self._s[3575]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3576]! } - public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3577]!, self._r[3577]!, [_0]) - } - public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3578]!, self._r[3578]!, [_1, _2, _3]) - } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3579]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[3580]! } - public var VoiceOver_Navigation_Compose: String { return self._s[3581]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[3582]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[3584]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3585]! } - public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3586]!, self._r[3586]!, [_1, _2]) - } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3588]! } - public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3590]!, self._r[3590]!, [_0]) - } - public var DialogList_Unread: String { return self._s[3591]! } - public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3592]!, self._r[3592]!, [_1, _2]) - } - public var User_DeletedAccount: String { return self._s[3593]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3594]! } - public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3595]!, self._r[3595]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[3596]! } - public var SharedMedia_CategoryMedia: String { return self._s[3597]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3598]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3599]! } - public var Watch_ChatList_Compose: String { return self._s[3600]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3601]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[3602]! } - public var Watch_Microphone_Access: String { return self._s[3603]! } - public var Group_Setup_HistoryHeader: String { return self._s[3604]! } - public var Map_SetThisLocation: String { return self._s[3605]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3606]! } - public var Activity_UploadingPhoto: String { return self._s[3607]! } - public var Conversation_Edit: String { return self._s[3609]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[3610]! } - public var Login_TermsOfServiceDecline: String { return self._s[3611]! } - public var Message_PinnedContactMessage: String { return self._s[3612]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[3596]! } + public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3597]!, self._r[3597]!, [_1, _2]) + } + public var Stickers_ClearRecent: String { return self._s[3598]! } + public var EnterPasscode_ChangeTitle: String { return self._s[3599]! } + public var Passport_InfoText: String { return self._s[3600]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3601]! } + public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3602]!, self._r[3602]!, [_0]) + } + public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3603]!, self._r[3603]!, [_1, _2, _3]) + } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3604]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[3605]! } + public var VoiceOver_Navigation_Compose: String { return self._s[3606]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[3607]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[3609]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3610]! } + public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3611]!, self._r[3611]!, [_1, _2]) + } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3613]! } + public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3615]!, self._r[3615]!, [_0]) + } + public var DialogList_Unread: String { return self._s[3616]! } + public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3617]!, self._r[3617]!, [_1, _2]) + } + public var User_DeletedAccount: String { return self._s[3618]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3619]! } + public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3620]!, self._r[3620]!, [_0]) + } + public var UserInfo_NotificationsDefault: String { return self._s[3621]! } + public var SharedMedia_CategoryMedia: String { return self._s[3622]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3623]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3624]! } + public var Watch_ChatList_Compose: String { return self._s[3625]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3626]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[3627]! } + public var Watch_Microphone_Access: String { return self._s[3628]! } + public var Group_Setup_HistoryHeader: String { return self._s[3629]! } + public var Map_SetThisLocation: String { return self._s[3630]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3631]! } + public var Activity_UploadingPhoto: String { return self._s[3632]! } + public var Conversation_Edit: String { return self._s[3634]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[3635]! } + public var Login_TermsOfServiceDecline: String { return self._s[3636]! } + public var Message_PinnedContactMessage: String { return self._s[3637]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3613]!, self._r[3613]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3638]!, self._r[3638]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3614]!, self._r[3614]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[3639]!, self._r[3639]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[3615]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[3617]! } + public var Appearance_LargeEmoji: String { return self._s[3640]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[3642]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[3643]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3618]!, self._r[3618]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3644]!, self._r[3644]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[3619]! } - public var Message_PinnedPhotoMessage: String { return self._s[3620]! } - public var Passport_FieldPhone: String { return self._s[3621]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3622]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[3623]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[3625]! } - public var Conversation_Call: String { return self._s[3626]! } - public var Common_TakePhoto: String { return self._s[3628]! } - public var Group_EditAdmin_RankTitle: String { return self._s[3629]! } - public var Channel_NotificationLoading: String { return self._s[3630]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[3645]! } + public var Message_PinnedPhotoMessage: String { return self._s[3646]! } + public var Passport_FieldPhone: String { return self._s[3647]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3648]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[3649]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[3651]! } + public var Conversation_Call: String { return self._s[3652]! } + public var Common_TakePhoto: String { return self._s[3654]! } + public var Group_EditAdmin_RankTitle: String { return self._s[3655]! } + public var Channel_NotificationLoading: String { return self._s[3656]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3631]!, self._r[3631]!, [_0]) + return formatWithArgumentRanges(self._s[3657]!, self._r[3657]!, [_0]) } public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3632]!, self._r[3632]!, [_0]) + return formatWithArgumentRanges(self._s[3658]!, self._r[3658]!, [_0]) } public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3633]!, self._r[3633]!, [_1]) + return formatWithArgumentRanges(self._s[3659]!, self._r[3659]!, [_1]) } - public var Permissions_SiriTitle_v0: String { return self._s[3634]! } + public var Permissions_SiriTitle_v0: String { return self._s[3660]! } public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3635]!, self._r[3635]!, [_0]) + return formatWithArgumentRanges(self._s[3661]!, self._r[3661]!, [_0]) } public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3636]!, self._r[3636]!, [_0]) + return formatWithArgumentRanges(self._s[3662]!, self._r[3662]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[3637]! } - public var Common_edit: String { return self._s[3638]! } - public var PrivacySettings_AuthSessions: String { return self._s[3639]! } - public var Month_ShortJune: String { return self._s[3640]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3641]! } - public var Call_ReportSend: String { return self._s[3642]! } - public var Watch_LastSeen_JustNow: String { return self._s[3643]! } - public var Notifications_MessageNotifications: String { return self._s[3644]! } - public var WallpaperSearch_ColorGreen: String { return self._s[3645]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[3647]! } - public var Group_Status: String { return self._s[3648]! } + public var Channel_MessagePhotoRemoved: String { return self._s[3663]! } + public var Common_edit: String { return self._s[3664]! } + public var PrivacySettings_AuthSessions: String { return self._s[3665]! } + public var Month_ShortJune: String { return self._s[3666]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3667]! } + public var Call_ReportSend: String { return self._s[3668]! } + public var Watch_LastSeen_JustNow: String { return self._s[3669]! } + public var Notifications_MessageNotifications: String { return self._s[3670]! } + public var WallpaperSearch_ColorGreen: String { return self._s[3671]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[3673]! } + public var Group_Status: String { return self._s[3674]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3649]!, self._r[3649]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3675]!, self._r[3675]!, [_0, _1]) } - public var TextFormat_AddLinkTitle: String { return self._s[3650]! } - public var ShareMenu_ShareTo: String { return self._s[3651]! } - public var Conversation_Moderate_Ban: String { return self._s[3652]! } + public var TextFormat_AddLinkTitle: String { return self._s[3676]! } + public var ShareMenu_ShareTo: String { return self._s[3677]! } + public var Conversation_Moderate_Ban: String { return self._s[3678]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3653]!, self._r[3653]!, [_0]) + return formatWithArgumentRanges(self._s[3679]!, self._r[3679]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[3654]! } - public var Map_LiveLocationFor8Hours: String { return self._s[3655]! } + public var SharedMedia_ViewInChat: String { return self._s[3680]! } + public var Map_LiveLocationFor8Hours: String { return self._s[3681]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3656]!, self._r[3656]!, [_1]) + return formatWithArgumentRanges(self._s[3682]!, self._r[3682]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3657]!, self._r[3657]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3683]!, self._r[3683]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3659]!, self._r[3659]!, [_0]) + return formatWithArgumentRanges(self._s[3685]!, self._r[3685]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[3660]! } - public var Appearance_ReduceMotion: String { return self._s[3661]! } + public var Map_OpenInHereMaps: String { return self._s[3686]! } + public var Appearance_ReduceMotion: String { return self._s[3687]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3662]!, self._r[3662]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3688]!, self._r[3688]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[3663]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[3664]! } - public var PhotoEditor_Skip: String { return self._s[3665]! } - public func MuteFor_Days(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[3689]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[3690]! } + public var PhotoEditor_Skip: String { return self._s[3691]! } + public func ChatList_SelectedChats(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedFiles(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_UserInfo_Mute(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusOnline(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideoMessages(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortSeconds(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedStickers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Years(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Hours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_Exceptions(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideos(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortHours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Months(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_File(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAMinutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedLocations(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortDays(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, _1, _2) } public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Seconds(_ value: Int32) -> String { + public func QuickSend_Photos(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) } - public func Passport_Scans(_ value: Int32) -> String { + public func MessageTimer_Hours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPhotos(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedContacts(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) - } - public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func MuteFor_Hours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedGifs(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) - } - public func UserCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPolls(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func SharedMedia_Link(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Contacts_ImportersCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) } public func LastSeen_HoursAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Notifications_Exceptions(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusSubscribers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) } public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MuteExpires_Hours(_ value: Int32) -> String { + public func ForwardedContacts(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Theme_UsersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareVideo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedGifs(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedFiles(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) + } + public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusMembers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortHours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Weeks(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusOnline(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_StickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Contacts_ImportersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedStickers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Media_ShareItem(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendItem(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(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 = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) @@ -4428,291 +4453,295 @@ public final class PresentationStrings { let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) } - public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_SelectedChats(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessagePoll_VotedCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(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 = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAHours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusMembers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func QuickSend_Photos(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Weeks(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Photo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Invitation_Members(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(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 = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_StickerCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortMinutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Generic(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareItem(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedMessages(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_SharePhoto(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendGif(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAudios(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendVideo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Seconds(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, _1, _2) - } public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func SharedMedia_Video(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareVideo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, _2, _1, _3) } public func StickerPack_AddStickerCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) } - public func InviteText_ContactsCountText(_ value: Int32) -> String { + public func Map_ETAHours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) } - public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + public func ForwardedVideoMessages(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(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[59 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_SelectedMessages(_ value: Int32) -> String { + public func MessageTimer_Months(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(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[60 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAudios(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Passport_Scans(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedLocations(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendGif(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) } public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(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[67 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Invitation_Members(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_File(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Seconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_SelectedMessages(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Media_SharePhoto(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortDays(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPhotos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Link(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Years(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPolls(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Video(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func UserCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedMessages(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddMaskCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) } public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Generic(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessagePoll_VotedCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue) } public init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) { diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift index e90ba0dfa7..12c9d56dfe 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift @@ -19,10 +19,12 @@ public final class PresentationThemeGradientColors { } public final class PresentationThemeIntro { + public let statusBarStyle: PresentationThemeStatusBarStyle public let startButtonColor: UIColor public let dotColor: UIColor - public init(startButtonColor: UIColor, dotColor: UIColor) { + public init(statusBarStyle: PresentationThemeStatusBarStyle, startButtonColor: UIColor, dotColor: UIColor) { + self.statusBarStyle = statusBarStyle self.startButtonColor = startButtonColor self.dotColor = dotColor } @@ -934,7 +936,6 @@ public enum PresentationThemeName: Equatable { public final class PresentationTheme: Equatable { public let name: PresentationThemeName - public let author: String? public let referenceTheme: PresentationBuiltinThemeReference public let overallDarkAppearance: Bool public let baseColor: PresentationThemeBaseColor? @@ -951,9 +952,8 @@ public final class PresentationTheme: Equatable { public let resourceCache: PresentationsResourceCache = PresentationsResourceCache() - public init(name: PresentationThemeName, author: String?, referenceTheme: PresentationBuiltinThemeReference, overallDarkAppearance: Bool, baseColor: PresentationThemeBaseColor?, intro: PresentationThemeIntro, passcode: PresentationThemePasscode, rootController: PresentationThemeRootController, list: PresentationThemeList, chatList: PresentationThemeChatList, chat: PresentationThemeChat, actionSheet: PresentationThemeActionSheet, contextMenu: PresentationThemeContextMenu, inAppNotification: PresentationThemeInAppNotification, preview: Bool = false) { + public init(name: PresentationThemeName, referenceTheme: PresentationBuiltinThemeReference, overallDarkAppearance: Bool, baseColor: PresentationThemeBaseColor?, intro: PresentationThemeIntro, passcode: PresentationThemePasscode, rootController: PresentationThemeRootController, list: PresentationThemeList, chatList: PresentationThemeChatList, chat: PresentationThemeChat, actionSheet: PresentationThemeActionSheet, contextMenu: PresentationThemeContextMenu, inAppNotification: PresentationThemeInAppNotification, preview: Bool = false) { self.name = name - self.author = author self.referenceTheme = referenceTheme self.overallDarkAppearance = overallDarkAppearance self.baseColor = baseColor @@ -981,20 +981,16 @@ public final class PresentationTheme: Equatable { return lhs === rhs } - public func withUpdated(name: String?, author: String?, defaultWallpaper: TelegramWallpaper?) -> PresentationTheme { + public func withUpdated(name: String?, defaultWallpaper: TelegramWallpaper?) -> PresentationTheme { var defaultWallpaper = defaultWallpaper if let wallpaper = defaultWallpaper { switch wallpaper { case .image: defaultWallpaper = nil - case let .file(file): - if file.isPattern { - defaultWallpaper = nil - } default: break } } - return PresentationTheme(name: name.flatMap(PresentationThemeName.custom) ?? .custom(self.name.string), author: author ?? self.author, referenceTheme: self.referenceTheme, overallDarkAppearance: self.overallDarkAppearance, baseColor: nil, intro: self.intro, passcode: self.passcode, rootController: self.rootController, list: self.list, chatList: self.chatList, chat: self.chat.withUpdatedDefaultWallpaper(defaultWallpaper), actionSheet: self.actionSheet, contextMenu: self.contextMenu, inAppNotification: self.inAppNotification) + return PresentationTheme(name: name.flatMap(PresentationThemeName.custom) ?? .custom(self.name.string), referenceTheme: self.referenceTheme, overallDarkAppearance: self.overallDarkAppearance, baseColor: nil, intro: self.intro, passcode: self.passcode, rootController: self.rootController, list: self.list, chatList: self.chatList, chat: self.chat.withUpdatedDefaultWallpaper(defaultWallpaper), actionSheet: self.actionSheet, contextMenu: self.contextMenu, inAppNotification: self.inAppNotification) } } diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift index b042ce1bc1..590742ca56 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift @@ -36,7 +36,36 @@ extension TelegramWallpaper: Codable { if [6,7].contains(value.count), let color = UIColor(hexString: value) { self = .color(Int32(bitPattern: color.rgb)) } else { - self = .file(id: 0, accessHash: 0, isCreator: false, isDefault: false, isPattern: false, isDark: false, slug: value, file: TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "", size: nil, attributes: []), settings: WallpaperSettings(blur: false, motion: false, color: nil, intensity: nil)) + let components = value.components(separatedBy: " ") + var slug: String? + var color: Int32? + var intensity: Int32? + var blur = false + var motion = false + if !components.isEmpty { + slug = components[0] + } + if components.count > 1, !["motion", "blur"].contains(components[1]), components[1].count == 6, let value = UIColor(hexString: components[1]) { + color = Int32(bitPattern: value.rgb) + } + if components.count > 2, !["motion", "blur"].contains(components[2]), let value = Int32(components[2]) { + if value >= 0 && value <= 100 { + intensity = value + } else { + intensity = 50 + } + } + if components.contains("motion") { + motion = true + } + if components.contains("blur") { + blur = true + } + if let slug = slug { + self = .file(id: 0, accessHash: 0, isCreator: false, isDefault: false, isPattern: color != nil, isDark: false, slug: slug, file: TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "", size: nil, attributes: []), settings: WallpaperSettings(blur: blur, motion: motion, color: color, intensity: intensity)) + } else { + throw PresentationThemeDecodingError.generic + } } } } else { @@ -52,7 +81,23 @@ extension TelegramWallpaper: Codable { case let .color(value): try container.encode(String(format: "%06x", value)) case let .file(file): - try container.encode(file.slug) + var components: [String] = [] + components.append(file.slug) + if file.isPattern { + if let color = file.settings.color { + components.append(String(format: "%06x", color)) + } + if let intensity = file.settings.intensity { + components.append("\(intensity)") + } + } + if file.settings.motion { + components.append("motion") + } + if file.settings.blur { + components.append("blur") + } + try container.encode(components.joined(separator: " ")) default: break } @@ -192,18 +237,21 @@ extension PresentationThemeGradientColors: Codable { extension PresentationThemeIntro: Codable { enum CodingKeys: String, CodingKey { + case statusBar case startButton case dot } public convenience init(from decoder: Decoder) throws { let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(startButtonColor: try decodeColor(values, .startButton), + self.init(statusBarStyle: try values.decode(PresentationThemeStatusBarStyle.self, forKey: .statusBar), + startButtonColor: try decodeColor(values, .startButton), dotColor: try decodeColor(values, .dot)) } public func encode(to encoder: Encoder) throws { var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.statusBarStyle, forKey: .statusBar) try encodeColor(&values, self.startButtonColor, .startButton) try encodeColor(&values, self.dotColor, .dot) } @@ -1521,7 +1569,6 @@ extension PresentationBuiltinThemeReference: Codable { extension PresentationTheme: Codable { enum CodingKeys: String, CodingKey { case name - case author case basedOn case dark case intro @@ -1550,7 +1597,6 @@ extension PresentationTheme: Codable { } self.init(name: (try? values.decode(PresentationThemeName.self, forKey: .name)) ?? .custom("Untitled"), - author: (try? values.decode(String.self, forKey: .author)) ?? nil, referenceTheme: referenceTheme, overallDarkAppearance: (try? values.decode(Bool.self, forKey: .dark)) ?? false, baseColor: nil, @@ -1569,7 +1615,6 @@ extension PresentationTheme: Codable { public func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(self.name, forKey: .name) - try container.encode(self.author, forKey: .author) try container.encode(self.referenceTheme, forKey: .basedOn) try container.encode(self.overallDarkAppearance, forKey: .dark) try container.encode(self.intro, forKey: .intro) diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift index 78058fb27d..77dd16f219 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift @@ -153,7 +153,7 @@ public struct PresentationResourcesChatList { context.clear(bounds) switch state { case .regular: - context.setFillColor(theme.chatList.backgroundColor.cgColor) + context.setFillColor(theme.chatList.itemBackgroundColor.cgColor) case .highlighted: context.setFillColor(theme.chatList.itemHighlightedBackgroundColor.cgColor) case .pinned: diff --git a/submodules/TelegramStringFormatting/Sources/NumberFormat.swift b/submodules/TelegramStringFormatting/Sources/NumberFormat.swift index 987c42651a..489a7330ee 100644 --- a/submodules/TelegramStringFormatting/Sources/NumberFormat.swift +++ b/submodules/TelegramStringFormatting/Sources/NumberFormat.swift @@ -1,10 +1,39 @@ import Foundation -public func convertToArabicNumeralString(_ string: String) -> String { +public enum ArabicNumeralStringType { + case western + case arabic + case persian +} + +public func normalizeArabicNumeralString(_ string: String, type: ArabicNumeralStringType) -> String { var string = string - let arabicNumbers = ["Ù ": "0", "Ù¡": "1", "Ù¢": "2", "Ù£": "3", "Ù¤": "4", "Ù¥": "5", "Ù¦": "6", "Ù§": "7", "Ù¨": "8", "Ù©": "9"] - for (arabic, generic) in arabicNumbers { - string = string.replacingOccurrences(of: generic, with: arabic) + + let numerals = [ + ("0", "Ù ", "Û°"), + ("1", "Ù¡", "Û±"), + ("2", "Ù¢", "Û²"), + ("3", "Ù£", "Û³"), + ("4", "Ù¤", "Û´"), + ("5", "Ù¥", "Ûµ"), + ("6", "Ù¦", "Û¶"), + ("7", "Ù§", "Û·"), + ("8", "Ù¨", "Û¸"), + ("9", "Ù©", "Û¹"), + ] + for (western, arabic, persian) in numerals { + switch type { + case .western: + string = string.replacingOccurrences(of: arabic, with: western) + string = string.replacingOccurrences(of: persian, with: western) + case .arabic: + string = string.replacingOccurrences(of: western, with: arabic) + string = string.replacingOccurrences(of: persian, with: arabic) + case .persian: + string = string.replacingOccurrences(of: western, with: persian) + string = string.replacingOccurrences(of: arabic, with: persian) + } + } return string } diff --git a/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift b/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift index 5a3b88568c..ad1458ec0c 100644 --- a/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift +++ b/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift @@ -114,7 +114,7 @@ public func stringForUserPresence(strings: PresentationStrings, day: RelativeTim let dayString: String switch day { case .today: - dayString = strings.LastSeen_AtDate(strings.Time_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0).0 + dayString = strings.LastSeen_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 case .yesterday: dayString = strings.LastSeen_YesterdayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0 } diff --git a/submodules/TelegramUI/TelegramUI/AppDelegate.swift b/submodules/TelegramUI/TelegramUI/AppDelegate.swift index d1de9c32bb..6054cc6434 100644 --- a/submodules/TelegramUI/TelegramUI/AppDelegate.swift +++ b/submodules/TelegramUI/TelegramUI/AppDelegate.swift @@ -595,12 +595,12 @@ final class SharedApplicationContext { if #available(iOS 10.3, *) { var icons = [PresentationAppIcon(name: "Blue", imageName: "BlueIcon", isDefault: buildConfig.isAppStoreBuild), PresentationAppIcon(name: "Black", imageName: "BlackIcon", isDefault: buildConfig.isInternalBuild), - PresentationAppIcon(name: "BlueClassic", imageName: "BlueClassicIcon", isDefault: false), - PresentationAppIcon(name: "BlackClassic", imageName: "BlackClassicIcon", isDefault: false), - PresentationAppIcon(name: "BlueFilled", imageName: "BlueFilledIcon", isDefault: false), - PresentationAppIcon(name: "BlackFilled", imageName: "BlackFilledIcon", isDefault: false)] + PresentationAppIcon(name: "BlueClassic", imageName: "BlueClassicIcon"), + PresentationAppIcon(name: "BlackClassic", imageName: "BlackClassicIcon"), + PresentationAppIcon(name: "BlueFilled", imageName: "BlueFilledIcon"), + PresentationAppIcon(name: "BlackFilled", imageName: "BlackFilledIcon")] if buildConfig.isInternalBuild { - icons.append(PresentationAppIcon(name: "WhiteFilled", imageName: "WhiteFilledIcon", isDefault: false)) + icons.append(PresentationAppIcon(name: "WhiteFilled", imageName: "WhiteFilledIcon")) } return icons } else { diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceAwaitingAccountResetController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceAwaitingAccountResetController.swift index 378e9875f5..9f5b6e184c 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceAwaitingAccountResetController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceAwaitingAccountResetController.swift @@ -38,7 +38,7 @@ final class AuthorizationSequenceAwaitingAccountResetController: ViewController self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) - self.statusBar.statusBarStyle = theme.rootController.statusBarStyle.style + self.statusBar.statusBarStyle = theme.intro.statusBarStyle.style self.attemptNavigation = { _ in return false diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceCodeEntryController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceCodeEntryController.swift index 0e218780b8..7f894be7a6 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceCodeEntryController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceCodeEntryController.swift @@ -47,7 +47,7 @@ final class AuthorizationSequenceCodeEntryController: ViewController { self.hasActiveInput = true - self.statusBar.statusBarStyle = theme.rootController.statusBarStyle.style + self.statusBar.statusBarStyle = theme.intro.statusBarStyle.style self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.strings.Common_Next, style: .done, target: self, action: #selector(self.nextPressed)) diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordEntryController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordEntryController.swift index 228047eb24..5d6523cc89 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordEntryController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordEntryController.swift @@ -54,7 +54,7 @@ final class AuthorizationSequencePasswordEntryController: ViewController { self.hasActiveInput = true - self.statusBar.statusBarStyle = theme.rootController.statusBarStyle.style + self.statusBar.statusBarStyle = theme.intro.statusBarStyle.style self.attemptNavigation = { _ in return false diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordRecoveryController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordRecoveryController.swift index ba281377ed..4b9a2bc5a4 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordRecoveryController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequencePasswordRecoveryController.swift @@ -42,7 +42,7 @@ final class AuthorizationSequencePasswordRecoveryController: ViewController { self.hasActiveInput = true - self.statusBar.statusBarStyle = theme.rootController.statusBarStyle.style + self.statusBar.statusBarStyle = theme.intro.statusBarStyle.style self.attemptNavigation = { _ in return false diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryController.swift index 623c468c19..5321ea1cab 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequencePhoneEntryController.swift @@ -61,7 +61,7 @@ final class AuthorizationSequencePhoneEntryController: ViewController { self.hasActiveInput = true - self.statusBar.statusBarStyle = theme.rootController.statusBarStyle.style + self.statusBar.statusBarStyle = theme.intro.statusBarStyle.style self.attemptNavigation = { _ in return false } diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSignUpController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSignUpController.swift index bb41da13fe..e7d751f90f 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSignUpController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSignUpController.swift @@ -47,7 +47,7 @@ final class AuthorizationSequenceSignUpController: ViewController { self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) - self.statusBar.statusBarStyle = self.theme.rootController.statusBarStyle.style + self.statusBar.statusBarStyle = theme.intro.statusBarStyle.style self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.strings.Common_Next, style: .done, target: self, action: #selector(self.nextPressed)) diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift index f3f687b4b6..eba3d7c3b8 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift @@ -74,7 +74,7 @@ final class AuthorizationSequenceSplashController: ViewController { self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) - self.statusBar.statusBarStyle = theme.rootController.statusBarStyle.style + self.statusBar.statusBarStyle = theme.intro.statusBarStyle.style self.controller.startMessaging = { [weak self] in self?.activateLocalization("en") diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index eaae0a2a16..c84095e2cf 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -527,6 +527,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } if let messages = strongSelf.chatDisplayNode.historyNode.messageGroupInCurrentHistoryView(message.id) { (strongSelf.view.window as? WindowHost)?.cancelInteractiveKeyboardGestures() + strongSelf.chatDisplayNode.cancelInteractiveKeyboardGestures() var updatedMessages = messages for i in 0 ..< updatedMessages.count { if updatedMessages[i].id == message.id { @@ -1554,10 +1555,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G let controller = ChatScheduleTimeController(context: strongSelf.context, mode: mode, minimalTime: strongSelf.presentationInterfaceState.slowmodeState?.timeout, completion: { [weak self] scheduleTime in if let strongSelf = self { - strongSelf.chatDisplayNode.sendCurrentMessage(scheduleTime: scheduleTime) - if !strongSelf.presentationInterfaceState.isScheduledMessages { - strongSelf.openScheduledMessages() - } + strongSelf.chatDisplayNode.sendCurrentMessage(scheduleTime: scheduleTime, completion: { [weak self] in + if let strongSelf = self, !strongSelf.presentationInterfaceState.isScheduledMessages { + strongSelf.openScheduledMessages() + } + }) } }) strongSelf.chatDisplayNode.dismissInput() @@ -2985,7 +2987,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } else { var isScheduled = false for id in messageIds { - if [Namespaces.Message.ScheduledCloud, Namespaces.Message.ScheduledLocal].contains(id.namespace) { + if Namespaces.Message.allScheduled.contains(id.namespace) { isScheduled = true break } @@ -3484,11 +3486,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } let icon: UIImage? - switch DeviceMetrics.forScreenSize(layout.size) { - case .iPhoneX?, .iPhoneXSMax?: - icon = UIImage(bundleImageName: "Chat/Message/VolumeButtonIconX") - default: - icon = UIImage(bundleImageName: "Chat/Message/VolumeButtonIcon") + if layout.deviceMetrics.hasTopNotch { + icon = UIImage(bundleImageName: "Chat/Message/VolumeButtonIconX") + } else { + icon = UIImage(bundleImageName: "Chat/Message/VolumeButtonIcon") } if let location = location, let icon = icon { strongSelf.videoUnmuteTooltipController?.dismiss() @@ -3959,13 +3960,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G strongSelf.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) } - let controller = ChatSendMessageActionSheetController(context: strongSelf.context, controllerInteraction: strongSelf.controllerInteraction, interfaceState: strongSelf.presentationInterfaceState, sendButtonFrame: sendButtonFrame, textInputNode: textInputNode, completion: { [weak self] in + let controller = ChatSendMessageActionSheetController(context: strongSelf.context, controllerInteraction: strongSelf.controllerInteraction, interfaceState: strongSelf.presentationInterfaceState, sendButtonFrame: strongSelf.chatDisplayNode.convert(sendButtonFrame, to: nil), textInputNode: textInputNode, completion: { [weak self] in if let strongSelf = self { strongSelf.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .all) } }) strongSelf.sendMessageActionsController = controller - strongSelf.presentInGlobalOverlay(controller, with: nil) + if layout.isNonExclusive { + strongSelf.present(controller, in: .window(.root)) + } else { + strongSelf.presentInGlobalOverlay(controller, with: nil) + } } }, openScheduledMessages: { [weak self] in if let strongSelf = self { @@ -3975,90 +3980,93 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G switch self.chatLocation { case let .peer(peerId): - let unreadCountsKey: PostboxViewKey = .unreadCounts(items: [.peer(peerId), .total(nil)]) - let notificationSettingsKey: PostboxViewKey = .peerNotificationSettings(peerIds: Set([peerId])) - self.chatUnreadCountDisposable = (self.context.account.postbox.combinedView(keys: [unreadCountsKey, notificationSettingsKey]) - |> deliverOnMainQueue).start(next: { [weak self] views in - if let strongSelf = self { - var unreadCount: Int32 = 0 - var totalChatCount: Int32 = 0 - - let inAppSettings = strongSelf.context.sharedContext.currentInAppNotificationSettings.with { $0 } - if let view = views.views[unreadCountsKey] as? UnreadMessageCountsView { - if let count = view.count(for: .peer(peerId)) { - unreadCount = count - } - if let (_, state) = view.total() { - let (count, _) = renderedTotalUnreadCount(inAppSettings: inAppSettings, totalUnreadState: state) - totalChatCount = count - } - } - - strongSelf.chatDisplayNode.navigateButtons.unreadCount = unreadCount - - if let view = views.views[notificationSettingsKey] as? PeerNotificationSettingsView, let notificationSettings = view.notificationSettings[peerId] { - var globalRemainingUnreadChatCount = totalChatCount - if !notificationSettings.isRemovedFromTotalUnreadCount && unreadCount > 0 { - if case .messages = inAppSettings.totalUnreadCountDisplayCategory { - globalRemainingUnreadChatCount -= unreadCount - } else { - globalRemainingUnreadChatCount -= 1 + if let subject = self.subject, case .scheduledMessages = subject { + } else { + let unreadCountsKey: PostboxViewKey = .unreadCounts(items: [.peer(peerId), .total(nil)]) + let notificationSettingsKey: PostboxViewKey = .peerNotificationSettings(peerIds: Set([peerId])) + self.chatUnreadCountDisposable = (self.context.account.postbox.combinedView(keys: [unreadCountsKey, notificationSettingsKey]) + |> deliverOnMainQueue).start(next: { [weak self] views in + if let strongSelf = self { + var unreadCount: Int32 = 0 + var totalChatCount: Int32 = 0 + + let inAppSettings = strongSelf.context.sharedContext.currentInAppNotificationSettings.with { $0 } + if let view = views.views[unreadCountsKey] as? UnreadMessageCountsView { + if let count = view.count(for: .peer(peerId)) { + unreadCount = count + } + if let (_, state) = view.total() { + let (count, _) = renderedTotalUnreadCount(inAppSettings: inAppSettings, totalUnreadState: state) + totalChatCount = count } } - if globalRemainingUnreadChatCount > 0 { - strongSelf.navigationItem.badge = "\(globalRemainingUnreadChatCount)" - } else { - strongSelf.navigationItem.badge = "" - } - } - } - }) - - self.chatUnreadMentionCountDisposable = (self.context.account.viewTracker.unseenPersonalMessagesCount(peerId: peerId) |> deliverOnMainQueue).start(next: { [weak self] count in - if let strongSelf = self { - strongSelf.chatDisplayNode.navigateButtons.mentionCount = count - } - }) - - let postbox = self.context.account.postbox - let previousPeerCache = Atomic<[PeerId: Peer]>(value: [:]) - self.peerInputActivitiesDisposable = (self.context.account.peerInputActivities(peerId: peerId) - |> mapToSignal { activities -> Signal<[(Peer, PeerInputActivity)], NoError> in - var foundAllPeers = true - var cachedResult: [(Peer, PeerInputActivity)] = [] - previousPeerCache.with { dict -> Void in - for (peerId, activity) in activities { - if let peer = dict[peerId] { - cachedResult.append((peer, activity)) - } else { - foundAllPeers = false - break - } - } - } - if foundAllPeers { - return .single(cachedResult) - } else { - return postbox.transaction { transaction -> [(Peer, PeerInputActivity)] in - var result: [(Peer, PeerInputActivity)] = [] - var peerCache: [PeerId: Peer] = [:] - for (peerId, activity) in activities { - if let peer = transaction.getPeer(peerId) { - result.append((peer, activity)) - peerCache[peerId] = peer + strongSelf.chatDisplayNode.navigateButtons.unreadCount = unreadCount + + if let view = views.views[notificationSettingsKey] as? PeerNotificationSettingsView, let notificationSettings = view.notificationSettings[peerId] { + var globalRemainingUnreadChatCount = totalChatCount + if !notificationSettings.isRemovedFromTotalUnreadCount && unreadCount > 0 { + if case .messages = inAppSettings.totalUnreadCountDisplayCategory { + globalRemainingUnreadChatCount -= unreadCount + } else { + globalRemainingUnreadChatCount -= 1 + } + } + + if globalRemainingUnreadChatCount > 0 { + strongSelf.navigationItem.badge = "\(globalRemainingUnreadChatCount)" + } else { + strongSelf.navigationItem.badge = "" } } - let _ = previousPeerCache.swap(peerCache) - return result + } + }) + + self.chatUnreadMentionCountDisposable = (self.context.account.viewTracker.unseenPersonalMessagesCount(peerId: peerId) |> deliverOnMainQueue).start(next: { [weak self] count in + if let strongSelf = self { + strongSelf.chatDisplayNode.navigateButtons.mentionCount = count + } + }) + + let postbox = self.context.account.postbox + let previousPeerCache = Atomic<[PeerId: Peer]>(value: [:]) + self.peerInputActivitiesDisposable = (self.context.account.peerInputActivities(peerId: peerId) + |> mapToSignal { activities -> Signal<[(Peer, PeerInputActivity)], NoError> in + var foundAllPeers = true + var cachedResult: [(Peer, PeerInputActivity)] = [] + previousPeerCache.with { dict -> Void in + for (peerId, activity) in activities { + if let peer = dict[peerId] { + cachedResult.append((peer, activity)) + } else { + foundAllPeers = false + break + } + } + } + if foundAllPeers { + return .single(cachedResult) + } else { + return postbox.transaction { transaction -> [(Peer, PeerInputActivity)] in + var result: [(Peer, PeerInputActivity)] = [] + var peerCache: [PeerId: Peer] = [:] + for (peerId, activity) in activities { + if let peer = transaction.getPeer(peerId) { + result.append((peer, activity)) + peerCache[peerId] = peer + } + } + let _ = previousPeerCache.swap(peerCache) + return result + } } } + |> deliverOnMainQueue).start(next: { [weak self] activities in + if let strongSelf = self { + strongSelf.chatTitleView?.inputActivities = (peerId, activities) + } + }) } - |> deliverOnMainQueue).start(next: { [weak self] activities in - if let strongSelf = self { - strongSelf.chatTitleView?.inputActivities = (peerId, activities) - } - }) self.sentMessageEventsDisposable.set(self.context.account.pendingMessageManager.deliveredMessageEvents(peerId: peerId).start(next: { [weak self] _ in if let strongSelf = self { @@ -5534,8 +5542,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G for i in (0 ..< attributes.count).reversed() { if attributes[i] is NotificationInfoMessageAttribute { attributes.remove(at: i) - } - if let _ = scheduleTime, attributes[i] is OutgoingScheduleInfoMessageAttribute { + } else if let _ = scheduleTime, attributes[i] is OutgoingScheduleInfoMessageAttribute { attributes.remove(at: i) } } @@ -6905,6 +6912,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G } func avatarPreviewingController(from sourceView: UIView) -> (UIViewController, CGRect)? { + guard let layout = self.validLayout else { + return nil + } guard let buttonView = (self.chatInfoNavigationButton?.buttonItem.customDisplayNode as? ChatAvatarNavigationNode)?.avatarNode.view else { return nil } @@ -6912,14 +6922,14 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G let galleryController = AvatarGalleryController(context: self.context, peer: peer, remoteEntries: nil, replaceRootController: { controller, ready in }, synchronousLoad: true) galleryController.setHintWillBePresentedInPreviewingContext(true) - galleryController.containerLayoutUpdated(ContainerViewLayout(size: CGSize(width: self.view.bounds.size.width, height: self.view.bounds.size.height), metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + galleryController.containerLayoutUpdated(ContainerViewLayout(size: CGSize(width: self.view.bounds.size.width, height: self.view.bounds.size.height), metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) return (galleryController, buttonView.convert(buttonView.bounds, to: sourceView)) } return nil } func previewingController(from sourceView: UIView, for location: CGPoint) -> (UIViewController, CGRect)? { - guard let view = self.chatDisplayNode.view.hitTest(location, with: nil), view.isDescendant(of: self.chatDisplayNode.historyNode.view) else { + guard let layout = self.validLayout, case .phone = layout.deviceMetrics.type, let view = self.chatDisplayNode.view.hitTest(location, with: nil), view.isDescendant(of: self.chatDisplayNode.historyNode.view) else { return nil } @@ -6953,7 +6963,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G gallery.setHintWillBePresentedInPreviewingContext(true) let rect = selectedTransitionNode.0.view.convert(selectedTransitionNode.0.bounds, to: sourceView) let sourceRect = rect.insetBy(dx: -2.0, dy: -2.0) - gallery.containerLayoutUpdated(ContainerViewLayout(size: CGSize(width: self.view.bounds.size.width, height: self.view.bounds.size.height), metrics: LayoutMetrics(), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, standardInputHeight: 216.0, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) + gallery.containerLayoutUpdated(ContainerViewLayout(size: CGSize(width: self.view.bounds.size.width, height: self.view.bounds.size.height), metrics: LayoutMetrics(), deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate) return (gallery, sourceRect) case .instantPage: break diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift index 775421bbf0..ab5f9aeefd 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift @@ -2057,7 +2057,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { } } - func sendCurrentMessage(silentPosting: Bool? = nil, scheduleTime: Int32? = nil) { + func sendCurrentMessage(silentPosting: Bool? = nil, scheduleTime: Int32? = nil, completion: @escaping () -> Void = {}) { if let textInputPanelNode = self.inputPanelNode as? ChatTextInputPanelNode { if textInputPanelNode.textInputNode?.isFirstResponder() ?? false { Keyboard.applyAutocorrection() @@ -2114,6 +2114,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { textInputPanelNode.text = "" strongSelf.requestUpdateChatInterfaceState(false, true, { $0.withUpdatedReplyMessageId(nil).withUpdatedForwardMessageIds(nil).withUpdatedComposeDisableUrlPreview(nil) }) strongSelf.ignoreUpdateHeight = false + completion() } }) diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift index 3b13ba15d7..ea19b9cb12 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift @@ -41,8 +41,7 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView, var contentTypeHint: ChatMessageEntryContentType = .generic if presentationData.largeEmoji, entry.message.media.isEmpty { - let messageText = entry.message.text - if messageText.count == 1, let _ = associatedData.animatedEmojiStickers[messageText.basicEmoji.0] { + if entry.message.text.count == 1, let _ = associatedData.animatedEmojiStickers[entry.message.text.basicEmoji.0] { contentTypeHint = .animatedEmoji } else if messageIsElligibleForLargeEmoji(entry.message) { contentTypeHint = .largeEmoji diff --git a/submodules/TelegramUI/TelegramUI/ChatInfoTitlePanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatInfoTitlePanelNode.swift index 2307d269dd..41e38db37b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInfoTitlePanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInfoTitlePanelNode.swift @@ -145,8 +145,8 @@ final class ChatInfoTitlePanelNode: ChatTitleAccessoryPanelNode { let panelHeight: CGFloat = 55.0 if themeUpdated { - self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor - self.backgroundColor = interfaceState.theme.rootController.navigationBar.backgroundColor + self.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor + self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor } let updatedButtons: [ChatInfoTitleButton] @@ -157,8 +157,6 @@ final class ChatInfoTitlePanelNode: ChatTitleAccessoryPanelNode { } else { updatedButtons = [] } - /*case .group: - updatedButtons = groupButtons()*/ } var buttonsUpdated = false @@ -182,7 +180,7 @@ final class ChatInfoTitlePanelNode: ChatTitleAccessoryPanelNode { let buttonNode = ChatInfoTitlePanelButtonNode() buttonNode.laysOutHorizontally = false - buttonNode.setup(text: button.title(interfaceState.strings), color: interfaceState.theme.rootController.navigationBar.accentTextColor, icon: button.icon(interfaceState.theme)) + buttonNode.setup(text: button.title(interfaceState.strings), color: interfaceState.theme.chat.inputPanel.panelControlAccentColor, icon: button.icon(interfaceState.theme)) buttonNode.addTarget(self, action: #selector(self.buttonPressed(_:)), forControlEvents: [.touchUpInside]) self.addSubnode(buttonNode) diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift index 21b2c81893..d1b9090167 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift @@ -24,14 +24,29 @@ private struct MessageContextMenuData { } func canEditMessage(context: AccountContext, limitsConfiguration: LimitsConfiguration, message: Message) -> Bool { + return canEditMessage(accountPeerId: context.account.peerId, limitsConfiguration: limitsConfiguration, message: message) +} + +private func canEditMessage(accountPeerId: PeerId, limitsConfiguration: LimitsConfiguration, message: Message) -> Bool { var hasEditRights = false var unlimitedInterval = false if message.id.namespace == Namespaces.Message.ScheduledCloud { - hasEditRights = true + if let peer = message.peers[message.id.peerId], let channel = peer as? TelegramChannel { + switch channel.info { + case .broadcast: + if channel.hasPermission(.editAllMessages) { + hasEditRights = true + } + default: + hasEditRights = true + } + } else { + hasEditRights = true + } } else if message.id.peerId.namespace == Namespaces.Peer.SecretChat || message.id.namespace != Namespaces.Message.Cloud { hasEditRights = false - } else if let author = message.author, author.id == context.account.peerId { + } else if let author = message.author, author.id == accountPeerId { hasEditRights = true } else if message.author?.id == message.id.peerId, let peer = message.peers[message.id.peerId] { if let peer = peer as? TelegramChannel { @@ -90,7 +105,7 @@ func canEditMessage(context: AccountContext, limitsConfiguration: LimitsConfigur } if !hasUneditableAttributes { - if canPerformEditingActions(limits: limitsConfiguration, accountPeerId: context.account.peerId, message: message, unlimitedInterval: unlimitedInterval) { + if canPerformEditingActions(limits: limitsConfiguration, accountPeerId: accountPeerId, message: message, unlimitedInterval: unlimitedInterval) { return true } } @@ -262,29 +277,9 @@ func contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState: var canPin = false let canSelect = !isAction - var canDeleteMessage: Bool = false - let message = messages[0] - if let channel = message.peers[message.id.peerId] as? TelegramChannel { - if case .broadcast = channel.info { - if !message.flags.contains(.Incoming) { - canDeleteMessage = channel.hasPermission(.sendMessages) - } - if channel.hasPermission(.deleteAllMessages) { - canDeleteMessage = true - } - } else { - if channel.hasPermission(.deleteAllMessages) || !message.flags.contains(.Incoming) { - canDeleteMessage = true - } - } - } else if message.peers[message.id.peerId] is TelegramSecretChat { - canDeleteMessage = true - } else { - canDeleteMessage = context.account.peerId == message.author?.id - } - if [Namespaces.Message.ScheduledCloud, Namespaces.Message.ScheduledLocal].contains(message.id.namespace) { + if Namespaces.Message.allScheduled.contains(message.id.namespace) { canReply = false canPin = false } @@ -383,6 +378,24 @@ func contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState: }))) } + if data.messageActions.options.contains(.sendScheduledNow) { + actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.ScheduledMessages_SendNow, icon: { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.actionSheet.primaryTextColor) + }, action: { _, f in + controllerInteraction.sendScheduledMessagesNow(selectAll ? messages.map { $0.id } : [message.id]) + f(.dismissWithoutContent) + }))) + } + + if data.messageActions.options.contains(.editScheduledTime) { + actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.ScheduledMessages_EditTime, icon: { theme in + return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Schedule"), color: theme.actionSheet.primaryTextColor) + }, action: { _, f in + controllerInteraction.editScheduledMessagesTime(selectAll ? messages.map { $0.id } : [message.id]) + f(.dismissWithoutContent) + }))) + } + let resourceAvailable: Bool if let resourceStatus = data.resourceStatus, case .Local = resourceStatus { resourceAvailable = true @@ -435,24 +448,6 @@ func contextMenuForChatPresentationIntefaceState(chatPresentationInterfaceState: }))) } - if data.messageActions.options.contains(.sendScheduledNow) { - actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.ScheduledMessages_SendNow, icon: { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.actionSheet.primaryTextColor) - }, action: { _, f in - controllerInteraction.sendScheduledMessagesNow(selectAll ? messages.map { $0.id } : [message.id]) - f(.dismissWithoutContent) - }))) - } - - if data.messageActions.options.contains(.editScheduledTime) { - actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.ScheduledMessages_EditTime, icon: { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Schedule"), color: theme.actionSheet.primaryTextColor) - }, action: { _, f in - controllerInteraction.editScheduledMessagesTime(selectAll ? messages.map { $0.id } : [message.id]) - f(.dismissWithoutContent) - }))) - } - if data.canEdit { actions.append(.action(ContextMenuActionItem(text: chatPresentationInterfaceState.strings.Conversation_MessageDialogEdit, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Edit"), color: theme.actionSheet.primaryTextColor) @@ -748,8 +743,20 @@ func chatAvailableMessageActionsImpl(postbox: Postbox, accountPeerId: PeerId, me } if id.namespace == Namespaces.Message.ScheduledCloud { optionsMap[id]!.insert(.sendScheduledNow) - optionsMap[id]!.insert(.editScheduledTime) - optionsMap[id]!.insert(.deleteLocally) + if canEditMessage(accountPeerId: accountPeerId, limitsConfiguration: limitsConfiguration, message: message) { + optionsMap[id]!.insert(.editScheduledTime) + } + if let peer = transaction.getPeer(id.peerId), let channel = peer as? TelegramChannel { + if !message.flags.contains(.Incoming) { + optionsMap[id]!.insert(.deleteGlobally) + } else { + if channel.hasPermission(.deleteAllMessages) { + optionsMap[id]!.insert(.deleteGlobally) + } + } + } else { + optionsMap[id]!.insert(.deleteGlobally) + } } else if id.peerId == accountPeerId { if !(message.flags.isSending || message.flags.contains(.Failed)) { optionsMap[id]!.insert(.forward) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift index ff94def414..5ad94121a6 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift @@ -190,6 +190,15 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { } return .waitForSingleTap } + recognizer.longTap = { [weak self] point, recognizer in + guard let strongSelf = self else { + return + } + //strongSelf.reactionRecognizer?.cancel() + if strongSelf.gestureRecognized(gesture: .longTap, location: point, recognizer: recognizer) { + recognizer.cancel() + } + } self.view.addGestureRecognizer(recognizer) let replyRecognizer = ChatSwipeToReplyRecognizer(target: self, action: #selector(self.swipeToReplyGesture(_:))) @@ -736,129 +745,135 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { switch recognizer.state { case .ended: if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { - switch gesture { - case .tap: - if let avatarNode = self.accessoryItemNode as? ChatMessageAvatarAccessoryItemNode, avatarNode.frame.contains(location) { - if let item = self.item, let author = item.content.firstMessage.author { - var openPeerId = item.effectiveAuthorId ?? author.id - var navigate: ChatControllerInteractionNavigateToPeer - - if item.content.firstMessage.id.peerId == item.context.account.peerId { - navigate = .chat(textInputState: nil, subject: nil) - } else { - navigate = .info - } - - for attribute in item.content.firstMessage.attributes { - if let attribute = attribute as? SourceReferenceMessageAttribute { - openPeerId = attribute.messageId.peerId - navigate = .chat(textInputState: nil, subject: .message(attribute.messageId)) - } - } - - if item.effectiveAuthorId?.namespace == Namespaces.Peer.Empty { - item.controllerInteraction.displayMessageTooltip(item.content.firstMessage.id, item.presentationData.strings.Conversation_ForwardAuthorHiddenTooltip, self, avatarNode.frame) - } else { - if let channel = item.content.firstMessage.forwardInfo?.author as? TelegramChannel, channel.username == nil { - if case .member = channel.participationStatus { - } else { - item.controllerInteraction.displayMessageTooltip(item.message.id, item.presentationData.strings.Conversation_PrivateChannelTooltip, self, avatarNode.frame) - return - } - } - item.controllerInteraction.openPeer(openPeerId, navigate, item.message) - } - } - return - } - - if let viaBotNode = self.viaBotNode, viaBotNode.frame.contains(location) { - if let item = self.item { - for attribute in item.message.attributes { - if let attribute = attribute as? InlineBotMessageAttribute { - var botAddressName: String? - if let peerId = attribute.peerId, let botPeer = item.message.peers[peerId], let addressName = botPeer.addressName { - botAddressName = addressName - } else { - botAddressName = attribute.title - } - - if let botAddressName = botAddressName { - item.controllerInteraction.updateInputState { textInputState in - return ChatTextInputState(inputText: NSAttributedString(string: "@" + botAddressName + " ")) - } - item.controllerInteraction.updateInputMode { _ in - return .text - } - } - return - } - } - } - } - - if let replyInfoNode = self.replyInfoNode, replyInfoNode.frame.contains(location) { - if let item = self.item { - for attribute in item.message.attributes { - if let attribute = attribute as? ReplyMessageAttribute { - item.controllerInteraction.navigateToMessage(item.message.id, attribute.messageId) - return - } - } - } - } - - if let item = self.item, self.imageNode.frame.contains(location) { - if self.telegramFile != nil { - let _ = item.controllerInteraction.openMessage(item.message, .default) - } else if let _ = self.emojiFile { - var startTime: Signal - if self.animationNode.playIfNeeded() { - startTime = .single(0.0) - } else { - startTime = self.animationNode.status - |> map { $0.timestamp } - |> take(1) - |> deliverOnMainQueue - } - - if let text = self.item?.message.text, let firstScalar = text.unicodeScalars.first, firstScalar.value == 0x2764 { - let _ = startTime.start(next: { [weak self] time in - guard let strongSelf = self else { - return - } - - let heartbeatHaptic: ChatMessageHeartbeatHaptic - if let current = strongSelf.heartbeatHaptic { - heartbeatHaptic = current - } else { - heartbeatHaptic = ChatMessageHeartbeatHaptic() - heartbeatHaptic.enabled = true - strongSelf.heartbeatHaptic = heartbeatHaptic - } - if !heartbeatHaptic.active { - heartbeatHaptic.start(time: time) - } - }) - } - } - return - } - - self.item?.controllerInteraction.clickThroughMessage() - case .longTap, .doubleTap: - if let item = self.item, self.imageNode.frame.contains(location) { - item.controllerInteraction.openMessageContextMenu(item.message, false, self, self.imageNode.frame, nil) - } - case .hold: - break - } + let _ = self.gestureRecognized(gesture: gesture, location: location, recognizer: nil) } default: break } } + private func gestureRecognized(gesture: TapLongTapOrDoubleTapGesture, location: CGPoint, recognizer: TapLongTapOrDoubleTapGestureRecognizer?) -> Bool { + switch gesture { + case .tap: + if let avatarNode = self.accessoryItemNode as? ChatMessageAvatarAccessoryItemNode, avatarNode.frame.contains(location) { + if let item = self.item, let author = item.content.firstMessage.author { + var openPeerId = item.effectiveAuthorId ?? author.id + var navigate: ChatControllerInteractionNavigateToPeer + + if item.content.firstMessage.id.peerId == item.context.account.peerId { + navigate = .chat(textInputState: nil, subject: nil) + } else { + navigate = .info + } + + for attribute in item.content.firstMessage.attributes { + if let attribute = attribute as? SourceReferenceMessageAttribute { + openPeerId = attribute.messageId.peerId + navigate = .chat(textInputState: nil, subject: .message(attribute.messageId)) + } + } + + if item.effectiveAuthorId?.namespace == Namespaces.Peer.Empty { + item.controllerInteraction.displayMessageTooltip(item.content.firstMessage.id, item.presentationData.strings.Conversation_ForwardAuthorHiddenTooltip, self, avatarNode.frame) + } else { + if let channel = item.content.firstMessage.forwardInfo?.author as? TelegramChannel, channel.username == nil { + if case .member = channel.participationStatus { + } else { + item.controllerInteraction.displayMessageTooltip(item.message.id, item.presentationData.strings.Conversation_PrivateChannelTooltip, self, avatarNode.frame) + return true + } + } + item.controllerInteraction.openPeer(openPeerId, navigate, item.message) + } + } + return true + } + + if let viaBotNode = self.viaBotNode, viaBotNode.frame.contains(location) { + if let item = self.item { + for attribute in item.message.attributes { + if let attribute = attribute as? InlineBotMessageAttribute { + var botAddressName: String? + if let peerId = attribute.peerId, let botPeer = item.message.peers[peerId], let addressName = botPeer.addressName { + botAddressName = addressName + } else { + botAddressName = attribute.title + } + + if let botAddressName = botAddressName { + item.controllerInteraction.updateInputState { textInputState in + return ChatTextInputState(inputText: NSAttributedString(string: "@" + botAddressName + " ")) + } + item.controllerInteraction.updateInputMode { _ in + return .text + } + } + return true + } + } + } + } + + if let replyInfoNode = self.replyInfoNode, replyInfoNode.frame.contains(location) { + if let item = self.item { + for attribute in item.message.attributes { + if let attribute = attribute as? ReplyMessageAttribute { + item.controllerInteraction.navigateToMessage(item.message.id, attribute.messageId) + return true + } + } + } + } + + if let item = self.item, self.imageNode.frame.contains(location) { + if self.telegramFile != nil { + let _ = item.controllerInteraction.openMessage(item.message, .default) + } else if let _ = self.emojiFile { + var startTime: Signal + if self.animationNode.playIfNeeded() { + startTime = .single(0.0) + } else { + startTime = self.animationNode.status + |> map { $0.timestamp } + |> take(1) + |> deliverOnMainQueue + } + + if let text = self.item?.message.text, let firstScalar = text.unicodeScalars.first, firstScalar.value == 0x2764 { + let _ = startTime.start(next: { [weak self] time in + guard let strongSelf = self else { + return + } + + let heartbeatHaptic: ChatMessageHeartbeatHaptic + if let current = strongSelf.heartbeatHaptic { + heartbeatHaptic = current + } else { + heartbeatHaptic = ChatMessageHeartbeatHaptic() + heartbeatHaptic.enabled = true + strongSelf.heartbeatHaptic = heartbeatHaptic + } + if !heartbeatHaptic.active { + heartbeatHaptic.start(time: time) + } + }) + } + } + return true + } + + self.item?.controllerInteraction.clickThroughMessage() + case .longTap, .doubleTap: + if let item = self.item, self.imageNode.frame.contains(location) { + item.controllerInteraction.openMessageContextMenu(item.message, false, self, self.imageNode.frame, nil) + return false + } + case .hold: + break + } + return true + } + @objc func shareButtonPressed() { if let item = self.item { if item.content.firstMessage.id.peerId == item.context.account.peerId { diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift index 4beb03ffe5..b4bbe046a8 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift @@ -402,8 +402,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { if let (media, flags) = mediaAndFlags { if let file = media as? TelegramMediaFile { if file.mimeType == "application/x-tgtheme-ios", let size = file.size, size < 16 * 1024 { - let automaticDownload = true - let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, file, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) + let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, file, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout } else if file.isInstantVideo { @@ -483,7 +482,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, wallpaper, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout - if case let .file(_, _, isTheme) = wallpaper.content, isTheme { + if case let .file(_, _, isTheme, _) = wallpaper.content, isTheme { skipStandardStatus = true } } @@ -521,7 +520,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { if let count = webpageGalleryMediaCount { - additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: "1 \(presentationData.strings.Common_of) \(count)")) + additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: presentationData.strings.Items_NOfM("1", "\(count)").0)) skipStandardStatus = imageMode } else if let mediaBadge = mediaBadge { additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: mediaBadge)) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift index 245fb998ed..4d23ae3178 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift @@ -301,7 +301,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio unboundSize = CGSize(width: floor(dimensions.width * 0.5), height: floor(dimensions.height * 0.5)) } else if let wallpaper = media as? WallpaperPreviewMedia { switch wallpaper.content { - case let .file(file, _, isTheme): + case let .file(file, _, isTheme, isSupported): if let thumbnail = file.previewRepresentations.first, var dimensions = file.dimensions { let dimensionsVertical = dimensions.width < dimensions.height let thumbnailVertical = thumbnail.dimensions.width < thumbnail.dimensions.height @@ -310,7 +310,13 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } unboundSize = CGSize(width: floor(dimensions.width * 0.5), height: floor(dimensions.height * 0.5)).fitted(CGSize(width: 240.0, height: 240.0)) } else if isTheme { - unboundSize = CGSize(width: 160.0, height: 240.0).fitted(CGSize(width: 240.0, height: 240.0)) + if isSupported { + unboundSize = CGSize(width: 160.0, height: 240.0).fitted(CGSize(width: 240.0, height: 240.0)) + } else if let thumbnail = file.previewRepresentations.first { + unboundSize = CGSize(width: floor(thumbnail.dimensions.width), height: floor(thumbnail.dimensions.height)).fitted(CGSize(width: 240.0, height: 240.0)) + } else { + unboundSize = CGSize(width: 54.0, height: 54.0) + } } else { unboundSize = CGSize(width: 54.0, height: 54.0) } @@ -430,7 +436,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } else { emptyColor = message.effectivelyIncoming(context.account.peerId) ? theme.chat.message.incoming.mediaPlaceholderColor : theme.chat.message.outgoing.mediaPlaceholderColor } - if let wallpaper = media as? WallpaperPreviewMedia, case let .file(_, patternColor, _) = wallpaper.content { + if let wallpaper = media as? WallpaperPreviewMedia, case let .file(_, patternColor, _, _) = wallpaper.content { emptyColor = patternColor ?? UIColor(rgb: 0xd6e2ee, alpha: 0.5) } @@ -560,7 +566,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } else if let wallpaper = media as? WallpaperPreviewMedia { updateImageSignal = { synchronousLoad in switch wallpaper.content { - case let .file(file, _, isTheme): + case let .file(file, _, isTheme, _): if isTheme { return themeImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: FileMediaReference.message(message: MessageReference(message), media: file)) } else { @@ -576,7 +582,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } } - if case let .file(file, _, _) = wallpaper.content { + if case let .file(file, _, _, _) = wallpaper.content { updatedFetchControls = FetchControls(fetch: { manual in if let strongSelf = self { strongSelf.fetchDisposable.set(messageMediaFileInteractiveFetched(context: context, message: message, file: file, userInitiated: manual).start()) @@ -620,7 +626,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } } else if let wallpaper = media as? WallpaperPreviewMedia { switch wallpaper.content { - case let .file(file, _, _): + case let .file(file, _, _, _): updatedStatusSignal = messageMediaFileStatus(context: context, messageId: message.id, file: file) |> map { resourceStatus -> (MediaResourceStatus, MediaResourceStatus?) in return (resourceStatus, nil) @@ -826,7 +832,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } strongSelf.fetchDisposable.set(visibilityAwareFetchSignal.start()) } - } else if case .prefetch = automaticDownload, message.id.namespace != Namespaces.Message.SecretIncoming { + } else if case .prefetch = automaticDownload, message.id.namespace != Namespaces.Message.SecretIncoming && message.id.namespace != Namespaces.Message.Local { if let file = media as? TelegramMediaFile { let fetchSignal = preloadVideoResource(postbox: context.account.postbox, resourceReference: AnyMediaReference.message(message: MessageReference(message), media: file).resourceReference(file.resource), duration: 4.0) let visibilityAwareFetchSignal = strongSelf.visibilityPromise.get() diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift index bcdcc68b89..f2ff3a5dcb 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift @@ -80,6 +80,15 @@ class ChatMessageStickerItemNode: ChatMessageItemView { } return .waitForSingleTap } + recognizer.longTap = { [weak self] point, recognizer in + guard let strongSelf = self else { + return + } + //strongSelf.reactionRecognizer?.cancel() + if strongSelf.gestureRecognized(gesture: .longTap, location: point, recognizer: recognizer) { + recognizer.cancel() + } + } self.view.addGestureRecognizer(recognizer) let replyRecognizer = ChatSwipeToReplyRecognizer(target: self, action: #selector(self.swipeToReplyGesture(_:))) @@ -145,7 +154,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView { var textLayoutAndApply: (TextNodeLayout, () -> TextNode)? var isEmoji = false if item.presentationData.largeEmoji && messageIsElligibleForLargeEmoji(item.message) { - let attributedText = NSAttributedString(string: item.message.text, font: item.presentationData.messageEmojiFont1, textColor: .black) + let attributedText = NSAttributedString(string: item.message.text, font: item.presentationData.messageEmojiFont, textColor: .black) textLayoutAndApply = textLayout(TextNodeLayoutArguments(attributedString: attributedText, backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: 180.0, height: 90.0), alignment: .natural)) imageSize = CGSize(width: textLayoutAndApply!.0.size.width, height: textLayoutAndApply!.0.size.height) @@ -577,97 +586,104 @@ class ChatMessageStickerItemNode: ChatMessageItemView { @objc func tapLongTapOrDoubleTapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { switch recognizer.state { - case .ended: - if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { - switch gesture { - case .tap: - if let avatarNode = self.accessoryItemNode as? ChatMessageAvatarAccessoryItemNode, avatarNode.frame.contains(location) { - if let item = self.item, let author = item.content.firstMessage.author { - var openPeerId = item.effectiveAuthorId ?? author.id - var navigate: ChatControllerInteractionNavigateToPeer - - if item.content.firstMessage.id.peerId == item.context.account.peerId { - navigate = .chat(textInputState: nil, subject: nil) - } else { - navigate = .info - } - - for attribute in item.content.firstMessage.attributes { - if let attribute = attribute as? SourceReferenceMessageAttribute { - openPeerId = attribute.messageId.peerId - navigate = .chat(textInputState: nil, subject: .message(attribute.messageId)) - } - } - - if item.effectiveAuthorId?.namespace == Namespaces.Peer.Empty { - item.controllerInteraction.displayMessageTooltip(item.content.firstMessage.id, item.presentationData.strings.Conversation_ForwardAuthorHiddenTooltip, self, avatarNode.frame) - } else { - if let channel = item.content.firstMessage.forwardInfo?.author as? TelegramChannel, channel.username == nil { - if case .member = channel.participationStatus { - } else { - item.controllerInteraction.displayMessageTooltip(item.message.id, item.presentationData.strings.Conversation_PrivateChannelTooltip, self, avatarNode.frame) - return - } - } - item.controllerInteraction.openPeer(openPeerId, navigate, item.message) - } - } - return - } - - if let viaBotNode = self.viaBotNode, viaBotNode.frame.contains(location) { - if let item = self.item { - for attribute in item.message.attributes { - if let attribute = attribute as? InlineBotMessageAttribute { - var botAddressName: String? - if let peerId = attribute.peerId, let botPeer = item.message.peers[peerId], let addressName = botPeer.addressName { - botAddressName = addressName - } else { - botAddressName = attribute.title - } - - if let botAddressName = botAddressName { - item.controllerInteraction.updateInputState { textInputState in - return ChatTextInputState(inputText: NSAttributedString(string: "@" + botAddressName + " ")) - } - item.controllerInteraction.updateInputMode { _ in - return .text - } - } - return - } - } - } - } - - if let replyInfoNode = self.replyInfoNode, replyInfoNode.frame.contains(location) { - if let item = self.item { - for attribute in item.message.attributes { - if let attribute = attribute as? ReplyMessageAttribute { - item.controllerInteraction.navigateToMessage(item.message.id, attribute.messageId) - return - } - } - } - } - - if let item = self.item, self.imageNode.frame.contains(location) { - let _ = item.controllerInteraction.openMessage(item.message, .default) - return - } + case .ended: + if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { + let _ = self.gestureRecognized(gesture: gesture, location: location, recognizer: nil) + } + default: + break + } + } + + private func gestureRecognized(gesture: TapLongTapOrDoubleTapGesture, location: CGPoint, recognizer: TapLongTapOrDoubleTapGestureRecognizer?) -> Bool { + switch gesture { + case .tap: + if let avatarNode = self.accessoryItemNode as? ChatMessageAvatarAccessoryItemNode, avatarNode.frame.contains(location) { + if let item = self.item, let author = item.content.firstMessage.author { + var openPeerId = item.effectiveAuthorId ?? author.id + var navigate: ChatControllerInteractionNavigateToPeer - self.item?.controllerInteraction.clickThroughMessage() - case .longTap, .doubleTap: - if let item = self.item, self.imageNode.frame.contains(location) { - item.controllerInteraction.openMessageContextMenu(item.message, false, self, self.imageNode.frame, nil) + if item.content.firstMessage.id.peerId == item.context.account.peerId { + navigate = .chat(textInputState: nil, subject: nil) + } else { + navigate = .info + } + + for attribute in item.content.firstMessage.attributes { + if let attribute = attribute as? SourceReferenceMessageAttribute { + openPeerId = attribute.messageId.peerId + navigate = .chat(textInputState: nil, subject: .message(attribute.messageId)) } - case .hold: - break + } + + if item.effectiveAuthorId?.namespace == Namespaces.Peer.Empty { + item.controllerInteraction.displayMessageTooltip(item.content.firstMessage.id, item.presentationData.strings.Conversation_ForwardAuthorHiddenTooltip, self, avatarNode.frame) + } else { + if let channel = item.content.firstMessage.forwardInfo?.author as? TelegramChannel, channel.username == nil { + if case .member = channel.participationStatus { + } else { + item.controllerInteraction.displayMessageTooltip(item.message.id, item.presentationData.strings.Conversation_PrivateChannelTooltip, self, avatarNode.frame) + return true + } + } + item.controllerInteraction.openPeer(openPeerId, navigate, item.message) + } + } + return true + } + + if let viaBotNode = self.viaBotNode, viaBotNode.frame.contains(location) { + if let item = self.item { + for attribute in item.message.attributes { + if let attribute = attribute as? InlineBotMessageAttribute { + var botAddressName: String? + if let peerId = attribute.peerId, let botPeer = item.message.peers[peerId], let addressName = botPeer.addressName { + botAddressName = addressName + } else { + botAddressName = attribute.title + } + + if let botAddressName = botAddressName { + item.controllerInteraction.updateInputState { textInputState in + return ChatTextInputState(inputText: NSAttributedString(string: "@" + botAddressName + " ")) + } + item.controllerInteraction.updateInputMode { _ in + return .text + } + } + return true + } + } } } - default: + + if let replyInfoNode = self.replyInfoNode, replyInfoNode.frame.contains(location) { + if let item = self.item { + for attribute in item.message.attributes { + if let attribute = attribute as? ReplyMessageAttribute { + item.controllerInteraction.navigateToMessage(item.message.id, attribute.messageId) + return true + } + } + } + } + + if let item = self.item, self.imageNode.frame.contains(location) { + let _ = item.controllerInteraction.openMessage(item.message, .default) + return true + } + + self.item?.controllerInteraction.clickThroughMessage() + case .longTap, .doubleTap: + if let item = self.item, self.imageNode.frame.contains(location) { + item.controllerInteraction.openMessageContextMenu(item.message, false, self, self.imageNode.frame, recognizer) + return false + } + case .hold: break } + + return true } @objc func shareButtonPressed() { diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift index ff35622c0b..33b52082df 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift @@ -260,7 +260,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { if let wallpaper = parseWallpaperUrl(webpage.url), case let .slug(_, _, color, intensity) = wallpaper { patternColor = color?.withAlphaComponent(CGFloat(intensity ?? 50) / 100.0) } - let media = WallpaperPreviewMedia(content: .file(file, patternColor, false)) + let media = WallpaperPreviewMedia(content: .file(file, patternColor, false, false)) mediaAndFlags = (media, [.preferMediaAspectFilled]) if let fileSize = file.size { badge = dataSizeString(fileSize, decimalSeparator: item.presentationData.dateTimeFormat.decimalSeparator) @@ -297,17 +297,20 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { } } else if type == "telegram_theme" { var file: TelegramMediaFile? + var isSupported = false if let contentFiles = webpage.files { if let filteredFile = contentFiles.filter({ $0.mimeType == themeMimeType }).first { + isSupported = true file = filteredFile } else { file = contentFiles.first } } else if let contentFile = webpage.file { + isSupported = true file = contentFile } if let file = file { - let media = WallpaperPreviewMedia(content: .file(file, nil, true)) + let media = WallpaperPreviewMedia(content: .file(file, nil, true, isSupported)) mediaAndFlags = (media, ChatMessageAttachedContentNodeMediaFlags()) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift index 73727d4f0e..68a08104a1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatPinnedMessageTitlePanelNode.swift @@ -110,8 +110,8 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode { self.theme = interfaceState.theme self.closeButton.setImage(PresentationResourcesChat.chatInputPanelCloseIconImage(interfaceState.theme), for: []) self.lineNode.image = PresentationResourcesChat.chatInputPanelVerticalSeparatorLineImage(interfaceState.theme) - self.backgroundColor = interfaceState.theme.rootController.navigationBar.backgroundColor - self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor + self.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor + self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor } var messageUpdated = false diff --git a/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift b/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift index 58acf63749..d708d0b888 100644 --- a/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift +++ b/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift @@ -52,9 +52,7 @@ public final class ChatPresentationData { let isPreview: Bool let messageFont: UIFont - let messageEmojiFont1: UIFont - let messageEmojiFont2: UIFont - let messageEmojiFont3: UIFont + let messageEmojiFont: UIFont let messageBoldFont: UIFont let messageItalicFont: UIFont let messageBoldItalicFont: UIFont @@ -72,15 +70,13 @@ public final class ChatPresentationData { self.isPreview = isPreview let baseFontSize = fontSize.baseDisplaySize - self.messageFont = UIFont.systemFont(ofSize: baseFontSize) - self.messageEmojiFont1 = UIFont.systemFont(ofSize: 53.0) - self.messageEmojiFont2 = UIFont.systemFont(ofSize: 36.0) - self.messageEmojiFont3 = UIFont.systemFont(ofSize: 24.0) - self.messageBoldFont = UIFont.boldSystemFont(ofSize: baseFontSize) - self.messageItalicFont = UIFont.italicSystemFont(ofSize: baseFontSize) + self.messageFont = Font.regular(baseFontSize) + self.messageEmojiFont = Font.regular(53.0) + self.messageBoldFont = Font.bold(baseFontSize) + self.messageItalicFont = Font.italic(baseFontSize) self.messageBoldItalicFont = Font.semiboldItalic(baseFontSize) - self.messageFixedFont = UIFont(name: "Menlo-Regular", size: baseFontSize - 1.0) ?? UIFont.systemFont(ofSize: baseFontSize) - self.messageBlockQuoteFont = UIFont.systemFont(ofSize: baseFontSize - 1.0) + self.messageFixedFont = Font.monospace(baseFontSize) + self.messageBlockQuoteFont = Font.regular(baseFontSize - 1.0) self.animatedEmojiScale = animatedEmojiScale } diff --git a/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift index 63ff68c6bc..fb8f187f1b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatReportPeerTitlePanelNode.swift @@ -92,8 +92,8 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode { self.theme = interfaceState.theme self.closeButton.setImage(PresentationResourcesChat.chatInputPanelEncircledCloseIconImage(interfaceState.theme), for: []) - self.backgroundColor = interfaceState.theme.rootController.navigationBar.backgroundColor - self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor + self.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor + self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor } let panelHeight: CGFloat = 40.0 diff --git a/submodules/TelegramUI/TelegramUI/ChatRequestInProgressTitlePanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatRequestInProgressTitlePanelNode.swift index 040658ab6a..8d3795cad8 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRequestInProgressTitlePanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRequestInProgressTitlePanelNode.swift @@ -34,8 +34,8 @@ final class ChatRequestInProgressTitlePanelNode: ChatTitleAccessoryPanelNode { if interfaceState.theme !== self.theme { self.theme = interfaceState.theme - self.backgroundColor = interfaceState.theme.rootController.navigationBar.backgroundColor - self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor + self.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor + self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor } let panelHeight: CGFloat = 40.0 diff --git a/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift index 2a3a2ea7f5..b3fb49ae6f 100644 --- a/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatScheduleTimeControllerNode.swift @@ -125,7 +125,7 @@ class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDel let pickerView = UIDatePicker() pickerView.timeZone = TimeZone(secondsFromGMT: 0) pickerView.datePickerMode = .dateAndTime - pickerView.locale = localeWithStrings(self.presentationData.strings) + pickerView.locale = Locale.current pickerView.timeZone = TimeZone.current pickerView.minuteInterval = 1 pickerView.setValue(self.presentationData.theme.actionSheet.primaryTextColor, forKey: "textColor") diff --git a/submodules/TelegramUI/TelegramUI/ChatSearchInputPanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatSearchInputPanelNode.swift index bd68554e6a..72819a1bb4 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSearchInputPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSearchInputPanelNode.swift @@ -128,7 +128,7 @@ final class ChatSearchInputPanelNode: ChatInputPanelNode { if let currentId = results.currentId, let index = results.messageIndices.firstIndex(where: { $0.id == currentId }) { let adjustedIndex = results.messageIndices.count - 1 - index resultIndex = index - resultsText = NSAttributedString(string: "\(adjustedIndex + 1) \(interfaceState.strings.Common_of) \(displayTotalCount)", font: labelFont, textColor: interfaceState.theme.chat.inputPanel.primaryTextColor) + resultsText = NSAttributedString(string: interfaceState.strings.Items_NOfM("\(adjustedIndex + 1)", "\(displayTotalCount)").0, font: labelFont, textColor: interfaceState.theme.chat.inputPanel.primaryTextColor) } else { resultsText = NSAttributedString(string: interfaceState.strings.Conversation_SearchNoResults, font: labelFont, textColor: interfaceState.theme.chat.inputPanel.primaryTextColor) } @@ -155,7 +155,12 @@ final class ChatSearchInputPanelNode: ChatInputPanelNode { let makeLabelLayout = TextNode.asyncLayout(self.resultsLabel) let (labelSize, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: resultsText, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: width - leftInset - rightInset - 50.0, height: 100.0), alignment: .left, cutout: nil, insets: UIEdgeInsets())) let _ = labelApply() - self.resultsLabel.frame = CGRect(origin: CGPoint(x: leftInset + 16.0, y: floor((panelHeight - labelSize.size.height) / 2.0)), size: labelSize.size) + + var resultsOffset: CGFloat = 16.0 + if !self.calendarButton.isHidden { + resultsOffset += 48.0 + } + self.resultsLabel.frame = CGRect(origin: CGPoint(x: leftInset + resultsOffset, y: floor((panelHeight - labelSize.size.height) / 2.0)), size: labelSize.size) let indicatorSize = self.activityIndicator.measure(CGSize(width: 22.0, height: 22.0)) self.activityIndicator.frame = CGRect(origin: CGPoint(x: width - rightInset - 41.0, y: floor((panelHeight - indicatorSize.height) / 2.0)), size: indicatorSize) diff --git a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift index 8c8c7e8bb1..9d994b83d6 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift @@ -371,7 +371,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, let inputHeight = layout.inputHeight ?? 0.0 var clipDelta = delta - if inputHeight.isZero { + if inputHeight.isZero || layout.isNonExclusive { clipDelta -= self.contentContainerNode.frame.height + 16.0 } @@ -385,9 +385,14 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, self.messageBackgroundNode.layer.animateBounds(from: fromFrame, to: self.messageBackgroundNode.bounds, duration: duration, timingFunction: kCAMediaTimingFunctionSpring) self.messageBackgroundNode.layer.animatePosition(from: CGPoint(x: (initialWidth - self.messageClipNode.bounds.width) / 2.0, y: delta), to: CGPoint(), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, additive: true) - let textOffset = self.textInputNode.textView.contentSize.height - self.textInputNode.textView.contentOffset.y - self.textInputNode.textView.frame.height - self.fromMessageTextNode.layer.animatePosition(from: CGPoint(x: 0.0, y: delta * 2.0 + textOffset), to: CGPoint(), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, additive: true) - self.toMessageTextNode.layer.animatePosition(from: CGPoint(x: 0.0, y: delta * 2.0 + textOffset), to: CGPoint(), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, additive: true) + + var textXOffset: CGFloat = 0.0 + let textYOffset = self.textInputNode.textView.contentSize.height - self.textInputNode.textView.contentOffset.y - self.textInputNode.textView.frame.height + if self.textInputNode.textView.numberOfLines == 1 && self.textInputNode.isRTL { + textXOffset = initialWidth - self.messageClipNode.bounds.width + } + self.fromMessageTextNode.layer.animatePosition(from: CGPoint(x: textXOffset, y: delta * 2.0 + textYOffset), to: CGPoint(), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, additive: true) + self.toMessageTextNode.layer.animatePosition(from: CGPoint(x: textXOffset, y: delta * 2.0 + textYOffset), to: CGPoint(), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, additive: true) let springDuration: Double = 0.42 let springDamping: CGFloat = 104.0 @@ -467,7 +472,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, let inputHeight = layout.inputHeight ?? 0.0 var clipDelta = delta - if inputHeight.isZero { + if inputHeight.isZero || layout.isNonExclusive { clipDelta -= self.contentContainerNode.frame.height + 16.0 } @@ -481,9 +486,13 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, self.messageBackgroundNode.layer.animateBounds(from: self.messageBackgroundNode.bounds, to: toFrame, duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false) self.messageBackgroundNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: (initialWidth - self.messageClipNode.bounds.width) / 2.0, y: delta), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, additive: true) - let textOffset = self.textInputNode.textView.contentSize.height - self.textInputNode.textView.contentOffset.y - self.textInputNode.textView.frame.height - self.fromMessageTextNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: delta * 2.0 + textOffset), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, additive: true) - self.toMessageTextNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: delta * 2.0 + textOffset), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, additive: true) + var textXOffset: CGFloat = 0.0 + let textYOffset = self.textInputNode.textView.contentSize.height - self.textInputNode.textView.contentOffset.y - self.textInputNode.textView.frame.height + if self.textInputNode.textView.numberOfLines == 1 && self.textInputNode.isRTL { + textXOffset = initialWidth - self.messageClipNode.bounds.width + } + self.fromMessageTextNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: textXOffset, y: delta * 2.0 + textYOffset), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, additive: true) + self.toMessageTextNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: textXOffset, y: delta * 2.0 + textYOffset), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, additive: true) } else { completedBubble = true } @@ -528,7 +537,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, let contentOffset = self.scrollNode.view.contentOffset.y var contentOrigin = CGPoint(x: layout.size.width - sideInset - contentSize.width - layout.safeInsets.right, y: layout.size.height - 6.0 - insets.bottom - contentSize.height) - if inputHeight > 0.0 { + if inputHeight > 0.0 && !layout.isNonExclusive { contentOrigin.y += menuHeightWithInset } contentOrigin.y = min(contentOrigin.y + contentOffset, layout.size.height - 6.0 - layout.intrinsicInsets.bottom - contentSize.height) @@ -543,7 +552,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, let initialSendButtonFrame = self.sendButtonFrame var sendButtonFrame = CGRect(origin: CGPoint(x: layout.size.width - initialSendButtonFrame.width + 1.0 - UIScreenPixel - layout.safeInsets.right, y: layout.size.height - insets.bottom - initialSendButtonFrame.height), size: initialSendButtonFrame.size) - if inputHeight.isZero { + if inputHeight.isZero || layout.isNonExclusive { sendButtonFrame.origin.y -= menuHeightWithInset } sendButtonFrame.origin.y = min(sendButtonFrame.origin.y + contentOffset, layout.size.height - layout.intrinsicInsets.bottom - initialSendButtonFrame.height) @@ -553,7 +562,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, messageFrame.size.width += 32.0 messageFrame.origin.x -= 13.0 messageFrame.origin.y = layout.size.height - messageFrame.origin.y - messageFrame.size.height - 1.0 - if inputHeight.isZero { + if inputHeight.isZero || layout.isNonExclusive { messageFrame.origin.y += menuHeightWithInset } @@ -561,9 +570,11 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, messageFrame.size.width = ceil(layout.size.width - messageFrame.origin.x - sendButtonFrame.width - layout.safeInsets.left - layout.safeInsets.right + 8.0) } + var messageOriginDelta: CGFloat = 0.0 if self.textInputNode.textView.numberOfLines == 1 || self.textInputNode.textView.attributedText.string.isEmpty { let textWidth = min(self.toMessageTextNode.textView.sizeThatFits(layout.size).width + 36.0, messageFrame.width) - messageFrame.origin.x += messageFrame.width - textWidth + messageOriginDelta = messageFrame.width - textWidth + messageFrame.origin.x += messageOriginDelta messageFrame.size.width = textWidth } @@ -587,6 +598,11 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, var textFrame = self.textFieldFrame textFrame.origin = CGPoint(x: 13.0, y: 6.0 - UIScreenPixel) textFrame.size.height = self.textInputNode.textView.contentSize.height + + if self.textInputNode.isRTL { + textFrame.origin.x -= messageOriginDelta + } + self.fromMessageTextNode.frame = textFrame self.toMessageTextNode.frame = textFrame diff --git a/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift index e49b528b2e..9f22021bc4 100644 --- a/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatToastAlertPanelNode.swift @@ -42,8 +42,8 @@ final class ChatToastAlertPanelNode: ChatTitleAccessoryPanelNode { let panelHeight: CGFloat = 40.0 self.textColor = interfaceState.theme.rootController.navigationBar.primaryTextColor - self.backgroundColor = interfaceState.theme.rootController.navigationBar.backgroundColor - self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor + self.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor + self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelHeight - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel))) diff --git a/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift b/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift index e60225b3dd..3481cd10c7 100644 --- a/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift @@ -107,7 +107,7 @@ final class ComposeControllerNode: ASDisplayNode { searchDisplayController.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition) } - self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) + self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) self.contactListNode.frame = CGRect(origin: CGPoint(), size: layout.size) } diff --git a/submodules/TelegramUI/TelegramUI/ContactMultiselectionControllerNode.swift b/submodules/TelegramUI/TelegramUI/ContactMultiselectionControllerNode.swift index 067c0970f3..51c5af78ef 100644 --- a/submodules/TelegramUI/TelegramUI/ContactMultiselectionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ContactMultiselectionControllerNode.swift @@ -127,7 +127,7 @@ final class ContactMultiselectionControllerNode: ASDisplayNode { var headerInsets = layout.insets(options: [.input]) headerInsets.top += actualNavigationBarHeight headerInsets.top += strongSelf.tokenListNode.bounds.size.height - searchResultsNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: .immediate) + searchResultsNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: .immediate) searchResultsNode.frame = CGRect(origin: CGPoint(), size: layout.size) } @@ -180,11 +180,11 @@ final class ContactMultiselectionControllerNode: ASDisplayNode { insets.top += tokenListHeight headerInsets.top += tokenListHeight - self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) + self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) self.contactListNode.frame = CGRect(origin: CGPoint(), size: layout.size) if let searchResultsNode = self.searchResultsNode { - searchResultsNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) + searchResultsNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) searchResultsNode.frame = CGRect(origin: CGPoint(), size: layout.size) } } diff --git a/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift b/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift index 3114537347..065fcb111e 100644 --- a/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ContactSelectionControllerNode.swift @@ -100,7 +100,7 @@ final class ContactSelectionControllerNode: ASDisplayNode { searchDisplayController.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition) } - self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) + self.contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) self.contactListNode.frame = CGRect(origin: CGPoint(), size: layout.size) diff --git a/submodules/TelegramUI/TelegramUI/EmojiResources.swift b/submodules/TelegramUI/TelegramUI/EmojiResources.swift index 73d81059d0..ca74e2a34b 100644 --- a/submodules/TelegramUI/TelegramUI/EmojiResources.swift +++ b/submodules/TelegramUI/TelegramUI/EmojiResources.swift @@ -201,7 +201,7 @@ private func matchingEmojiEntry(_ emoji: String) -> (UInt8, UInt8, UInt8)? { } func messageIsElligibleForLargeEmoji(_ message: Message) -> Bool { - if message.media.isEmpty && !message.text.isEmpty && message.text.containsOnlyEmoji && message.text.emojis.count < 4 { + if !message.text.isEmpty && message.text.containsOnlyEmoji && message.text.emojis.count < 4 { var messageEntities: [MessageTextEntity]? for attribute in message.attributes { if let attribute = attribute as? TextEntitiesMessageAttribute { diff --git a/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift b/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift index 4d4a30b1fc..7f99aab120 100644 --- a/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift +++ b/submodules/TelegramUI/TelegramUI/OpenResolvedUrl.swift @@ -243,22 +243,25 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur |> mapToSignal { themeInfo -> Signal<(Data, TelegramTheme), GetThemeError> in return Signal<(Data, TelegramTheme), GetThemeError> { subscriber in let disposables = DisposableSet() - let mediaBox = context.sharedContext.accountManager.mediaBox let resource = themeInfo.file?.resource if let resource = resource { - disposables.add(fetchedMediaResource(mediaBox: mediaBox, reference: .standalone(resource: resource)).start()) + disposables.add(fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, reference: .standalone(resource: resource)).start()) - let maybeFetched = mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false), attemptSynchronously: false) - |> take(1) + let maybeFetched = context.sharedContext.accountManager.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false), attemptSynchronously: false) |> mapToSignal { maybeData -> Signal in if maybeData.complete { let loadedData = try? Data(contentsOf: URL(fileURLWithPath: maybeData.path), options: []) return .single(loadedData) } else { - return mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false), attemptSynchronously: false) + return context.account.postbox.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false), attemptSynchronously: false) |> map { next -> Data? in - return next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: []) + if next.size > 0, let data = try? Data(contentsOf: URL(fileURLWithPath: next.path), options: []) { + context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data) + return data + } else { + return nil + } } } } @@ -279,7 +282,32 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur let controller = OverlayStatusController(theme: presentationData.theme, strings: presentationData.strings, type: .loading(cancelled: nil)) present(controller, nil) - let _ = (signal + var cancelImpl: (() -> Void)? + let progressSignal = Signal { subscriber in + let controller = OverlayStatusController(theme: presentationData.theme, strings: presentationData.strings, type: .loading(cancelled: { + cancelImpl?() + })) + present(controller, nil) + return ActionDisposable { [weak controller] in + Queue.mainQueue().async() { + controller?.dismiss() + } + } + } + |> runOn(Queue.mainQueue()) + |> delay(0.35, queue: Queue.mainQueue()) + + let disposable = MetaDisposable() + let progressDisposable = progressSignal.start() + cancelImpl = { + disposable.set(nil) + } + disposable.set((signal + |> afterDisposed { + Queue.mainQueue().async { + progressDisposable.dispose() + } + } |> deliverOnMainQueue).start(next: { [weak controller] dataAndTheme in controller?.dismiss() @@ -297,7 +325,7 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur } present(textAlertController(context: context, title: nil, text: errorText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil) controller?.dismiss() - }) + })) dismissInput() } } diff --git a/submodules/TelegramUI/TelegramUI/OverlayMediaController.swift b/submodules/TelegramUI/TelegramUI/OverlayMediaController.swift index a4f358ebe9..08a36a3450 100644 --- a/submodules/TelegramUI/TelegramUI/OverlayMediaController.swift +++ b/submodules/TelegramUI/TelegramUI/OverlayMediaController.swift @@ -41,7 +41,7 @@ public final class OverlayMediaControllerImpl: ViewController, OverlayMediaContr override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { super.containerLayoutUpdated(layout, transition: transition) - let updatedLayout = ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: UIEdgeInsets(top: (layout.statusBarHeight ?? 0.0) + 44.0, left: layout.intrinsicInsets.left, bottom: layout.intrinsicInsets.bottom, right: layout.intrinsicInsets.right), safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver) + let updatedLayout = ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: UIEdgeInsets(top: (layout.statusBarHeight ?? 0.0) + 44.0, left: layout.intrinsicInsets.left, bottom: layout.intrinsicInsets.bottom, right: layout.intrinsicInsets.right), safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver) self.controllerNode.containerLayoutUpdated(updatedLayout, transition: transition) } } diff --git a/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift b/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift index 48c6e23346..4a44cd0267 100644 --- a/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/PeerSelectionControllerNode.swift @@ -209,7 +209,7 @@ final class PeerSelectionControllerNode: ASDisplayNode { let contactsInsets = insets - contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, intrinsicInsets: contactsInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, standardInputHeight: layout.standardInputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) + contactListNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: contactsInsets, safeInsets: layout.safeInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition) } if let searchDisplayController = self.searchDisplayController { diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 76229231ab..771e0a97d8 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/TelegramRootController.swift b/submodules/TelegramUI/TelegramUI/TelegramRootController.swift index 54bcfd3050..50cff99aea 100644 --- a/submodules/TelegramUI/TelegramUI/TelegramRootController.swift +++ b/submodules/TelegramUI/TelegramUI/TelegramRootController.swift @@ -49,18 +49,15 @@ public final class TelegramRootController: NavigationController { if presentationData.chatWallpaper != strongSelf.presentationData.chatWallpaper { let navigationDetailsBackgroundMode: NavigationEmptyDetailsBackgoundMode? switch presentationData.chatWallpaper { - case .color: - let image = generateTintedImage(image: UIImage(bundleImageName: "Chat List/EmptyMasterDetailIcon"), color: presentationData.theme.chatList.messageTextColor.withAlphaComponent(0.2)) - navigationDetailsBackgroundMode = image != nil ? .image(image!) : nil - default: - let image = chatControllerBackgroundImage(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper, mediaBox: strongSelf.context.account.postbox.mediaBox, knockoutMode: strongSelf.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper) - navigationDetailsBackgroundMode = image != nil ? .wallpaper(image!) : nil + case .color: + let image = generateTintedImage(image: UIImage(bundleImageName: "Chat List/EmptyMasterDetailIcon"), color: presentationData.theme.chatList.messageTextColor.withAlphaComponent(0.2)) + navigationDetailsBackgroundMode = image != nil ? .image(image!) : nil + default: + navigationDetailsBackgroundMode = chatControllerBackgroundImage(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper, mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, knockoutMode: strongSelf.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper).flatMap(NavigationEmptyDetailsBackgoundMode.wallpaper) } strongSelf.updateBackgroundDetailsMode(navigationDetailsBackgroundMode, transition: .immediate) } - - - + let previousTheme = strongSelf.presentationData.theme strongSelf.presentationData = presentationData if previousTheme !== presentationData.theme { diff --git a/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift b/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift index 2e2c6d9512..be6dc72e98 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift @@ -66,6 +66,10 @@ final class ThemeUpdateManagerImpl: ThemeUpdateManager { validIds.insert(themeSettings.theme.index) themes[themeSettings.theme.index] = (themeSettings.theme, false) } + if case .cloud = themeSettings.automaticThemeSwitchSetting.theme, themeSettings.automaticThemeSwitchSetting.trigger != .none { + validIds.insert(themeSettings.automaticThemeSwitchSetting.theme.index) + themes[themeSettings.automaticThemeSwitchSetting.theme.index] = (themeSettings.automaticThemeSwitchSetting.theme, true) + } if previousIds != validIds { for id in validIds { @@ -87,7 +91,7 @@ final class ThemeUpdateManagerImpl: ThemeUpdateManager { let resolvedWallpaper: Signal if case let .file(file) = presentationTheme.chat.defaultWallpaper, file.id == 0 { - resolvedWallpaper = cachedWallpaper(account: account, slug: file.slug) + resolvedWallpaper = cachedWallpaper(account: account, slug: file.slug, settings: file.settings) |> map { wallpaper in return wallpaper?.wallpaper } @@ -126,20 +130,25 @@ final class ThemeUpdateManagerImpl: ThemeUpdateManager { current = PresentationThemeSettings.defaultSettings } - let chatWallpaper: TelegramWallpaper - if let themeSpecificWallpaper = current.themeSpecificChatWallpapers[updatedTheme.index] { - chatWallpaper = themeSpecificWallpaper - } else if let presentationTheme = presentationTheme { - if case let .cloud(info) = updatedTheme, let resolvedWallpaper = info.resolvedWallpaper { - chatWallpaper = resolvedWallpaper - } else { - chatWallpaper = presentationTheme.chat.defaultWallpaper - } + var chatWallpaper = current.chatWallpaper + var automaticThemeSwitchSetting = current.automaticThemeSwitchSetting + if isAutoNight { + automaticThemeSwitchSetting.theme = updatedTheme } else { - chatWallpaper = current.chatWallpaper + if let themeSpecificWallpaper = current.themeSpecificChatWallpapers[updatedTheme.index] { + chatWallpaper = themeSpecificWallpaper + } else if let presentationTheme = presentationTheme { + if case let .cloud(info) = updatedTheme, let resolvedWallpaper = info.resolvedWallpaper { + chatWallpaper = resolvedWallpaper + } else { + chatWallpaper = presentationTheme.chat.defaultWallpaper + } + } else { + chatWallpaper = current.chatWallpaper + } } - return PresentationThemeSettings(chatWallpaper: chatWallpaper, theme: updatedTheme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(chatWallpaper: chatWallpaper, theme: updatedTheme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, fontSize: current.fontSize, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) }).start() } diff --git a/submodules/TelegramUI/TelegramUI/WallpaperPreviewMedia.swift b/submodules/TelegramUI/TelegramUI/WallpaperPreviewMedia.swift index 79a24beea2..1feb8f0c2f 100644 --- a/submodules/TelegramUI/TelegramUI/WallpaperPreviewMedia.swift +++ b/submodules/TelegramUI/TelegramUI/WallpaperPreviewMedia.swift @@ -4,7 +4,7 @@ import Postbox import TelegramCore enum WallpaperPreviewMediaContent: Equatable { - case file(TelegramMediaFile, UIColor?, Bool) + case file(TelegramMediaFile, UIColor?, Bool, Bool) case color(UIColor) } diff --git a/submodules/TelegramUI/TelegramUI/WebpagePreviewAccessoryPanelNode.swift b/submodules/TelegramUI/TelegramUI/WebpagePreviewAccessoryPanelNode.swift index c4448b12d0..569304e5e4 100644 --- a/submodules/TelegramUI/TelegramUI/WebpagePreviewAccessoryPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/WebpagePreviewAccessoryPanelNode.swift @@ -116,6 +116,8 @@ final class WebpagePreviewAccessoryPanelNode: AccessoryPanelNode { } else { text = stringForMediaKind(mediaKind, strings: self.strings).0 } + } else if let files = content.files, content.type == "telegram_theme" { + text = strings.Message_Theme } else if let _ = content.image { text = stringForMediaKind(.image, strings: self.strings).0 } diff --git a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift index e8eae936c2..b3d2a9cde4 100644 --- a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift +++ b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift @@ -271,21 +271,27 @@ public enum AutomaticThemeSwitchTrigger: PostboxCoding, Equatable { public struct AutomaticThemeSwitchSetting: PostboxCoding, Equatable { public var trigger: AutomaticThemeSwitchTrigger - public var theme: PresentationBuiltinThemeReference + public var theme: PresentationThemeReference - public init(trigger: AutomaticThemeSwitchTrigger, theme: PresentationBuiltinThemeReference) { + public init(trigger: AutomaticThemeSwitchTrigger, theme: PresentationThemeReference) { self.trigger = trigger self.theme = theme } public init(decoder: PostboxDecoder) { self.trigger = decoder.decodeObjectForKey("trigger", decoder: { AutomaticThemeSwitchTrigger(decoder: $0) }) as! AutomaticThemeSwitchTrigger - self.theme = PresentationBuiltinThemeReference(rawValue: decoder.decodeInt32ForKey("theme", orElse: 0))! + if let theme = decoder.decodeObjectForKey("theme_v2", decoder: { PresentationThemeReference(decoder: $0) }) as? PresentationThemeReference { + self.theme = theme + } else if let legacyValue = decoder.decodeOptionalInt32ForKey("theme") { + self.theme = .builtin(PresentationBuiltinThemeReference(rawValue: legacyValue) ?? .nightAccent) + } else { + self.theme = .builtin(.nightAccent) + } } public func encode(_ encoder: PostboxEncoder) { encoder.encodeObject(self.trigger, forKey: "trigger") - encoder.encodeInt32(self.theme.rawValue, forKey: "theme") + encoder.encodeObject(self.theme, forKey: "theme_v2") } } @@ -443,7 +449,7 @@ public struct PresentationThemeSettings: PreferencesEntry { } public static var defaultSettings: PresentationThemeSettings { - return PresentationThemeSettings(chatWallpaper: .builtin(WallpaperSettings()), theme: .builtin(.dayClassic), themeSpecificAccentColors: [:], themeSpecificChatWallpapers: [:], fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), largeEmoji: true, disableAnimations: true) + return PresentationThemeSettings(chatWallpaper: .builtin(WallpaperSettings()), theme: .builtin(.dayClassic), themeSpecificAccentColors: [:], themeSpecificChatWallpapers: [:], fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .builtin(.nightAccent)), largeEmoji: true, disableAnimations: true) } public init(chatWallpaper: TelegramWallpaper, theme: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], themeSpecificChatWallpapers: [Int64: TelegramWallpaper], fontSize: PresentationFontSize, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting, largeEmoji: Bool, disableAnimations: Bool) { @@ -499,7 +505,7 @@ public struct PresentationThemeSettings: PreferencesEntry { } self.fontSize = PresentationFontSize(rawValue: decoder.decodeInt32ForKey("f", orElse: PresentationFontSize.regular.rawValue)) ?? .regular - self.automaticThemeSwitchSetting = (decoder.decodeObjectForKey("automaticThemeSwitchSetting", decoder: { AutomaticThemeSwitchSetting(decoder: $0) }) as? AutomaticThemeSwitchSetting) ?? AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent) + self.automaticThemeSwitchSetting = (decoder.decodeObjectForKey("automaticThemeSwitchSetting", decoder: { AutomaticThemeSwitchSetting(decoder: $0) }) as? AutomaticThemeSwitchSetting) ?? AutomaticThemeSwitchSetting(trigger: .none, theme: .builtin(.nightAccent)) self.largeEmoji = decoder.decodeBoolForKey("largeEmoji", orElse: true) self.disableAnimations = decoder.decodeBoolForKey("disableAnimations", orElse: true) } diff --git a/submodules/TextSelectionNode/Sources/TextSelectionNode.swift b/submodules/TextSelectionNode/Sources/TextSelectionNode.swift index 09ee5e7289..a196e51f00 100644 --- a/submodules/TextSelectionNode/Sources/TextSelectionNode.swift +++ b/submodules/TextSelectionNode/Sources/TextSelectionNode.swift @@ -131,7 +131,6 @@ private final class TextSelectionGetureRecognizer: UIGestureRecognizer, UIGestur self.currentLocation = currentLocation if let (knob, initialKnobPosition, initialGesturePosition) = self.movingKnob, let currentLocation = currentLocation { - self.moveKnob?(knob, CGPoint(x: initialKnobPosition.x + currentLocation.x - initialGesturePosition.x, y: initialKnobPosition.y + currentLocation.y - initialGesturePosition.y)) } } diff --git a/submodules/WallpaperResources/Sources/WallpaperCache.swift b/submodules/WallpaperResources/Sources/WallpaperCache.swift index 4797136cf7..4b8495c4a5 100644 --- a/submodules/WallpaperResources/Sources/WallpaperCache.swift +++ b/submodules/WallpaperResources/Sources/WallpaperCache.swift @@ -25,12 +25,16 @@ public final class CachedWallpaper: PostboxCoding { private let collectionSpec = ItemCacheCollectionSpec(lowWaterItemCount: 10000, highWaterItemCount: 20000) -public func cachedWallpaper(account: Account, slug: String) -> Signal { +public func cachedWallpaper(account: Account, slug: String, settings: WallpaperSettings?) -> Signal { return account.postbox.transaction { transaction -> Signal in let key = ValueBoxKey(length: 8) key.setInt64(0, value: Int64(bitPattern: slug.persistentHashValue)) if let entry = transaction.retrieveItemCacheEntry(id: ItemCacheEntryId(collectionId: ApplicationSpecificItemCacheCollectionId.cachedWallpapers, key: key)) as? CachedWallpaper { - return .single(entry) + if let settings = settings { + return .single(CachedWallpaper(wallpaper: entry.wallpaper.withUpdatedSettings(settings))) + } else { + return .single(entry) + } } else { return getWallpaper(account: account, slug: slug) |> map(Optional.init) @@ -45,7 +49,11 @@ public func cachedWallpaper(account: Account, slug: String) -> Signal take(1) |> mapToSignal { maybeSharedData, maybeData -> Signal<(Data?, Data?, Bool), NoError> in if maybeSharedData.complete { - let loadedData: Data? = try? Data(contentsOf: URL(fileURLWithPath: maybeSharedData.path), options: []) - return .single((nil, loadedData, true)) + if let loadedData = try? Data(contentsOf: URL(fileURLWithPath: maybeSharedData.path), options: [.mappedRead]) { + return .single((nil, loadedData, true)) + } else { + return .single((nil, nil, true)) + } } else if maybeData.complete { let loadedData: Data? = try? Data(contentsOf: URL(fileURLWithPath: maybeData.path), options: []) return .single((nil, loadedData, true)) @@ -807,7 +810,7 @@ public func themeImage(account: Account, accountManager: AccountManager, fileRef |> mapToSignal { (fullSizeData, thumbnailData) -> Signal<(PresentationTheme?, UIImage?, Data?), NoError> in if let fullSizeData = fullSizeData, let theme = makePresentationTheme(data: fullSizeData) { if case let .file(file) = theme.chat.defaultWallpaper, file.id == 0 { - return cachedWallpaper(account: account, slug: file.slug) + return cachedWallpaper(account: account, slug: file.slug, settings: file.settings) |> mapToSignal { wallpaper -> Signal<(PresentationTheme?, UIImage?, Data?), NoError> in if let wallpaper = wallpaper, case let .file(file) = wallpaper.wallpaper { var convertedRepresentations: [ImageRepresentationWithReference] = [] @@ -818,11 +821,30 @@ public func themeImage(account: Account, accountManager: AccountManager, fileRef return .complete() } accountManager.mediaBox.storeResourceData(file.file.resource.id, data: fullSizeData) + let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedScaledImageRepresentation(size: CGSize(width: 720.0, height: 720.0), mode: .aspectFit), complete: true, fetch: true).start() - if let image = UIImage(data: fullSizeData) { + if file.isPattern, let color = file.settings.color, let intensity = file.settings.intensity { + return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, intensity: intensity), complete: true, fetch: true) + |> mapToSignal { data in + if data.complete, let data = try? Data(contentsOf: URL(fileURLWithPath: data.path)), let image = UIImage(data: data) { + return .single((theme, image, thumbnailData)) + } else { + return .complete() + } + } + } else if file.settings.blur { + return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true) + |> mapToSignal { data in + if data.complete, let data = try? Data(contentsOf: URL(fileURLWithPath: data.path)), let image = UIImage(data: data) { + return .single((theme, image, thumbnailData)) + } else { + return .complete() + } + } + } else if let image = UIImage(data: fullSizeData) { return .single((theme, image, thumbnailData)) } else { - return .single((theme, nil, thumbnailData)) + return .complete() } } } else { @@ -908,15 +930,15 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the let signal: Signal<(UIColor, UIColor, UIColor, UIImage?), NoError> if case let .builtin(theme) = theme { switch theme { - case .dayClassic: - signal = .single((UIColor(rgb: 0xd6e2ee), UIColor(rgb: 0xffffff), UIColor(rgb: 0xe1ffc7), nil)) - case .day: - signal = .single((.white, UIColor(rgb: 0xd5dde6), accentColor ?? UIColor(rgb: 0x007aff), nil)) - case .night: - signal = .single((.black, UIColor(rgb: 0x1f1f1f), accentColor ?? UIColor(rgb: 0x313131), nil)) - case .nightAccent: - let accentColor = accentColor ?? UIColor(rgb: 0x007aff) - signal = .single((accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18), accentColor.withMultiplied(hue: 1.024, saturation: 0.585, brightness: 0.25), accentColor.withMultiplied(hue: 1.019, saturation: 0.731, brightness: 0.59), nil)) + case .dayClassic: + signal = .single((UIColor(rgb: 0xd6e2ee), UIColor(rgb: 0xffffff), UIColor(rgb: 0xe1ffc7), nil)) + case .day: + signal = .single((.white, UIColor(rgb: 0xd5dde6), accentColor ?? UIColor(rgb: 0x007aff), nil)) + case .night: + signal = .single((.black, UIColor(rgb: 0x1f1f1f), accentColor ?? UIColor(rgb: 0x313131), nil)) + case .nightAccent: + let accentColor = accentColor ?? UIColor(rgb: 0x007aff) + signal = .single((accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18), accentColor.withMultiplied(hue: 1.024, saturation: 0.585, brightness: 0.25), accentColor.withMultiplied(hue: 1.019, saturation: 0.731, brightness: 0.59), nil)) } } else { var resource: MediaResource? @@ -927,13 +949,13 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the } if let resource = resource { signal = telegramThemeData(account: account, accountManager: accountManager, resource: resource, synchronousLoad: false) - |> mapToSignal { data -> Signal<(UIColor, UIColor, UIColor, UIImage?), NoError> in - if let data = data, let theme = makePresentationTheme(data: data) { - var wallpaperSignal: Signal<(UIColor, UIColor, UIColor, UIImage?), NoError> = .complete() - let backgroundColor: UIColor - let incomingColor = theme.chat.message.incoming.bubble.withoutWallpaper.fill - let outgoingColor = theme.chat.message.outgoing.bubble.withoutWallpaper.fill - switch theme.chat.defaultWallpaper { + |> mapToSignal { data -> Signal<(UIColor, UIColor, UIColor, UIImage?), NoError> in + if let data = data, let theme = makePresentationTheme(data: data) { + var wallpaperSignal: Signal<(UIColor, UIColor, UIColor, UIImage?), NoError> = .complete() + let backgroundColor: UIColor + let incomingColor = theme.chat.message.incoming.bubble.withoutWallpaper.fill + let outgoingColor = theme.chat.message.outgoing.bubble.withoutWallpaper.fill + switch theme.chat.defaultWallpaper { case .builtin: backgroundColor = UIColor(rgb: 0xd6e2ee) case let .color(color): @@ -941,8 +963,12 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the case .image: backgroundColor = .black case let .file(file): - backgroundColor = theme.chatList.backgroundColor - wallpaperSignal = cachedWallpaper(account: account, slug: file.slug) + if file.isPattern, let color = file.settings.color { + backgroundColor = UIColor(rgb: UInt32(bitPattern: color)) + } else { + backgroundColor = theme.chatList.backgroundColor + } + wallpaperSignal = cachedWallpaper(account: account, slug: file.slug, settings: file.settings) |> mapToSignal { wallpaper in if let wallpaper = wallpaper, case let .file(file) = wallpaper.wallpaper { var convertedRepresentations: [ImageRepresentationWithReference] = [] @@ -953,8 +979,23 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the return .complete() } accountManager.mediaBox.storeResourceData(file.file.resource.id, data: fullSizeData) + let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedScaledImageRepresentation(size: CGSize(width: 720.0, height: 720.0), mode: .aspectFit), complete: true, fetch: true).start() - if let image = UIImage(data: fullSizeData) { + if file.isPattern, let color = file.settings.color, let intensity = file.settings.intensity { + return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, intensity: intensity), complete: true, fetch: true) + |> mapToSignal { _ in + return .complete() + } + } else if file.settings.blur { + return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true) + |> mapToSignal { _ in + if let image = UIImage(data: fullSizeData) { + return .single((backgroundColor, incomingColor, outgoingColor, image)) + } else { + return .complete() + } + } + } else if let image = UIImage(data: fullSizeData) { return .single((backgroundColor, incomingColor, outgoingColor, image)) } else { return .complete() @@ -964,12 +1005,12 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the return .complete() } } - } - return .single((backgroundColor, incomingColor, outgoingColor, nil)) - |> then(wallpaperSignal) - } else { - return .complete() } + return .single((backgroundColor, incomingColor, outgoingColor, nil)) + |> then(wallpaperSignal) + } else { + return .complete() + } } } else { signal = .never()