diff --git a/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/Contents.json b/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/Contents.json index 0b72936b64..6cb53cc546 100644 --- a/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/Contents.json +++ b/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/Contents.json @@ -2,7 +2,7 @@ "images" : [ { "idiom" : "universal", - "filename" : "ic_bot.pdf" + "filename" : "ic_bot2.pdf" } ], "info" : { diff --git a/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/ic_bot.pdf b/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/ic_bot.pdf deleted file mode 100644 index 9d7a87f262..0000000000 Binary files a/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/ic_bot.pdf and /dev/null differ diff --git a/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/ic_bot2.pdf b/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/ic_bot2.pdf new file mode 100644 index 0000000000..09c47684de Binary files /dev/null and b/Images.xcassets/Chat/Input/Text/AccessoryIconInputButtons.imageset/ic_bot2.pdf differ diff --git a/TelegramUI.xcodeproj/project.pbxproj b/TelegramUI.xcodeproj/project.pbxproj index 6f5f713d0e..c327f078fd 100644 --- a/TelegramUI.xcodeproj/project.pbxproj +++ b/TelegramUI.xcodeproj/project.pbxproj @@ -96,6 +96,15 @@ 09DD88F321BF907C000766BC /* WebSearchRecentQueryItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09DD88F221BF907C000766BC /* WebSearchRecentQueryItem.swift */; }; 09DD88F521BF9730000766BC /* WebSearchRecentQueries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09DD88F421BF9730000766BC /* WebSearchRecentQueries.swift */; }; 09DD88FA21BFD70B000766BC /* ThemedTextAlertController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09DD88F921BFD70B000766BC /* ThemedTextAlertController.swift */; }; + 09F664C021EAAFAF00AB7E26 /* ThemeColorsGridController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664BF21EAAFAF00AB7E26 /* ThemeColorsGridController.swift */; }; + 09F664C221EAAFCB00AB7E26 /* ThemeColorsGridControllerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664C121EAAFCB00AB7E26 /* ThemeColorsGridControllerNode.swift */; }; + 09F664C421EAB98300AB7E26 /* ThemeColorsGridControllerItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664C321EAB98300AB7E26 /* ThemeColorsGridControllerItem.swift */; }; + 09F664C621EB400A00AB7E26 /* ThemeGridSearchContainerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664C521EB400A00AB7E26 /* ThemeGridSearchContainerNode.swift */; }; + 09F664C821EB4A2600AB7E26 /* ThemeGridSearchItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664C721EB4A2600AB7E26 /* ThemeGridSearchItem.swift */; }; + 09F664CA21EB4F2700AB7E26 /* ThemeGridSearchColorsItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664C921EB4F2700AB7E26 /* ThemeGridSearchColorsItem.swift */; }; + 09F664CC21EB552C00AB7E26 /* WallpaperSearchRecentQueries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664CB21EB552C00AB7E26 /* WallpaperSearchRecentQueries.swift */; }; + 09F664CE21EBB3A100AB7E26 /* ImageBlur.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664CD21EBB3A100AB7E26 /* ImageBlur.swift */; }; + 09F664D021EBCFB900AB7E26 /* WallpaperCropNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F664CF21EBCFB900AB7E26 /* WallpaperCropNode.swift */; }; 09F799FA21C3542D00820234 /* LegacyWebSearchGallery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F799F921C3542D00820234 /* LegacyWebSearchGallery.swift */; }; 09F799FC21C3FF3000820234 /* WebSearchGalleryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F799FB21C3FF3000820234 /* WebSearchGalleryController.swift */; }; 09F79A0121C8116C00820234 /* WebSearchBadgeNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F79A0021C8116C00820234 /* WebSearchBadgeNode.swift */; }; @@ -1209,6 +1218,15 @@ 09DD88F221BF907C000766BC /* WebSearchRecentQueryItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSearchRecentQueryItem.swift; sourceTree = ""; }; 09DD88F421BF9730000766BC /* WebSearchRecentQueries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSearchRecentQueries.swift; sourceTree = ""; }; 09DD88F921BFD70B000766BC /* ThemedTextAlertController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemedTextAlertController.swift; sourceTree = ""; }; + 09F664BF21EAAFAF00AB7E26 /* ThemeColorsGridController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeColorsGridController.swift; sourceTree = ""; }; + 09F664C121EAAFCB00AB7E26 /* ThemeColorsGridControllerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeColorsGridControllerNode.swift; sourceTree = ""; }; + 09F664C321EAB98300AB7E26 /* ThemeColorsGridControllerItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeColorsGridControllerItem.swift; sourceTree = ""; }; + 09F664C521EB400A00AB7E26 /* ThemeGridSearchContainerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeGridSearchContainerNode.swift; sourceTree = ""; }; + 09F664C721EB4A2600AB7E26 /* ThemeGridSearchItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeGridSearchItem.swift; sourceTree = ""; }; + 09F664C921EB4F2700AB7E26 /* ThemeGridSearchColorsItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeGridSearchColorsItem.swift; sourceTree = ""; }; + 09F664CB21EB552C00AB7E26 /* WallpaperSearchRecentQueries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperSearchRecentQueries.swift; sourceTree = ""; }; + 09F664CD21EBB3A100AB7E26 /* ImageBlur.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageBlur.swift; sourceTree = ""; }; + 09F664CF21EBCFB900AB7E26 /* WallpaperCropNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperCropNode.swift; sourceTree = ""; }; 09F799F921C3542D00820234 /* LegacyWebSearchGallery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyWebSearchGallery.swift; sourceTree = ""; }; 09F799FB21C3FF3000820234 /* WebSearchGalleryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSearchGalleryController.swift; sourceTree = ""; }; 09F79A0021C8116C00820234 /* WebSearchBadgeNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSearchBadgeNode.swift; sourceTree = ""; }; @@ -3099,6 +3117,9 @@ D0EC6B371EB88D1600EBF1C3 /* ThemeGridControllerNode.swift */, D0C0B5B61EE1DEF1000F4D2C /* ThemeGridControllerItem.swift */, 09F85BA421E7821500D73170 /* ThemeGridSelectionPanelNode.swift */, + 09F664BF21EAAFAF00AB7E26 /* ThemeColorsGridController.swift */, + 09F664C121EAAFCB00AB7E26 /* ThemeColorsGridControllerNode.swift */, + 09F664C321EAB98300AB7E26 /* ThemeColorsGridControllerItem.swift */, D0B37C5B1F8D22AE004252DF /* ThemeSettingsController.swift */, D0B37C5D1F8D26A8004252DF /* ThemeSettingsChatPreviewItem.swift */, D091C7A51F8ECEA300D7DE13 /* SettingsThemeWallpaperNode.swift */, @@ -3110,6 +3131,12 @@ D005809F21DCF0A200CB7CD3 /* WallpaperListPreviewController.swift */, D00580A121DCF0B700CB7CD3 /* WallpaperListPreviewControllerNode.swift */, 09F85BA621E7DA5F00D73170 /* BlurredImageNode.swift */, + 09F664C521EB400A00AB7E26 /* ThemeGridSearchContainerNode.swift */, + 09F664C721EB4A2600AB7E26 /* ThemeGridSearchItem.swift */, + 09F664C921EB4F2700AB7E26 /* ThemeGridSearchColorsItem.swift */, + 09F664CB21EB552C00AB7E26 /* WallpaperSearchRecentQueries.swift */, + 09F664CD21EBB3A100AB7E26 /* ImageBlur.swift */, + 09F664CF21EBCFB900AB7E26 /* WallpaperCropNode.swift */, ); name = Themes; sourceTree = ""; @@ -5155,6 +5182,7 @@ 09B4EE5E21AC626B00847FA6 /* PermissionContentNode.swift in Sources */, D0E412CC206A6B2300BEE4A2 /* FormControllerActionItem.swift in Sources */, D0471B5A1EFE70400074D609 /* BotCheckoutInfoControllerNode.swift in Sources */, + 09F664CA21EB4F2700AB7E26 /* ThemeGridSearchColorsItem.swift in Sources */, D0EC6CDA1EB9F58800EBF1C3 /* NumericFormat.swift in Sources */, D093D82220699A7C00BC3599 /* FormControllerNode.swift in Sources */, D0EC6CDB1EB9F58800EBF1C3 /* Markdown.swift in Sources */, @@ -5296,6 +5324,7 @@ D0EC6D1F1EB9F58800EBF1C3 /* MediaPlayerTimeTextNode.swift in Sources */, D0EC6D201EB9F58800EBF1C3 /* PeerAvatar.swift in Sources */, D0EC6D211EB9F58800EBF1C3 /* FileResources.swift in Sources */, + 09F664CC21EB552C00AB7E26 /* WallpaperSearchRecentQueries.swift in Sources */, D0461439200514F000EC0EF2 /* LiveLocationSummaryManager.swift in Sources */, D056CD781FF2A6EE00880D28 /* ChatMessageSwipeToReplyNode.swift in Sources */, D0CE67941F7DB45100FFB557 /* ChatMessageContactBubbleContentNode.swift in Sources */, @@ -5385,6 +5414,7 @@ D0EC6D411EB9F58800EBF1C3 /* MediaNavigationAccessoryHeaderNode.swift in Sources */, D097C26820DD0A1D007BB4B8 /* PeerReportController.swift in Sources */, D0471B491EFD59170074D609 /* BotCheckoutControllerNode.swift in Sources */, + 09F664C621EB400A00AB7E26 /* ThemeGridSearchContainerNode.swift in Sources */, D01BAA181ECC8E0000295217 /* CallListController.swift in Sources */, D0EC6D4B1EB9F58800EBF1C3 /* ChatListNode.swift in Sources */, D0EC6D4D1EB9F58800EBF1C3 /* ChatListHoleItem.swift in Sources */, @@ -5435,6 +5465,7 @@ D0EC6D641EB9F58800EBF1C3 /* ContactsPeerItem.swift in Sources */, D0B85C1E1FF6F76600E795B4 /* AuthorizationSequencePasswordRecoveryControllerNode.swift in Sources */, 09B4EE4721A6D33F00847FA6 /* RecentSessionsEmptyStateItem.swift in Sources */, + 09F664C421EAB98300AB7E26 /* ThemeColorsGridControllerItem.swift in Sources */, D00BED201F73F60F00922292 /* ShareSearchContainerNode.swift in Sources */, D0CE8CEC1F6FCCA300AA2DB0 /* TransformImageArguments.swift in Sources */, D0EC6D661EB9F58800EBF1C3 /* ContactsSectionHeaderAccessoryItem.swift in Sources */, @@ -5444,6 +5475,7 @@ D02C81732177AC5900CD1006 /* NotificationSearchItem.swift in Sources */, D018BE58218C7BD800C02DDC /* ChatMessageDeliveryFailedNode.swift in Sources */, D0EC6D681EB9F58800EBF1C3 /* AuthorizationSequenceController.swift in Sources */, + 09F664C021EAAFAF00AB7E26 /* ThemeColorsGridController.swift in Sources */, D0EC6D691EB9F58800EBF1C3 /* AuthorizationSequenceSplashController.swift in Sources */, D0EC6D6A1EB9F58800EBF1C3 /* AuthorizationSequenceSplashControllerNode.swift in Sources */, D0C683FC21AD797F00A6CAD5 /* ChatListSelection.swift in Sources */, @@ -5566,6 +5598,7 @@ D0E9BA2B1F0557A600F079A4 /* STPFormEncoder.m in Sources */, D01BAA1C1ECC92F700295217 /* CallListViewTransition.swift in Sources */, D00580A021DCF0A200CB7CD3 /* WallpaperListPreviewController.swift in Sources */, + 09F664D021EBCFB900AB7E26 /* WallpaperCropNode.swift in Sources */, D097C26C20DD1EA5007BB4B8 /* OverlayStatusController.swift in Sources */, D0EC6D9E1EB9F58900EBF1C3 /* ChatMessageWebpageBubbleContentNode.swift in Sources */, D06CF82720D0080200AC4CFF /* SecureIdAuthListContentNode.swift in Sources */, @@ -5742,6 +5775,7 @@ D0477D1D1F617E8900412B44 /* NativeVideoContent.swift in Sources */, D0EC6DF81EB9F58900EBF1C3 /* PeerMediaCollectionInterfaceState.swift in Sources */, D0EC6DF91EB9F58900EBF1C3 /* PeerMediaCollectionInterfaceStateButtons.swift in Sources */, + 09F664C821EB4A2600AB7E26 /* ThemeGridSearchItem.swift in Sources */, D07E413B208A432100FCA8F0 /* ChatListTitleProxyNode.swift in Sources */, D080B27F1F4C7C6000AA3847 /* InstantPageManagedMediaId.swift in Sources */, D08984F02114AE0C00918162 /* DataPrivacySettingsController.swift in Sources */, @@ -6010,12 +6044,14 @@ D0ACCB1C1EC5FF4B0079D8BF /* ChatMessageCallBubbleContentNode.swift in Sources */, D046142E2004DB3700EC0EF2 /* LiveLocationManager.swift in Sources */, D05677511F4CA0C2001B723E /* InstantPagePeerReferenceItem.swift in Sources */, + 09F664CE21EBB3A100AB7E26 /* ImageBlur.swift in Sources */, D0EC6E891EB9F58900EBF1C3 /* FrameworkBundle.swift in Sources */, D0EC6E8B1EB9F58900EBF1C3 /* RingBuffer.m in Sources */, D0FA08C8204982DC00DD23FC /* ChatTextInputActionButtonsNode.swift in Sources */, D0EC6E8C1EB9F58900EBF1C3 /* RingByteBuffer.swift in Sources */, D0E9BA181F05574500F079A4 /* STPPaymentCardTextFieldViewModel.m in Sources */, D0EC6E8D1EB9F58900EBF1C3 /* SecretChatKeyVisualization.m in Sources */, + 09F664C221EAAFCB00AB7E26 /* ThemeColorsGridControllerNode.swift in Sources */, D0BCC3D420404CC7008126C2 /* ChatMessageActionSheetController.swift in Sources */, D0EC6E8E1EB9F58900EBF1C3 /* NumberPluralizationForm.m in Sources */, ); diff --git a/TelegramUI/BlurredImageNode.swift b/TelegramUI/BlurredImageNode.swift index be882b3fc1..36a558bd16 100644 --- a/TelegramUI/BlurredImageNode.swift +++ b/TelegramUI/BlurredImageNode.swift @@ -3,50 +3,176 @@ import UIKit import AsyncDisplayKit import Accelerate - -private func imageBuffer(from data: UnsafeMutableRawPointer!, width: vImagePixelCount, height: vImagePixelCount, rowBytes: Int) -> vImage_Buffer { - return vImage_Buffer(data: data, height: vImagePixelCount(height), width: vImagePixelCount(width), rowBytes: rowBytes) +private class BlurLayer: CALayer { + private static let blurRadiusKey = "blurRadius" + private static let blurLayoutKey = "blurLayout" + @NSManaged var blurRadius: CGFloat + @NSManaged private var blurLayout: CGFloat + + private var fromBlurRadius: CGFloat? + var presentationRadius: CGFloat { + if let radius = self.fromBlurRadius { + if let layer = presentation() { + return layer.blurRadius + } else { + return radius + } + } else { + return self.blurRadius + } + } + + override class func needsDisplay(forKey key: String) -> Bool { + if key == blurRadiusKey || key == blurLayoutKey { + return true + } + return super.needsDisplay(forKey: key) + } + + open override func action(forKey event: String) -> CAAction? { + if event == BlurLayer.blurRadiusKey { + self.fromBlurRadius = nil + + if let action = super.action(forKey: "opacity") as? CABasicAnimation { + self.fromBlurRadius = (presentation() ?? self).blurRadius + + action.keyPath = event + action.fromValue = self.fromBlurRadius + return action + } + } + + if event == BlurLayer.blurLayoutKey, let action = super.action(forKey: "opacity") as? CABasicAnimation { + action.keyPath = event + action.fromValue = 0 + action.toValue = 1 + return action + } + + return super.action(forKey: event) + } + + func draw(_ image: UIImage) { + self.contents = image.cgImage + self.contentsScale = image.scale + self.contentsGravity = kCAGravityResizeAspectFill + } + + func refresh() { + self.fromBlurRadius = nil + } + + func animate() { + UIView.performWithoutAnimation { + self.blurLayout = 0 + } + self.blurLayout = 1 + } + + func render(in context: CGContext, for layer: CALayer) { + layer.render(in: context) + } } -private func blurredImage(image: CGImage, boxSize: UInt32, iterations: Int) -> CGImage? { - guard let providerData = image.dataProvider?.data else { - return nil +class BlurView: UIView { + override class var layerClass : AnyClass { + return BlurLayer.self } - let bytes = image.bytesPerRow * image.height - let inData = malloc(bytes) - var inBuffer = imageBuffer(from: inData, width: vImagePixelCount(image.width), height: vImagePixelCount(image.height), rowBytes: image.bytesPerRow) - - let outData = malloc(bytes) - var outBuffer = imageBuffer(from: outData, width: vImagePixelCount(image.width), height: vImagePixelCount(image.height), rowBytes: image.bytesPerRow) - - let tempSize = vImageBoxConvolve_ARGB8888(&inBuffer, &outBuffer, nil, 0, 0, boxSize, boxSize, nil, vImage_Flags(kvImageEdgeExtend + kvImageGetTempBufferSize)) - let tempData = malloc(tempSize) - - defer { - free(inData) - free(outData) - free(tempData) + private var displayLink: CADisplayLink? + private var blurLayer: BlurLayer { + return self.layer as! BlurLayer } - let source = CFDataGetBytePtr(providerData) - memcpy(inBuffer.data, source, bytes) + var image: UIImage? - for _ in 0.. Void) { + queue.async(execute: actions) } - return context?.makeImage() + private func sync(on queue: DispatchQueue, actions: () -> Void) { + queue.sync(execute: actions) + } + + private func draw(_ image: UIImage, blurRadius: CGFloat) { + async(on: globalQueue) { [weak self] in + if let strongSelf = self, let blurredImage = blurredImage(image, radius: blurRadius) { + strongSelf.sync(on: strongSelf.mainQueue) { + strongSelf.blurLayer.draw(blurredImage) + } + } + } + } + + override func display(_ layer: CALayer) { + let blurRadius = self.blurLayer.presentationRadius + if let image = self.image { + self.draw(image, blurRadius: blurRadius) + } + } + + private func linkForDisplay() { + self.displayLink?.invalidate() + self.displayLink = UIScreen.main.displayLink(withTarget: self, selector: #selector(BlurView.displayDidRefresh(_:))) + self.displayLink?.add(to: .main, forMode: RunLoop.Mode(rawValue: "")) + } + + @objc private func displayDidRefresh(_ displayLink: CADisplayLink) { + self.display(self.layer) + } } final class BlurredImageNode: ASDisplayNode { - + var image: UIImage? { + didSet { + self.blurView.image = self.image + } + } + + var blurView: BlurView { + return (self.view as? BlurView)! + } + + override init() { + super.init() + + self.setViewBlock({ + return BlurView() + }) + } } diff --git a/TelegramUI/CachedResourceRepresentations.swift b/TelegramUI/CachedResourceRepresentations.swift index 54ae456c3c..2c723a88eb 100644 --- a/TelegramUI/CachedResourceRepresentations.swift +++ b/TelegramUI/CachedResourceRepresentations.swift @@ -86,3 +86,17 @@ final class CachedScaledVideoFirstFrameRepresentation: CachedMediaResourceRepres } } } + +final class CachedBlurredWallpaperRepresentation: CachedMediaResourceRepresentation { + var uniqueId: String { + return "blurred-wallpaper" + } + + func isEqual(to: CachedMediaResourceRepresentation) -> Bool { + if to is CachedBlurredWallpaperRepresentation { + return true + } else { + return false + } + } +} diff --git a/TelegramUI/CallListCallItem.swift b/TelegramUI/CallListCallItem.swift index 76a6b81fd1..a479c16ff7 100644 --- a/TelegramUI/CallListCallItem.swift +++ b/TelegramUI/CallListCallItem.swift @@ -168,8 +168,6 @@ class CallListCallItem: ListViewItem { } } -private let separatorHeight = 1.0 / UIScreen.main.scale - private let avatarFont: UIFont = UIFont(name: ".SFCompactRounded-Semibold", size: 16.0)! class CallListCallItemNode: ItemListRevealOptionsItemNode { diff --git a/TelegramUI/ChannelMembersSearchController.swift b/TelegramUI/ChannelMembersSearchController.swift index a51bc2ea95..83d15177ff 100644 --- a/TelegramUI/ChannelMembersSearchController.swift +++ b/TelegramUI/ChannelMembersSearchController.swift @@ -31,6 +31,8 @@ final class ChannelMembersSearchController: ViewController { return self.displayNode as! ChannelMembersSearchControllerNode } + private var searchContentNode: NavigationBarSearchContentNode? + init(account: Account, peerId: PeerId, mode: ChannelMembersSearchControllerMode, filters: [ChannelMembersSearchFilter] = [], openPeer: @escaping (Peer, RenderedChannelParticipant?) -> Void) { self.account = account self.peerId = peerId @@ -48,9 +50,17 @@ final class ChannelMembersSearchController: ViewController { self.scrollToTop = { [weak self] in if let strongSelf = self { + if let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateExpansionProgress(1.0, animated: true) + } strongSelf.controllerNode.scrollToTop() } } + + self.searchContentNode = NavigationBarSearchContentNode(theme: self.presentationData.theme, placeholder: self.presentationData.strings.Common_Search, activate: { [weak self] in + self?.activateSearch() + }) + self.navigationBar?.setContentNode(self.searchContentNode, animated: false) } required public init(coder aDecoder: NSCoder) { @@ -58,7 +68,7 @@ final class ChannelMembersSearchController: ViewController { } override func loadDisplayNode() { - self.displayNode = ChannelMembersSearchControllerNode(account: self.account, theme: self.presentationData.theme, strings: self.presentationData.strings, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, peerId: self.peerId, mode: self.mode, filters: self.filters) + self.displayNode = ChannelMembersSearchControllerNode(account: self.account, presentationData: self.presentationData, peerId: self.peerId, mode: self.mode, filters: self.filters) self.controllerNode.navigationBar = self.navigationBar self.controllerNode.requestActivateSearch = { [weak self] in self?.activateSearch() @@ -74,6 +84,18 @@ final class ChannelMembersSearchController: ViewController { } self.displayNodeDidLoad() + + self.controllerNode.listNode.visibleContentOffsetChanged = { [weak self] offset in + if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateListVisibleContentOffset(offset) + } + } + + self.controllerNode.listNode.didEndScrolling = { [weak self] in + if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode { + let _ = fixNavigationSearchableListNodeScrolling(strongSelf.controllerNode.listNode, searchNode: searchContentNode) + } + } } override func viewDidAppear(_ animated: Bool) { @@ -98,7 +120,7 @@ final class ChannelMembersSearchController: ViewController { override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { super.containerLayoutUpdated(layout, transition: transition) - self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition) + self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, transition: transition) } private func activateSearch() { @@ -106,7 +128,9 @@ final class ChannelMembersSearchController: ViewController { if let scrollToTop = self.scrollToTop { scrollToTop() } - self.controllerNode.activateSearch() + if let searchContentNode = self.searchContentNode { + self.controllerNode.activateSearch(placeholderNode: searchContentNode.placeholderNode) + } self.setDisplayNavigationBar(false, transition: .animated(duration: 0.5, curve: .spring)) } } @@ -114,7 +138,9 @@ final class ChannelMembersSearchController: ViewController { private func deactivateSearch(animated: Bool) { if !self.displayNavigationBar { self.setDisplayNavigationBar(true, transition: .animated(duration: 0.5, curve: .spring)) - self.controllerNode.deactivateSearch(animated: animated) + if let searchContentNode = self.searchContentNode { + self.controllerNode.deactivateSearch(placeholderNode: searchContentNode.placeholderNode, animated: animated) + } } } diff --git a/TelegramUI/ChannelMembersSearchControllerNode.swift b/TelegramUI/ChannelMembersSearchControllerNode.swift index 5d01548409..54011c74eb 100644 --- a/TelegramUI/ChannelMembersSearchControllerNode.swift +++ b/TelegramUI/ChannelMembersSearchControllerNode.swift @@ -6,28 +6,22 @@ import TelegramCore import SwiftSignalKit private final class ChannelMembersSearchInteraction { - let activateSearch: () -> Void let openPeer: (Peer, RenderedChannelParticipant?) -> Void - init(activateSearch: @escaping () -> Void, openPeer: @escaping (Peer, RenderedChannelParticipant?) -> Void) { - self.activateSearch = activateSearch + init(openPeer: @escaping (Peer, RenderedChannelParticipant?) -> Void) { self.openPeer = openPeer } } private enum ChannelMembersSearchEntryId: Hashable { - case search case peer(PeerId) } private enum ChannelMembersSearchEntry: Comparable, Identifiable { - case search case peer(Int, RenderedChannelParticipant, ContactsPeerItemEditing, String?, Bool) var stableId: ChannelMembersSearchEntryId { switch self { - case .search: - return .search case let .peer(peer): return .peer(peer.1.peer.id) } @@ -35,12 +29,6 @@ private enum ChannelMembersSearchEntry: Comparable, Identifiable { static func ==(lhs: ChannelMembersSearchEntry, rhs: ChannelMembersSearchEntry) -> Bool { switch lhs { - case .search: - if case .search = rhs { - return true - } else { - return false - } case let .peer(lhsIndex, lhsParticipant, lhsEditing, lhsLabel, lhsEnabled): if case .peer(lhsIndex, lhsParticipant, lhsEditing, lhsLabel, lhsEnabled) = rhs { return true @@ -52,12 +40,6 @@ private enum ChannelMembersSearchEntry: Comparable, Identifiable { static func <(lhs: ChannelMembersSearchEntry, rhs: ChannelMembersSearchEntry) -> Bool { switch lhs { - case .search: - if case .search = rhs { - return false - } else { - return true - } case let .peer(lhsPeer): if case let .peer(rhsPeer) = rhs { return lhsPeer.0 < rhsPeer.0 @@ -69,10 +51,6 @@ private enum ChannelMembersSearchEntry: Comparable, Identifiable { func item(account: Account, theme: PresentationTheme, strings: PresentationStrings, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, interaction: ChannelMembersSearchInteraction) -> ListViewItem { switch self { - case .search: - return ChatListSearchItem(theme: theme, placeholder: strings.Common_Search, activate: { - interaction.activateSearch() - }) case let .peer(_, participant, editing, label, enabled): let status: ContactsPeerItemStatus if let label = label { @@ -123,18 +101,18 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { var requestOpenPeerFromSearch: ((Peer, RenderedChannelParticipant?) -> Void)? var present: ((ViewController, Any?) -> Void)? - var themeAndStrings: (PresentationTheme, PresentationStrings) + var presentationData: PresentationData private var disposable: Disposable? private var listControl: PeerChannelMemberCategoryControl? - init(account: Account, theme: PresentationTheme, strings: PresentationStrings, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, peerId: PeerId, mode: ChannelMembersSearchControllerMode, filters: [ChannelMembersSearchFilter]) { + init(account: Account, presentationData: PresentationData, peerId: PeerId, mode: ChannelMembersSearchControllerMode, filters: [ChannelMembersSearchFilter]) { self.account = account self.listNode = ListView() self.peerId = peerId self.mode = mode self.filters = filters - self.themeAndStrings = (theme, strings) + self.presentationData = presentationData super.init() @@ -142,13 +120,11 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { return UITracingLayerView() }) - self.backgroundColor = theme.chatList.backgroundColor + self.backgroundColor = self.presentationData.theme.chatList.backgroundColor self.addSubnode(self.listNode) - let interaction = ChannelMembersSearchInteraction(activateSearch: { [weak self] in - self?.requestActivateSearch?() - }, openPeer: { [weak self] peer, participant in + let interaction = ChannelMembersSearchInteraction(openPeer: { [weak self] peer, participant in self?.requestOpenPeerFromSearch?(peer, participant) }) @@ -180,7 +156,6 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { return } var entries: [ChannelMembersSearchEntry] = [] - entries.append(.search) var index = 0 for participant in participants.participants { @@ -219,7 +194,7 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { } } if case .creator = participant { - label = strings.Channel_Management_LabelCreator + label = strongSelf.presentationData.strings.Channel_Management_LabelCreator enabled = false } } @@ -243,7 +218,7 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { } let previous = previousEntries.swap(entries) - strongSelf.enqueueTransition(preparedTransition(from: previous, to: entries, account: account, theme: theme, strings: strings, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, interaction: interaction)) + strongSelf.enqueueTransition(preparedTransition(from: previous, to: entries, account: account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, nameSortOrder: strongSelf.presentationData.nameSortOrder, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder, interaction: interaction)) }) disposableAndLoadMoreControl = (disposable, nil) } else { @@ -252,7 +227,6 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { return } var entries: [ChannelMembersSearchEntry] = [] - entries.append(.search) var index = 0 for participant in state.list { @@ -288,7 +262,7 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { } } if case .creator = participant.participant { - label = strings.Channel_Management_LabelCreator + label = strongSelf.presentationData.strings.Channel_Management_LabelCreator enabled = false } } @@ -298,7 +272,7 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { let previous = previousEntries.swap(entries) - strongSelf.enqueueTransition(preparedTransition(from: previous, to: entries, account: account, theme: theme, strings: strings, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, interaction: interaction)) + strongSelf.enqueueTransition(preparedTransition(from: previous, to: entries, account: account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, nameSortOrder: strongSelf.presentationData.nameSortOrder, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder, interaction: interaction)) }) } self.disposable = disposableAndLoadMoreControl.0 @@ -317,9 +291,9 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { self.disposable?.dispose() } - func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) { - self.themeAndStrings = (theme, strings) - self.searchDisplayController?.updateThemeAndStrings(theme: theme, strings: strings) + func updatePresentationData(_ presentationData: PresentationData) { + self.presentationData = presentationData + self.searchDisplayController?.updatePresentationData(presentationData) } func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { @@ -327,7 +301,7 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { self.containerLayout = (layout, navigationBarHeight) var insets = layout.insets(options: [.input]) - insets.top += max(navigationBarHeight, layout.insets(options: [.statusBar]).top) + insets.top += navigationBarHeight self.listNode.bounds = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height) self.listNode.position = CGPoint(x: layout.size.width / 2.0, y: layout.size.height / 2.0) @@ -369,52 +343,38 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { } } - func activateSearch() { - guard let (containerLayout, navigationBarHeight) = self.containerLayout, let navigationBar = self.navigationBar else { + func activateSearch(placeholderNode: SearchBarPlaceholderNode) { + guard let (containerLayout, navigationBarHeight) = self.containerLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else { return } - var maybePlaceholderNode: SearchBarPlaceholderNode? - self.listNode.forEachItemNode { node in - if let node = node as? ChatListSearchItemNode { - maybePlaceholderNode = node.searchBarNode - } - } - - if let _ = self.searchDisplayController { - return - } - - if let placeholderNode = maybePlaceholderNode { - self.searchDisplayController = SearchDisplayController(theme: self.themeAndStrings.0, strings: self.themeAndStrings.1, contentNode: ChannelMembersSearchContainerNode(account: self.account, peerId: self.peerId, mode: .banAndPromoteActions, filters: self.filters, openPeer: { [weak self] peer, participant in - self?.requestOpenPeerFromSearch?(peer, participant) - }, updateActivity: { value in - - }, present: { [weak self] c, a in - self?.present?(c, a) - }), cancel: { [weak self] in - if let requestDeactivateSearch = self?.requestDeactivateSearch { - requestDeactivateSearch() - } - }) + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ChannelMembersSearchContainerNode(account: self.account, peerId: self.peerId, mode: .banAndPromoteActions, filters: self.filters, openPeer: { [weak self] peer, participant in + self?.requestOpenPeerFromSearch?(peer, participant) + }, updateActivity: { value in - self.searchDisplayController?.containerLayoutUpdated(containerLayout, navigationBarHeight: navigationBarHeight, transition: .immediate) - self.searchDisplayController?.activate(insertSubnode: { subnode, isSearchBar in - self.insertSubnode(subnode, belowSubnode: navigationBar) - }, placeholder: placeholderNode) - } + }, present: { [weak self] c, a in + self?.present?(c, a) + }), cancel: { [weak self] in + if let requestDeactivateSearch = self?.requestDeactivateSearch { + requestDeactivateSearch() + } + }) + + self.searchDisplayController?.containerLayoutUpdated(containerLayout, navigationBarHeight: navigationBarHeight, transition: .immediate) + self.searchDisplayController?.activate(insertSubnode: { [weak self, weak placeholderNode] subnode, isSearchBar in + if let strongSelf = self, let strongPlaceholderNode = placeholderNode { + if isSearchBar { + strongPlaceholderNode.supernode?.insertSubnode(subnode, aboveSubnode: strongPlaceholderNode) + } else { + strongSelf.insertSubnode(subnode, belowSubnode: navigationBar) + } + } + }, placeholder: placeholderNode) } - func deactivateSearch(animated: Bool) { + func deactivateSearch(placeholderNode: SearchBarPlaceholderNode, animated: Bool) { if let searchDisplayController = self.searchDisplayController { - var maybePlaceholderNode: SearchBarPlaceholderNode? - self.listNode.forEachItemNode { node in - if let node = node as? ChatListSearchItemNode { - maybePlaceholderNode = node.searchBarNode - } - } - - searchDisplayController.deactivate(placeholder: maybePlaceholderNode, animated: animated) + searchDisplayController.deactivate(placeholder: placeholderNode) self.searchDisplayController = nil } } diff --git a/TelegramUI/ChatBotInfoItem.swift b/TelegramUI/ChatBotInfoItem.swift index 5518a51690..3388859daf 100644 --- a/TelegramUI/ChatBotInfoItem.swift +++ b/TelegramUI/ChatBotInfoItem.swift @@ -108,7 +108,7 @@ final class ChatBotInfoItemNode: ListViewItemNode { break case .ignore: return .fail - case .url, .peerMention, .textMention, .botCommand, .hashtag, .instantPage, .call, .openMessage: + case .url, .peerMention, .textMention, .botCommand, .hashtag, .instantPage, .wallpaper, .call, .openMessage: return .waitForSingleTap } } diff --git a/TelegramUI/ChatController.swift b/TelegramUI/ChatController.swift index 96814b75ce..9d3791b8a9 100644 --- a/TelegramUI/ChatController.swift +++ b/TelegramUI/ChatController.swift @@ -700,6 +700,12 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal if let strongSelf = self, strongSelf.isNodeLoaded, let navigationController = strongSelf.navigationController as? NavigationController, let message = strongSelf.chatDisplayNode.historyNode.messageInCurrentHistoryView(message.id) { openChatInstantPage(account: strongSelf.account, message: message, navigationController: navigationController) } + }, openWallpaper: { [weak self] message in + if let strongSelf = self, strongSelf.isNodeLoaded, let message = strongSelf.chatDisplayNode.historyNode.messageInCurrentHistoryView(message.id) { + openChatWallpaper(account: strongSelf.account, message: message, present: { [weak self] c, a in + self?.present(c, in: .window(.root), with: a, blockInteraction: true) + }) + } }, openHashtag: { [weak self] peerName, hashtag in guard let strongSelf = self else { return diff --git a/TelegramUI/ChatControllerBackgroundNode.swift b/TelegramUI/ChatControllerBackgroundNode.swift index 63dc68917d..3bf17d8eee 100644 --- a/TelegramUI/ChatControllerBackgroundNode.swift +++ b/TelegramUI/ChatControllerBackgroundNode.swift @@ -60,7 +60,7 @@ final class ChatBackgroundNode: ASDisplayNode { private var backgroundImageForWallpaper: (TelegramWallpaper, UIImage)? private var serviceBackgroundColorForWallpaper: (TelegramWallpaper, UIColor)? -func chatControllerBackgroundImage(wallpaper: TelegramWallpaper, postbox: Postbox) -> UIImage? { +func chatControllerBackgroundImage(wallpaper: TelegramWallpaper, mode: PresentationWallpaperMode = .still, postbox: Postbox) -> UIImage? { var backgroundImage: UIImage? if wallpaper == backgroundImageForWallpaper?.0 { backgroundImage = backgroundImageForWallpaper?.1 @@ -77,12 +77,30 @@ func chatControllerBackgroundImage(wallpaper: TelegramWallpaper, postbox: Postbo }) case let .image(representations): if let largest = largestImageRepresentation(representations) { - if let path = postbox.mediaBox.completedResourcePath(largest.resource) { + if case .blurred = mode { + var image: UIImage? + let _ = postbox.mediaBox.cachedResourceRepresentation(largest.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true, attemptSynchronously: true).start(next: { data in + if data.complete { + image = UIImage(contentsOfFile: data.path)?.precomposed() + } + }) + backgroundImage = image + } + if backgroundImage == nil, let path = postbox.mediaBox.completedResourcePath(largest.resource) { backgroundImage = UIImage(contentsOfFile: path)?.precomposed() } } case let .file(file): - if let path = postbox.mediaBox.completedResourcePath(file.file.resource) { + if case .blurred = mode { + var image: UIImage? + let _ = postbox.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true, attemptSynchronously: true).start(next: { data in + if data.complete { + image = UIImage(contentsOfFile: data.path)?.precomposed() + } + }) + backgroundImage = image + } + if backgroundImage == nil, let path = postbox.mediaBox.completedResourcePath(file.file.resource) { backgroundImage = UIImage(contentsOfFile: path)?.precomposed() } } diff --git a/TelegramUI/ChatControllerInteraction.swift b/TelegramUI/ChatControllerInteraction.swift index c0acfd8d19..ef5bf98064 100644 --- a/TelegramUI/ChatControllerInteraction.swift +++ b/TelegramUI/ChatControllerInteraction.swift @@ -65,6 +65,7 @@ public final class ChatControllerInteraction { let shareAccountContact: () -> Void let sendBotCommand: (MessageId?, String) -> Void let openInstantPage: (Message) -> Void + let openWallpaper: (Message) -> Void let openHashtag: (String?, String) -> Void let updateInputState: ((ChatTextInputState) -> ChatTextInputState) -> Void let updateInputMode: ((ChatInputMode) -> ChatInputMode) -> Void @@ -95,7 +96,7 @@ public final class ChatControllerInteraction { var automaticMediaDownloadSettings: AutomaticMediaDownloadSettings var pollActionState: ChatInterfacePollActionState - init(openMessage: @escaping (Message, ChatControllerInteractionOpenMessageMode) -> Bool, openPeer: @escaping (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void, openPeerMention: @escaping (String) -> Void, openMessageContextMenu: @escaping (Message, Bool, ASDisplayNode, CGRect) -> Void, navigateToMessage: @escaping (MessageId, MessageId) -> Void, clickThroughMessage: @escaping () -> Void, toggleMessagesSelection: @escaping ([MessageId], Bool) -> Void, sendMessage: @escaping (String) -> Void, sendSticker: @escaping (FileMediaReference, Bool) -> Void, sendGif: @escaping (FileMediaReference) -> Void, requestMessageActionCallback: @escaping (MessageId, MemoryBuffer?, Bool) -> Void, activateSwitchInline: @escaping (PeerId?, String) -> Void, openUrl: @escaping (String, Bool, Bool?) -> Void, shareCurrentLocation: @escaping () -> Void, shareAccountContact: @escaping () -> Void, sendBotCommand: @escaping (MessageId?, String) -> Void, openInstantPage: @escaping (Message) -> Void, openHashtag: @escaping (String?, String) -> Void, updateInputState: @escaping ((ChatTextInputState) -> ChatTextInputState) -> Void, updateInputMode: @escaping ((ChatInputMode) -> ChatInputMode) -> Void, openMessageShareMenu: @escaping (MessageId) -> Void, presentController: @escaping (ViewController, Any?) -> Void, navigationController: @escaping () -> NavigationController?, presentGlobalOverlayController: @escaping (ViewController, Any?) -> Void, callPeer: @escaping (PeerId) -> Void, longTap: @escaping (ChatControllerInteractionLongTapAction) -> Void, openCheckoutOrReceipt: @escaping (MessageId) -> Void, openSearch: @escaping () -> Void, setupReply: @escaping (MessageId) -> Void, canSetupReply: @escaping (Message) -> Bool, navigateToFirstDateMessage: @escaping(Int32) ->Void, requestRedeliveryOfFailedMessages: @escaping (MessageId) -> Void, addContact: @escaping (String) -> Void, rateCall: @escaping (Message, CallId) -> Void, requestSelectMessagePollOption: @escaping (MessageId, Data) -> Void, openAppStorePage: @escaping () -> Void, requestMessageUpdate: @escaping (MessageId) -> Void, cancelInteractiveKeyboardGestures: @escaping () -> Void, automaticMediaDownloadSettings: AutomaticMediaDownloadSettings, pollActionState: ChatInterfacePollActionState) { + init(openMessage: @escaping (Message, ChatControllerInteractionOpenMessageMode) -> Bool, openPeer: @escaping (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void, openPeerMention: @escaping (String) -> Void, openMessageContextMenu: @escaping (Message, Bool, ASDisplayNode, CGRect) -> Void, navigateToMessage: @escaping (MessageId, MessageId) -> Void, clickThroughMessage: @escaping () -> Void, toggleMessagesSelection: @escaping ([MessageId], Bool) -> Void, sendMessage: @escaping (String) -> Void, sendSticker: @escaping (FileMediaReference, Bool) -> Void, sendGif: @escaping (FileMediaReference) -> Void, requestMessageActionCallback: @escaping (MessageId, MemoryBuffer?, Bool) -> Void, activateSwitchInline: @escaping (PeerId?, String) -> Void, openUrl: @escaping (String, Bool, Bool?) -> Void, shareCurrentLocation: @escaping () -> Void, shareAccountContact: @escaping () -> Void, sendBotCommand: @escaping (MessageId?, String) -> Void, openInstantPage: @escaping (Message) -> Void, openWallpaper: @escaping (Message) -> Void, openHashtag: @escaping (String?, String) -> Void, updateInputState: @escaping ((ChatTextInputState) -> ChatTextInputState) -> Void, updateInputMode: @escaping ((ChatInputMode) -> ChatInputMode) -> Void, openMessageShareMenu: @escaping (MessageId) -> Void, presentController: @escaping (ViewController, Any?) -> Void, navigationController: @escaping () -> NavigationController?, presentGlobalOverlayController: @escaping (ViewController, Any?) -> Void, callPeer: @escaping (PeerId) -> Void, longTap: @escaping (ChatControllerInteractionLongTapAction) -> Void, openCheckoutOrReceipt: @escaping (MessageId) -> Void, openSearch: @escaping () -> Void, setupReply: @escaping (MessageId) -> Void, canSetupReply: @escaping (Message) -> Bool, navigateToFirstDateMessage: @escaping(Int32) ->Void, requestRedeliveryOfFailedMessages: @escaping (MessageId) -> Void, addContact: @escaping (String) -> Void, rateCall: @escaping (Message, CallId) -> Void, requestSelectMessagePollOption: @escaping (MessageId, Data) -> Void, openAppStorePage: @escaping () -> Void, requestMessageUpdate: @escaping (MessageId) -> Void, cancelInteractiveKeyboardGestures: @escaping () -> Void, automaticMediaDownloadSettings: AutomaticMediaDownloadSettings, pollActionState: ChatInterfacePollActionState) { self.openMessage = openMessage self.openPeer = openPeer self.openPeerMention = openPeerMention @@ -113,6 +114,7 @@ public final class ChatControllerInteraction { self.shareAccountContact = shareAccountContact self.sendBotCommand = sendBotCommand self.openInstantPage = openInstantPage + self.openWallpaper = openWallpaper self.openHashtag = openHashtag self.updateInputState = updateInputState self.updateInputMode = updateInputMode diff --git a/TelegramUI/ChatControllerNode.swift b/TelegramUI/ChatControllerNode.swift index 6f0b358031..d965c793a6 100644 --- a/TelegramUI/ChatControllerNode.swift +++ b/TelegramUI/ChatControllerNode.swift @@ -240,7 +240,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { } } - self.backgroundNode.image = chatControllerBackgroundImage(wallpaper: chatPresentationInterfaceState.chatWallpaper, postbox: account.postbox) + self.backgroundNode.image = chatControllerBackgroundImage(wallpaper: chatPresentationInterfaceState.chatWallpaper, mode: chatPresentationInterfaceState.chatWallpaperMode, postbox: account.postbox) if case .perspective = chatPresentationInterfaceState.chatWallpaperMode { self.backgroundNode.parallaxEnabled = true } @@ -1317,7 +1317,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { let themeUpdated = self.chatPresentationInterfaceState.theme !== chatPresentationInterfaceState.theme if self.chatPresentationInterfaceState.chatWallpaper != chatPresentationInterfaceState.chatWallpaper { - self.backgroundNode.image = chatControllerBackgroundImage(wallpaper: chatPresentationInterfaceState.chatWallpaper, postbox: account.postbox) + self.backgroundNode.image = chatControllerBackgroundImage(wallpaper: chatPresentationInterfaceState.chatWallpaper, mode: chatPresentationInterfaceState.chatWallpaperMode, postbox: account.postbox) } if self.chatPresentationInterfaceState.chatWallpaperMode != chatPresentationInterfaceState.chatWallpaperMode { diff --git a/TelegramUI/ChatImageGalleryItem.swift b/TelegramUI/ChatImageGalleryItem.swift index 6465a03489..a3f2249f1a 100644 --- a/TelegramUI/ChatImageGalleryItem.swift +++ b/TelegramUI/ChatImageGalleryItem.swift @@ -174,7 +174,7 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode { super.init() - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } diff --git a/TelegramUI/ChatListController.swift b/TelegramUI/ChatListController.swift index b506aa15ed..a4620b8883 100644 --- a/TelegramUI/ChatListController.swift +++ b/TelegramUI/ChatListController.swift @@ -297,7 +297,7 @@ public class ChatListController: TelegramController, KeyShortcutResponder, UIVie self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData)) if self.isNodeLoaded { - self.chatListDisplayNode.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations) + self.chatListDisplayNode.updatePresentationData(self.presentationData) } } @@ -854,9 +854,10 @@ public class ChatListController: TelegramController, KeyShortcutResponder, UIVie } if let searchController = self.chatListDisplayNode.searchDisplayController { - if let (view, action) = searchController.previewViewAndActionAtLocation(location) { + if let (view, bounds, action) = searchController.previewViewAndActionAtLocation(location) { if let peerId = action as? PeerId, peerId.namespace != Namespaces.Peer.SecretChat { var sourceRect = view.superview!.convert(view.frame, to: sourceView) + sourceRect = CGRect(x: sourceRect.minX, y: sourceRect.minY + bounds.minY, width: bounds.width, height: bounds.height) sourceRect.size.height -= UIScreenPixel let chatController = ChatController(account: self.account, chatLocation: .peer(peerId), mode: .standard(previewing: true)) @@ -865,6 +866,7 @@ public class ChatListController: TelegramController, KeyShortcutResponder, UIVie 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) + sourceRect = CGRect(x: sourceRect.minX, y: sourceRect.minY + bounds.minY, width: bounds.width, height: bounds.height) sourceRect.size.height -= UIScreenPixel let chatController = ChatController(account: self.account, chatLocation: .peer(messageId.peerId), messageId: messageId, mode: .standard(previewing: true)) diff --git a/TelegramUI/ChatListControllerNode.swift b/TelegramUI/ChatListControllerNode.swift index 920c07e4a2..2e55991b2d 100644 --- a/TelegramUI/ChatListControllerNode.swift +++ b/TelegramUI/ChatListControllerNode.swift @@ -19,6 +19,7 @@ private final class ChatListControllerNodeView: UITracingLayerView, PreviewingHo class ChatListControllerNode: ASDisplayNode { private let account: Account private let groupId: PeerGroupId? + private var presentationData: PresentationData private var chatListEmptyNode: ChatListEmptyNode? let chatListNode: ChatListNode @@ -35,14 +36,12 @@ class ChatListControllerNode: ASDisplayNode { var requestOpenMessageFromSearch: ((Peer, MessageId) -> Void)? var requestAddContact: ((String) -> Void)? - var themeAndStrings: (PresentationTheme, PresentationStrings, dateTimeFormat: PresentationDateTimeFormat) - init(account: Account, groupId: PeerGroupId?, controlsHistoryPreload: Bool, presentationData: PresentationData, controller: ChatListController) { self.account = account self.groupId = groupId - self.chatListNode = ChatListNode(account: account, groupId: groupId, controlsHistoryPreload: controlsHistoryPreload, mode: .chatList, theme: presentationData.theme, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations) + self.presentationData = presentationData - self.themeAndStrings = (presentationData.theme, presentationData.strings, presentationData.dateTimeFormat) + self.chatListNode = ChatListNode(account: account, groupId: groupId, controlsHistoryPreload: controlsHistoryPreload, mode: .chatList, theme: presentationData.theme, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations) self.controller = controller @@ -61,7 +60,7 @@ class ChatListControllerNode: ASDisplayNode { } if isEmpty { if strongSelf.chatListEmptyNode == nil { - let chatListEmptyNode = ChatListEmptyNode(theme: strongSelf.themeAndStrings.0, strings: strongSelf.themeAndStrings.1) + let chatListEmptyNode = ChatListEmptyNode(theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings) strongSelf.chatListEmptyNode = chatListEmptyNode strongSelf.insertSubnode(chatListEmptyNode, belowSubnode: strongSelf.chatListNode) if let (layout, navigationHeight) = strongSelf.containerLayout { @@ -83,14 +82,14 @@ class ChatListControllerNode: ASDisplayNode { (self.view as? ChatListControllerNodeView)?.controller = self.controller } - func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool) { - self.themeAndStrings = (theme, strings, dateTimeFormat) + func updatePresentationData(_ presentationData: PresentationData) { + self.presentationData = presentationData - self.backgroundColor = theme.chatList.backgroundColor + self.backgroundColor = self.presentationData.theme.chatList.backgroundColor - self.chatListNode.updateThemeAndStrings(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, disableAnimations: disableAnimations) - self.searchDisplayController?.updateThemeAndStrings(theme: theme, strings: strings) - self.chatListEmptyNode?.updateThemeAndStrings(theme: theme, strings: strings) + self.chatListNode.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations) + self.searchDisplayController?.updatePresentationData(presentationData) + self.chatListEmptyNode?.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings) } func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { @@ -147,7 +146,7 @@ class ChatListControllerNode: ASDisplayNode { return } - self.searchDisplayController = SearchDisplayController(theme: self.themeAndStrings.0, strings: self.themeAndStrings.1, contentNode: ChatListSearchContainerNode(account: self.account, filter: [], groupId: self.groupId, openPeer: { [weak self] peer, dismissSearch in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ChatListSearchContainerNode(account: self.account, filter: [], groupId: self.groupId, openPeer: { [weak self] peer, dismissSearch in self?.requestOpenPeerFromSearch?(peer, dismissSearch) }, openRecentPeerOptions: { [weak self] peer in self?.requestOpenRecentPeerOptions?(peer) diff --git a/TelegramUI/ChatListNode.swift b/TelegramUI/ChatListNode.swift index ba08966237..4d63e42f44 100644 --- a/TelegramUI/ChatListNode.swift +++ b/TelegramUI/ChatListNode.swift @@ -134,10 +134,6 @@ struct ChatListNodeState: Equatable { private func mappedInsertEntries(account: Account, nodeInteraction: ChatListNodeInteraction, peerGroupId: PeerGroupId?, mode: ChatListNodeMode, entries: [ChatListNodeViewTransitionInsertEntry]) -> [ListViewInsertItem] { return entries.map { entry -> ListViewInsertItem in switch entry.entry { - case let .SearchEntry(theme, text, isEnabled): - return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListSearchItem(theme: theme, isEnabled: isEnabled, placeholder: text, activate: { - nodeInteraction.activateSearch() - }), directionHint: entry.directionHint) case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd): switch mode { case .chatList: @@ -217,10 +213,6 @@ private func mappedInsertEntries(account: Account, nodeInteraction: ChatListNode private func mappedUpdateEntries(account: Account, nodeInteraction: ChatListNodeInteraction, peerGroupId: PeerGroupId?, mode: ChatListNodeMode, entries: [ChatListNodeViewTransitionUpdateEntry]) -> [ListViewUpdateItem] { return entries.map { entry -> ListViewUpdateItem in switch entry.entry { - case let .SearchEntry(theme, text, isEnabled): - return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatListSearchItem(theme: theme, isEnabled: isEnabled, placeholder: text, activate: { - nodeInteraction.activateSearch() - }), directionHint: entry.directionHint) case let .PeerEntry(index, presentationData, message, combinedReadState, notificationSettings, embeddedState, peer, summaryInfo, editing, hasActiveRevealControls, selected, inputActivities, isAd): switch mode { case .chatList: @@ -808,8 +800,6 @@ final class ChatListNode: ListView { } case let .GroupReferenceEntry(_, _, groupId, _, _, _, _): referenceId = .group(groupId) - case .SearchEntry: - beforeAll = true default: break } @@ -1000,14 +990,11 @@ final class ChatListNode: ListView { strongSelf.didSetReady = true strongSelf._ready.set(true) } - - var isEmpty = false - if transition.chatListView.filteredEntries.isEmpty { - isEmpty = true - } + + let isEmpty = transition.chatListView.filteredEntries.isEmpty if strongSelf.wasEmpty != isEmpty { strongSelf.wasEmpty = isEmpty - strongSelf.isEmptyUpdated?(isEmpty) + strongSelf.isEmptyUpdated?(isEmpty) } completion() diff --git a/TelegramUI/ChatListNodeEntries.swift b/TelegramUI/ChatListNodeEntries.swift index be81e83c5d..0ec1563650 100644 --- a/TelegramUI/ChatListNodeEntries.swift +++ b/TelegramUI/ChatListNodeEntries.swift @@ -3,15 +3,12 @@ import Postbox import TelegramCore enum ChatListNodeEntryId: Hashable { - case Search case Hole(Int64) case PeerId(Int64) case GroupId(PeerGroupId) var hashValue: Int { switch self { - case .Search: - return 0 case let .Hole(peerId): return peerId.hashValue case let .PeerId(peerId): @@ -23,12 +20,6 @@ enum ChatListNodeEntryId: Hashable { static func ==(lhs: ChatListNodeEntryId, rhs: ChatListNodeEntryId) -> Bool { switch lhs { - case .Search: - if case .Search = rhs { - return true - } else { - return false - } case let .Hole(id): if case .Hole(id) = rhs { return true @@ -52,15 +43,12 @@ enum ChatListNodeEntryId: Hashable { } enum ChatListNodeEntry: Comparable, Identifiable { - case SearchEntry(theme: PresentationTheme, text: String, isEnabled: Bool) case PeerEntry(index: ChatListIndex, presentationData: ChatListPresentationData, message: Message?, readState: CombinedPeerReadState?, notificationSettings: PeerNotificationSettings?, embeddedInterfaceState: PeerChatListEmbeddedInterfaceState?, peer: RenderedPeer, summaryInfo: ChatListMessageTagSummaryInfo, editing: Bool, hasActiveRevealControls: Bool, selected: Bool, inputActivities: [(Peer, PeerInputActivity)]?, isAd: Bool) case HoleEntry(ChatListHole, theme: PresentationTheme) case GroupReferenceEntry(index: ChatListIndex, presentationData: ChatListPresentationData, groupId: PeerGroupId, message: Message?, topPeers: [Peer], counters: GroupReferenceUnreadCounters, editing: Bool) var index: ChatListIndex { switch self { - case .SearchEntry: - return ChatListIndex.absoluteUpperBound case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _): return index case let .HoleEntry(hole, _): @@ -72,8 +60,6 @@ enum ChatListNodeEntry: Comparable, Identifiable { var stableId: ChatListNodeEntryId { switch self { - case .SearchEntry: - return .Search case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _): return .PeerId(index.messageIndex.id.peerId.toInt64()) case let .HoleEntry(hole, _): @@ -89,12 +75,6 @@ enum ChatListNodeEntry: Comparable, Identifiable { static func ==(lhs: ChatListNodeEntry, rhs: ChatListNodeEntry) -> Bool { switch lhs { - case let .SearchEntry(lhsTheme, lhsText, lhsEnabled): - if case let .SearchEntry(rhsTheme, rhsText, rhsEnabled) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsEnabled == rhsEnabled { - return true - } else { - return false - } case let .PeerEntry(lhsIndex, lhsPresentationData, lhsMessage, lhsUnreadCount, lhsNotificationSettings, lhsEmbeddedState, lhsPeer, lhsSummaryInfo, lhsEditing, lhsHasRevealControls, lhsSelected, lhsInputActivities, lhsAd): switch rhs { case let .PeerEntry(rhsIndex, rhsPresentationData, rhsMessage, rhsUnreadCount, rhsNotificationSettings, rhsEmbeddedState, rhsPeer, rhsSummaryInfo, rhsEditing, rhsHasRevealControls, rhsSelected, rhsInputActivities, rhsAd): @@ -268,6 +248,9 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState, } } } + +// if result.count == 1, case .HoleEntry = result[0] { + if result.count >= 1, case .HoleEntry = result[result.count - 1] { return [] } else if result.count == 1, case .HoleEntry = result[0] { diff --git a/TelegramUI/ChatListRecentPeersListItem.swift b/TelegramUI/ChatListRecentPeersListItem.swift index 046dcd117b..6f5095589d 100644 --- a/TelegramUI/ChatListRecentPeersListItem.swift +++ b/TelegramUI/ChatListRecentPeersListItem.swift @@ -55,8 +55,6 @@ class ChatListRecentPeersListItem: ListViewItem { } } -private let separatorHeight = 1.0 / UIScreen.main.scale - class ChatListRecentPeersListItemNode: ListViewItemNode { private let backgroundNode: ASDisplayNode private let separatorNode: ASDisplayNode @@ -124,11 +122,10 @@ class ChatListRecentPeersListItemNode: ListViewItemNode { strongSelf.addSubnode(peersNode) } - let separatorHeight = UIScreenPixel - peersNode.frame = CGRect(origin: CGPoint(), size: nodeLayout.contentSize) peersNode.updateLayout(size: nodeLayout.contentSize, leftInset: params.leftInset, rightInset: params.rightInset) + let separatorHeight = UIScreenPixel strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: nodeLayout.contentSize.width, height: nodeLayout.contentSize.height)) strongSelf.separatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: nodeLayout.contentSize.height - separatorHeight), size: CGSize(width: nodeLayout.size.width, height: separatorHeight)) strongSelf.separatorNode.isHidden = true diff --git a/TelegramUI/ChatListSearchContainerNode.swift b/TelegramUI/ChatListSearchContainerNode.swift index 62b35a41f6..3eb0020766 100644 --- a/TelegramUI/ChatListSearchContainerNode.swift +++ b/TelegramUI/ChatListSearchContainerNode.swift @@ -1006,7 +1006,8 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode { } private func updateTheme(theme: PresentationTheme) { - self.backgroundColor = theme.chatList.backgroundColor + self.backgroundColor = self.filter.contains(.excludeRecent) ? nil : theme.chatList.backgroundColor + self.dimNode.backgroundColor = self.filter.contains(.excludeRecent) ? UIColor.black.withAlphaComponent(0.5) : theme.chatList.backgroundColor self.recentListNode.verticalScrollIndicatorColor = theme.list.scrollIndicatorColor self.listNode.verticalScrollIndicatorColor = theme.list.scrollIndicatorColor } @@ -1054,7 +1055,7 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode { } private func enqueueTransition(_ transition: ChatListSearchContainerTransition, firstTime: Bool) { - enqueuedTransitions.append((transition, firstTime)) + self.enqueuedTransitions.append((transition, firstTime)) if self.validLayout != nil { while !self.enqueuedTransitions.isEmpty { @@ -1136,8 +1137,9 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode { } } - override func previewViewAndActionAtLocation(_ location: CGPoint) -> (UIView, Any)? { + override func previewViewAndActionAtLocation(_ location: CGPoint) -> (UIView, CGRect, Any)? { var selectedItemNode: ASDisplayNode? + var bounds: CGRect if !self.recentListNode.isHidden { let adjustedLocation = self.convert(location, to: self.recentListNode) self.recentListNode.forEachItemNode { itemNode in @@ -1155,16 +1157,26 @@ final class ChatListSearchContainerNode: SearchDisplayControllerContentNode { } if let selectedItemNode = selectedItemNode as? ChatListRecentPeersListItemNode { if let result = selectedItemNode.viewAndPeerAtPoint(self.convert(location, to: selectedItemNode)) { - return (result.0, result.1) + return (result.0, result.0.bounds, result.1) } } else if let selectedItemNode = selectedItemNode as? ContactsPeerItemNode, let peer = selectedItemNode.chatPeer { - return (selectedItemNode.view, peer.id) + if selectedItemNode.frame.height > 50.0 { + bounds = CGRect(x: 0.0, y: selectedItemNode.frame.height - 50.0, width: selectedItemNode.frame.width, height: 50.0) + } else { + bounds = selectedItemNode.bounds + } + return (selectedItemNode.view, bounds, peer.id) } else if let selectedItemNode = selectedItemNode as? ChatListItemNode, let item = selectedItemNode.item { + if selectedItemNode.frame.height > 76.0 { + bounds = CGRect(x: 0.0, y: selectedItemNode.frame.height - 76.0, width: selectedItemNode.frame.width, height: 76.0) + } else { + bounds = selectedItemNode.bounds + } switch item.content { case let .peer(message, peer, _, _, _, _, _, _, _): - return (selectedItemNode.view, message?.id ?? peer.peerId) + return (selectedItemNode.view, bounds, message?.id ?? peer.peerId) case let .groupReference(groupId, _, _, _): - return (selectedItemNode.view, groupId) + return (selectedItemNode.view, bounds, groupId) } } return nil diff --git a/TelegramUI/ChatListSearchItem.swift b/TelegramUI/ChatListSearchItem.swift index b48b31090e..64e2988b41 100644 --- a/TelegramUI/ChatListSearchItem.swift +++ b/TelegramUI/ChatListSearchItem.swift @@ -111,7 +111,7 @@ class ChatListSearchItemNode: ListViewItemNode { let backgroundColor = nextIsPinned ? item.theme.chatList.pinnedItemBackgroundColor : item.theme.chatList.itemBackgroundColor let placeholderColor = item.theme.rootController.activeNavigationSearchBar.inputPlaceholderTextColor - 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) + 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) let layout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: 54.0), insets: UIEdgeInsets()) diff --git a/TelegramUI/ChatListSearchRecentPeersNode.swift b/TelegramUI/ChatListSearchRecentPeersNode.swift index 38abcbac1c..48940dca85 100644 --- a/TelegramUI/ChatListSearchRecentPeersNode.swift +++ b/TelegramUI/ChatListSearchRecentPeersNode.swift @@ -48,6 +48,8 @@ private struct ChatListSearchRecentPeersEntry: Comparable, Identifiable { let peer: Peer let presence: PeerPresence? let unreadBadge: UnreadSearchBadge? + let theme: PresentationTheme + let strings: PresentationStrings let itemCustomWidth: CGFloat? var stableId: PeerId { return self.peer.id @@ -73,6 +75,12 @@ private struct ChatListSearchRecentPeersEntry: Comparable, Identifiable { if lhs.unreadBadge != rhs.unreadBadge { return false } + if lhs.theme !== rhs.theme { + return false + } + if lhs.strings !== rhs.strings { + return false + } return true } @@ -80,10 +88,10 @@ private struct ChatListSearchRecentPeersEntry: Comparable, Identifiable { return lhs.index < rhs.index } - func item(account: Account, theme: PresentationTheme, strings: PresentationStrings, mode: HorizontalPeerItemMode, peerSelected: @escaping (Peer) -> Void, peerLongTapped: @escaping (Peer) -> Void, isPeerSelected: @escaping (PeerId) -> Bool) -> ListViewItem { - return HorizontalPeerItem(theme: theme, strings: strings, mode: mode, account: account, peer: self.peer, presence: self.presence, unreadBadge: self.unreadBadge, action: peerSelected, longTapAction: { peer in + func item(account: Account, mode: HorizontalPeerItemMode, peerSelected: @escaping (Peer) -> Void, peerLongTapped: @escaping (Peer) -> Void, isPeerSelected: @escaping (PeerId) -> Bool) -> ListViewItem { + return HorizontalPeerItem(theme: self.theme, strings: self.strings, mode: mode, account: account, peer: self.peer, presence: self.presence, unreadBadge: self.unreadBadge, action: peerSelected, longTapAction: { peer in peerLongTapped(peer) - }, isPeerSelected: isPeerSelected, customWidth: itemCustomWidth) + }, isPeerSelected: isPeerSelected, customWidth: self.itemCustomWidth) } } @@ -95,14 +103,14 @@ private struct ChatListSearchRecentNodeTransition { let animated: Bool } -private func preparedRecentPeersTransition(account: Account, theme: PresentationTheme, strings: PresentationStrings, mode: HorizontalPeerItemMode, peerSelected: @escaping (Peer) -> Void, peerLongTapped: @escaping (Peer) -> Void, isPeerSelected: @escaping (PeerId) -> Bool, share: Bool = false, from fromEntries: [ChatListSearchRecentPeersEntry], to toEntries: [ChatListSearchRecentPeersEntry], firstTime: Bool, animated: Bool) -> ChatListSearchRecentNodeTransition { +private func preparedRecentPeersTransition(account: Account, mode: HorizontalPeerItemMode, peerSelected: @escaping (Peer) -> Void, peerLongTapped: @escaping (Peer) -> Void, isPeerSelected: @escaping (PeerId) -> Bool, share: Bool = false, from fromEntries: [ChatListSearchRecentPeersEntry], to toEntries: [ChatListSearchRecentPeersEntry], firstTime: Bool, animated: Bool) -> ChatListSearchRecentNodeTransition { let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } - let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, theme: theme, strings: strings, mode: mode, peerSelected: peerSelected, peerLongTapped: { peer in + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, mode: mode, peerSelected: peerSelected, peerLongTapped: { peer in peerLongTapped(peer) }, isPeerSelected: isPeerSelected), directionHint: .Down) } - let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, theme: theme, strings: strings, mode: mode, peerSelected: peerSelected, peerLongTapped: { peer in + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, mode: mode, peerSelected: peerSelected, peerLongTapped: { peer in peerLongTapped(peer) }, isPeerSelected: isPeerSelected), directionHint: nil) } @@ -112,6 +120,7 @@ private func preparedRecentPeersTransition(account: Account, theme: Presentation final class ChatListSearchRecentPeersNode: ASDisplayNode { private var theme: PresentationTheme private var strings: PresentationStrings + private let themeAndStringsPromise: Promise<(PresentationTheme, PresentationStrings)> private let mode: HorizontalPeerItemMode private let sectionHeaderNode: ListSectionHeaderNode private let listView: ListView @@ -129,6 +138,7 @@ final class ChatListSearchRecentPeersNode: ASDisplayNode { init(account: Account, theme: PresentationTheme, mode: HorizontalPeerItemMode, strings: PresentationStrings, peerSelected: @escaping (Peer) -> Void, peerLongTapped: @escaping (Peer) -> Void, isPeerSelected: @escaping (PeerId) -> Bool, share: Bool = false) { self.theme = theme self.strings = strings + self.themeAndStringsPromise = Promise((self.theme, self.strings)) self.mode = mode self.share = share self.peerSelected = peerSelected @@ -198,16 +208,16 @@ final class ChatListSearchRecentPeersNode: ASDisplayNode { let previous: Atomic<[ChatListSearchRecentPeersEntry]> = Atomic(value: []) let firstTime:Atomic = Atomic(value: true) - peersDisposable.add((combineLatest(recent, self.itemCustomWidthValuePromise.get()) |> deliverOnMainQueue).start(next: { [weak self] peers, itemCustomWidth in + peersDisposable.add((combineLatest(recent, self.itemCustomWidthValuePromise.get(), self.themeAndStringsPromise.get()) |> deliverOnMainQueue).start(next: { [weak self] peers, itemCustomWidth, themeAndStrings in if let strongSelf = self { var entries: [ChatListSearchRecentPeersEntry] = [] for peer in peers.0 { - entries.append(ChatListSearchRecentPeersEntry(index: entries.count, peer: peer, presence: peers.2[peer.id], unreadBadge: peers.1[peer.id], itemCustomWidth: itemCustomWidth)) + entries.append(ChatListSearchRecentPeersEntry(index: entries.count, peer: peer, presence: peers.2[peer.id], unreadBadge: peers.1[peer.id], theme: themeAndStrings.0, strings: themeAndStrings.1, itemCustomWidth: itemCustomWidth)) } let animated = !firstTime.swap(false) - let transition = preparedRecentPeersTransition(account: account, theme: strongSelf.theme, strings: strongSelf.strings, mode: mode, peerSelected: peerSelected, peerLongTapped: peerLongTapped, isPeerSelected: isPeerSelected, from: previous.swap(entries), to: entries, firstTime: !animated, animated: animated) + let transition = preparedRecentPeersTransition(account: account, mode: mode, peerSelected: peerSelected, peerLongTapped: peerLongTapped, isPeerSelected: isPeerSelected, from: previous.swap(entries), to: entries, firstTime: !animated, animated: animated) strongSelf.enqueueTransition(transition) } @@ -246,6 +256,7 @@ final class ChatListSearchRecentPeersNode: ASDisplayNode { if self.theme !== theme || self.strings !== strings { self.theme = theme self.strings = strings + self.themeAndStringsPromise.set(.single((self.theme, self.strings))) self.sectionHeaderNode.title = strings.DialogList_RecentTitlePeople.uppercased() self.sectionHeaderNode.updateTheme(theme: theme) diff --git a/TelegramUI/ChatMessageAttachedContentNode.swift b/TelegramUI/ChatMessageAttachedContentNode.swift index 3af88aaf8e..b65a87a027 100644 --- a/TelegramUI/ChatMessageAttachedContentNode.swift +++ b/TelegramUI/ChatMessageAttachedContentNode.swift @@ -350,7 +350,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { } let updatedSubtitle = NSMutableAttributedString() updatedSubtitle.append(subtitle) - updatedSubtitle.addAttribute(.foregroundColor, value: incoming ? bubbleTheme.incomingPrimaryTextColor : bubbleTheme.outgoingPrimaryTextColor, range: NSMakeRange(0, subtitle.string.count)) + updatedSubtitle.addAttribute(.foregroundColor, value: incoming ? bubbleTheme.incomingPrimaryTextColor : bubbleTheme.outgoingPrimaryTextColor, range: NSMakeRange(0, subtitle.length)) string.append(updatedSubtitle) notEmpty = true } diff --git a/TelegramUI/ChatMessageBubbleContentNode.swift b/TelegramUI/ChatMessageBubbleContentNode.swift index 7a74e454b9..d221333897 100644 --- a/TelegramUI/ChatMessageBubbleContentNode.swift +++ b/TelegramUI/ChatMessageBubbleContentNode.swift @@ -70,6 +70,7 @@ enum ChatMessageBubbleContentTapAction { case botCommand(String) case hashtag(String?, String) case instantPage + case wallpaper case call(PeerId) case openMessage case ignore diff --git a/TelegramUI/ChatMessageBubbleItemNode.swift b/TelegramUI/ChatMessageBubbleItemNode.swift index a0c195587a..1a7da18ff6 100644 --- a/TelegramUI/ChatMessageBubbleItemNode.swift +++ b/TelegramUI/ChatMessageBubbleItemNode.swift @@ -236,7 +236,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView { break case .ignore: return .fail - case .url, .peerMention, .textMention, .botCommand, .hashtag, .instantPage, .call, .openMessage: + case .url, .peerMention, .textMention, .botCommand, .hashtag, .instantPage, .wallpaper, .call, .openMessage: return .waitForSingleTap } } @@ -1623,6 +1623,12 @@ class ChatMessageBubbleItemNode: ChatMessageItemView { item.controllerInteraction.openInstantPage(item.message) } break loop + case .wallpaper: + foundTapAction = true + if let item = self.item { + item.controllerInteraction.openWallpaper(item.message) + } + break loop case let .call(peerId): foundTapAction = true self.item?.controllerInteraction.callPeer(peerId) @@ -1676,6 +1682,8 @@ class ChatMessageBubbleItemNode: ChatMessageItemView { break loop case .instantPage: break + case .wallpaper: + break case .call: break case .openMessage: diff --git a/TelegramUI/ChatMessageInteractiveMediaNode.swift b/TelegramUI/ChatMessageInteractiveMediaNode.swift index b666c5e0ea..f8433e14c4 100644 --- a/TelegramUI/ChatMessageInteractiveMediaNode.swift +++ b/TelegramUI/ChatMessageInteractiveMediaNode.swift @@ -837,14 +837,47 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode { } func updateIsHidden(_ isHidden: Bool) { - guard let badgeNode = self.badgeNode, badgeNode.isHidden != isHidden else { - return + if let badgeNode = self.badgeNode, badgeNode.isHidden != isHidden { + if isHidden { + badgeNode.isHidden = true + } else { + badgeNode.isHidden = false + badgeNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } } - if isHidden { - badgeNode.isHidden = true - } else { - badgeNode.isHidden = false - badgeNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + + if let statusNode = self.statusNode, statusNode.isHidden != isHidden { + if isHidden { + statusNode.isHidden = true + } else { + statusNode.isHidden = false + statusNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } } } + + func transitionNode() -> (ASDisplayNode, () -> UIView?)? { + return (self, { [weak self] in + var badgeNodeHidden: Bool? + if let badgeNode = self?.badgeNode { + badgeNodeHidden = badgeNode.isHidden + badgeNode.isHidden = true + } + var statusNodeHidden: Bool? + if let statusNode = self?.statusNode { + statusNodeHidden = statusNode.isHidden + statusNode.isHidden = true + } + + let view = self?.view.snapshotContentTree(unhide: true) + + if let badgeNode = self?.badgeNode, let badgeNodeHidden = badgeNodeHidden { + badgeNode.isHidden = badgeNodeHidden + } + if let statusNode = self?.statusNode, let statusNodeHidden = statusNodeHidden { + statusNode.isHidden = statusNodeHidden + } + return view + }) + } } diff --git a/TelegramUI/ChatMessageMediaBubbleContentNode.swift b/TelegramUI/ChatMessageMediaBubbleContentNode.swift index 95144c6ac8..c4cf5f0d1b 100644 --- a/TelegramUI/ChatMessageMediaBubbleContentNode.swift +++ b/TelegramUI/ChatMessageMediaBubbleContentNode.swift @@ -237,10 +237,7 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { override func transitionNode(messageId: MessageId, media: Media) -> (ASDisplayNode, () -> UIView?)? { if self.item?.message.id == messageId, let currentMedia = self.media, currentMedia.isSemanticallyEqual(to: media) { - let interactiveImageNode = self.interactiveImageNode - return (self.interactiveImageNode, { [weak interactiveImageNode] in - return interactiveImageNode?.view.snapshotContentTree(unhide: true) - }) + return self.interactiveImageNode.transitionNode() } return nil } diff --git a/TelegramUI/ChatMessageWebpageBubbleContentNode.swift b/TelegramUI/ChatMessageWebpageBubbleContentNode.swift index 53beb2bde9..c5854249d3 100644 --- a/TelegramUI/ChatMessageWebpageBubbleContentNode.swift +++ b/TelegramUI/ChatMessageWebpageBubbleContentNode.swift @@ -120,19 +120,24 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { self.addSubnode(self.contentNode) self.contentNode.openMedia = { [weak self] stream in if let strongSelf = self, let item = strongSelf.item { - if let webPage = strongSelf.webPage, case let .Loaded(content) = webPage.content, let image = content.image, let instantPage = content.instantPage { - var isGallery = false - switch instantPageType(of: content) { - case .album: - let count = instantPageGalleryMedia(webpageId: webPage.webpageId, page: instantPage, galleryMedia: image).count - if count > 1 { - isGallery = true - } - default: - break - } - if !isGallery { - item.controllerInteraction.openInstantPage(item.message) + if let webPage = strongSelf.webPage, case let .Loaded(content) = webPage.content { + if let image = content.image, let instantPage = content.instantPage { + var isGallery = false + switch instantPageType(of: content) { + case .album: + let count = instantPageGalleryMedia(webpageId: webPage.webpageId, page: instantPage, galleryMedia: image).count + if count > 1 { + isGallery = true + } + default: + break + } + if !isGallery { + item.controllerInteraction.openInstantPage(item.message) + return + } + } else if content.type == "telegram_background" { + item.controllerInteraction.openWallpaper(item.message) return } } @@ -222,6 +227,13 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { if let file = mainMedia as? TelegramMediaFile { if let embedUrl = webpage.embedUrl, !embedUrl.isEmpty { mediaAndFlags = (webpage.image ?? file, [.preferMediaBeforeText]) + } else if webpage.type == "telegram_background" { + var representations: [TelegramMediaImageRepresentation] = file.previewRepresentations + if let dimensions = file.dimensions { + representations.append(TelegramMediaImageRepresentation(dimensions: dimensions, resource: file.resource)) + } + let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: representations, immediateThumbnailData: file.immediateThumbnailData, reference: nil, partialReference: nil) + mediaAndFlags = (tmpImage, []) } else { mediaAndFlags = (file, []) } @@ -261,6 +273,9 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { actionTitle = item.presentationData.strings.Conversation_ViewGroup case "telegram_message": actionTitle = item.presentationData.strings.Conversation_ViewMessage + case "telegram_background": + title = item.presentationData.strings.Conversation_ChatBackground + actionTitle = item.presentationData.strings.Conversation_ViewBackground default: break } @@ -349,12 +364,16 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { return result } - if let webPage = self.webPage, case let .Loaded(content) = webPage.content, content.instantPage != nil { - switch websiteType(of: content) { - case .instagram, .twitter: - return .none - default: - return .instantPage + if let webPage = self.webPage, case let .Loaded(content) = webPage.content { + if content.instantPage != nil { + switch websiteType(of: content) { + case .instagram, .twitter: + return .none + default: + return .instantPage + } + } else if content.type == "telegram_background" { + return .wallpaper } } if self.contentNode.hasActionAtPoint(point.offsetBy(dx: -contentNodeFrame.minX, dy: -contentNodeFrame.minY)) { diff --git a/TelegramUI/ChatRecentActionsControllerNode.swift b/TelegramUI/ChatRecentActionsControllerNode.swift index 64751da7fc..43213a4b79 100644 --- a/TelegramUI/ChatRecentActionsControllerNode.swift +++ b/TelegramUI/ChatRecentActionsControllerNode.swift @@ -180,10 +180,16 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { self?.openMessageContextMenu(message: message, selectAll: selectAll, node: node, frame: frame) }, navigateToMessage: { _, _ in }, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendMessage: { _ in }, sendSticker: { _, _ in }, sendGif: { _ in }, requestMessageActionCallback: { _, _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { [weak self] url, _, _ in self?.openUrl(url) - }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { [weak self] message in - if let strongSelf = self, let navigationController = strongSelf.getNavigationController() { - openChatInstantPage(account: strongSelf.account, message: message, navigationController: navigationController) - } + }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { [weak self] message in + if let strongSelf = self, let navigationController = strongSelf.getNavigationController() { + openChatInstantPage(account: strongSelf.account, message: message, navigationController: navigationController) + } + }, openWallpaper: { [weak self] message in + if let strongSelf = self{ + openChatWallpaper(account: strongSelf.account, message: message, present: { [weak self] c, a in + self?.presentController(c, a) + }) + } }, openHashtag: { [weak self] peerName, hashtag in guard let strongSelf = self else { return diff --git a/TelegramUI/ChatTextInputPanelNode.swift b/TelegramUI/ChatTextInputPanelNode.swift index 56df3d885e..ba07f35050 100644 --- a/TelegramUI/ChatTextInputPanelNode.swift +++ b/TelegramUI/ChatTextInputPanelNode.swift @@ -127,7 +127,7 @@ private final class AccessoryItemIconButton: HighlightTrackingButton { func updateLayout(size: CGSize) { if let image = self.imageNode.image { - self.imageNode.frame = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.width - image.size.width) / 2.0) - self.imageEdgeInsets.bottom), size: image.size) + self.imageNode.frame = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.height - image.size.height) / 2.0) - self.imageEdgeInsets.bottom), size: image.size) } } diff --git a/TelegramUI/ComposeController.swift b/TelegramUI/ComposeController.swift index 4ec26745d2..b7a063d0a9 100644 --- a/TelegramUI/ComposeController.swift +++ b/TelegramUI/ComposeController.swift @@ -41,6 +41,9 @@ public class ComposeController: ViewController { self.scrollToTop = { [weak self] in if let strongSelf = self { + if let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateExpansionProgress(1.0, animated: true) + } strongSelf.contactsNode.contactListNode.scrollToTop() } } diff --git a/TelegramUI/ComposeControllerNode.swift b/TelegramUI/ComposeControllerNode.swift index 4fb24da17b..636392d247 100644 --- a/TelegramUI/ComposeControllerNode.swift +++ b/TelegramUI/ComposeControllerNode.swift @@ -85,8 +85,7 @@ final class ComposeControllerNode: ASDisplayNode { private func updateThemeAndStrings() { self.backgroundColor = self.presentationData.theme.chatList.backgroundColor - - self.searchDisplayController?.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings) + self.searchDisplayController?.updatePresentationData(presentationData) } func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, actualNavigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { @@ -112,7 +111,7 @@ final class ComposeControllerNode: ASDisplayNode { return } - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: false, categories: [.cloudContacts, .global], openPeer: { [weak self] peer in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: false, categories: [.cloudContacts, .global], openPeer: { [weak self] peer in if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch, case let .peer(peer, _) = peer { requestOpenPeerFromSearch(peer.id) } diff --git a/TelegramUI/ContactListNode.swift b/TelegramUI/ContactListNode.swift index 6fa1abbd5c..10a44bae43 100644 --- a/TelegramUI/ContactListNode.swift +++ b/TelegramUI/ContactListNode.swift @@ -488,7 +488,7 @@ private func contactListNodeEntries(accountPeer: Peer?, peers: [ContactListPeer] entries.append(.option(i, options[i], commonHeader, theme, strings)) } case let .natural(options): - orderedPeers = peers.sorted(by: { lhs, rhs in + let sortedPeers = peers.sorted(by: { lhs, rhs in let result = lhs.indexName.isLessThan(other: rhs.indexName, ordering: sortOrder) if result == .orderedSame { if case let .peer(lhsPeer, _) = lhs, case let .peer(rhsPeer, _) = rhs { @@ -505,7 +505,11 @@ private func contactListNodeEntries(accountPeer: Peer?, peers: [ContactListPeer] } }) var headerCache: [unichar: ContactListNameIndexHeader] = [:] - for peer in orderedPeers { + var startsWithLetter: [ContactListPeer] = [] + var startsWithOther: [ContactListPeer] = [] + let hashHeader = "#".utf16.first! + + for peer in sortedPeers { var indexHeader: unichar = 35 switch peer.indexName { case let .title(title, _): @@ -528,10 +532,16 @@ private func contactListNodeEntries(accountPeer: Peer?, peers: [ContactListPeer] } } } - if let scalar = UnicodeScalar(indexHeader), !NSCharacterSet.uppercaseLetters.contains(scalar) { - if let c = "#".utf16.first { - indexHeader = c + if let scalar = UnicodeScalar(indexHeader) { + if !NSCharacterSet.uppercaseLetters.contains(scalar) { + indexHeader = hashHeader + startsWithOther.append(peer) + } else { + startsWithLetter.append(peer) } + } else { + indexHeader = hashHeader + startsWithOther.append(peer) } let header: ContactListNameIndexHeader if let cached = headerCache[indexHeader] { @@ -545,6 +555,7 @@ private func contactListNodeEntries(accountPeer: Peer?, peers: [ContactListPeer] for i in 0 ..< options.count { entries.append(.option(i, options[i], nil, theme, strings)) } + orderedPeers = startsWithLetter + startsWithOther case .search: orderedPeers = peers } @@ -634,7 +645,7 @@ private func preparedContactListNodeTransition(account: Account, from fromEntrie var scrollToItem: ListViewScrollToItem? if firstTime && shouldFixScroll && toEntries.count >= 1 { - scrollToItem = ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight - 50.0), animated: false, curve: .Default(duration: 0.0), directionHint: .Up) + scrollToItem = ListViewScrollToItem(index: 0, position: .top(-50.0), animated: false, curve: .Default(duration: 0.0), directionHint: .Up) } return ContactsListNodeTransition(deletions: deletions, insertions: insertions, updates: updates, indexSections: indexSections, firstTime: firstTime, isEmpty: isEmpty, scrollToItem: scrollToItem, animation: animation) @@ -825,7 +836,7 @@ final class ContactListNode: ASDisplayNode { super.init() self.backgroundColor = self.presentationData.theme.chatList.backgroundColor - //self.listNode.verticalScrollIndicatorColor = self.presentationData.theme.list.scrollIndicatorColor + self.listNode.verticalScrollIndicatorColor = self.presentationData.theme.list.scrollIndicatorColor self.selectionStateValue = selectionState self.selectionStatePromise.set(.single(selectionState)) @@ -850,16 +861,28 @@ final class ContactListNode: ASDisplayNode { }) self.indexNode.indexSelected = { [weak self] section in - guard let strongSelf = self, let entries = previousEntries.with({ $0 }) else { + guard let strongSelf = self, let layout = strongSelf.validLayout, let entries = previousEntries.with({ $0 }) else { return } + + var insets = layout.0.insets(options: [.input]) + insets.left += layout.0.safeInsets.left + insets.right += layout.0.safeInsets.right + + var headerInsets = layout.1 + if headerInsets.top == insets.top { + headerInsets.top -= navigationBarSearchContentHeight + } + + let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: layout.0.size, insets: insets, headerInsets: headerInsets, duration: 0.0, curve: .Default(duration: nil)) + var index = 0 var peerIndex = 0 loop: for entry in entries { switch entry { case .search: if section == CollectionIndexNode.searchIndex { - strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.PreferSynchronousDrawing, .PreferSynchronousResourceLoading], scrollToItem: ListViewScrollToItem(index: index, position: .top(0.0), animated: false, curve: .Default(duration: nil), directionHint: .Down), additionalScrollDistance: 0.0, updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.PreferSynchronousDrawing, .PreferSynchronousResourceLoading], scrollToItem: ListViewScrollToItem(index: index, position: .top(-navigationBarSearchContentHeight), animated: false, curve: .Default(duration: nil), directionHint: .Down), additionalScrollDistance: 0.0, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) break loop } case let .peer(_, _, _, header, _, _, _, _, _, _, _): @@ -867,7 +890,7 @@ final class ContactListNode: ASDisplayNode { if let scalar = UnicodeScalar(header.letter) { let title = "\(Character(scalar))" if title == section { - strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.PreferSynchronousDrawing, .PreferSynchronousResourceLoading], scrollToItem: ListViewScrollToItem(index: peerIndex == 0 ? 0 : index, position: .top(0.0), animated: false, curve: .Default(duration: nil), directionHint: .Down), additionalScrollDistance: 0.0, updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.PreferSynchronousDrawing, .PreferSynchronousResourceLoading], scrollToItem: ListViewScrollToItem(index: peerIndex == 0 ? 0 : index, position: .top(peerIndex == 0 ? 0.0 : -navigationBarSearchContentHeight), animated: false, curve: .Default(duration: nil), directionHint: .Down), additionalScrollDistance: 0.0, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) break loop } } @@ -1141,13 +1164,6 @@ final class ContactListNode: ASDisplayNode { self.listNode.visibleContentOffsetChanged = { [weak self] offset in if let strongSelf = self { - let atTop: Bool - switch offset { - case .none, .unknown: - atTop = false - case let .known(value): - atTop = value <= 0.0 - } strongSelf.contentOffsetChanged?(offset) } } @@ -1194,6 +1210,11 @@ final class ContactListNode: ASDisplayNode { insets.left += layout.safeInsets.left insets.right += layout.safeInsets.right + var headerInsets = headerInsets + if !hadValidLayout { + headerInsets.top -= navigationBarSearchContentHeight + } + self.listNode.bounds = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height) self.listNode.position = CGPoint(x: layout.size.width / 2.0, y: layout.size.height / 2.0) @@ -1283,6 +1304,7 @@ final class ContactListNode: ASDisplayNode { self.indexNode.update(size: CGSize(width: 20.0, height: layout.size.height - insets.top - insets.bottom), color: self.presentationData.theme.list.itemAccentColor, sections: transition.indexSections, transition: .animated(duration: 0.2, curve: .easeInOut)) } + self.listNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, scrollToItem: transition.scrollToItem, updateOpaqueState: nil, completion: { [weak self] _ in if let strongSelf = self { if !strongSelf.didSetReady { diff --git a/TelegramUI/ContactMultiselectionControllerNode.swift b/TelegramUI/ContactMultiselectionControllerNode.swift index 4e6e9fcc99..41f9b83fc5 100644 --- a/TelegramUI/ContactMultiselectionControllerNode.swift +++ b/TelegramUI/ContactMultiselectionControllerNode.swift @@ -157,15 +157,16 @@ final class ContactMultiselectionControllerNode: ASDisplayNode { var insets = layout.insets(options: [.input]) insets.top += navigationBarHeight - - var headerInsets = layout.insets(options: [.input]) - headerInsets.top += actualNavigationBarHeight - + let tokenListHeight = self.tokenListNode.updateLayout(tokens: self.editableTokens, width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: transition) transition.updateFrame(node: self.tokenListNode, frame: CGRect(origin: CGPoint(x: 0.0, y: insets.top), size: CGSize(width: layout.size.width, height: tokenListHeight))) + var headerInsets = layout.insets(options: [.input]) + headerInsets.top += actualNavigationBarHeight + 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), headerInsets: headerInsets, transition: transition) self.contactListNode.frame = CGRect(origin: CGPoint(), size: layout.size) diff --git a/TelegramUI/ContactSelectionController.swift b/TelegramUI/ContactSelectionController.swift index a092606dc9..5ecbf7192f 100644 --- a/TelegramUI/ContactSelectionController.swift +++ b/TelegramUI/ContactSelectionController.swift @@ -81,6 +81,9 @@ class ContactSelectionController: ViewController { self.scrollToTop = { [weak self] in if let strongSelf = self { + if let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateExpansionProgress(1.0, animated: true) + } strongSelf.contactsNode.contactListNode.scrollToTop() } } diff --git a/TelegramUI/ContactSelectionControllerNode.swift b/TelegramUI/ContactSelectionControllerNode.swift index 868c418832..1aed27debc 100644 --- a/TelegramUI/ContactSelectionControllerNode.swift +++ b/TelegramUI/ContactSelectionControllerNode.swift @@ -76,7 +76,7 @@ final class ContactSelectionControllerNode: ASDisplayNode { private func updateTheme() { self.backgroundColor = self.presentationData.theme.chatList.backgroundColor - self.searchDisplayController?.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings) + self.searchDisplayController?.updatePresentationData(presentationData) self.dimNode.backgroundColor = self.presentationData.theme.list.plainBackgroundColor.withAlphaComponent(0.5) } @@ -115,7 +115,7 @@ final class ContactSelectionControllerNode: ASDisplayNode { } else { categories.insert(.global) } - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: false, categories: categories, openPeer: { [weak self] peer in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: false, categories: categories, openPeer: { [weak self] peer in self?.requestOpenPeerFromSearch?(peer) }), cancel: { [weak self] in if let requestDeactivateSearch = self?.requestDeactivateSearch { diff --git a/TelegramUI/ContactsController.swift b/TelegramUI/ContactsController.swift index fafb50c0de..619eb3d410 100644 --- a/TelegramUI/ContactsController.swift +++ b/TelegramUI/ContactsController.swift @@ -10,10 +10,10 @@ private func fixListNodeScrolling(_ listNode: ListView, searchNode: NavigationBa let scrollToItem: ListViewScrollToItem let targetProgress: CGFloat if searchNode.expansionProgress < 0.6 { - scrollToItem = ListViewScrollToItem(index: 1, position: .top(-navigationBarSearchContentHeight), animated: true, curve: .Default(duration: 0.25), directionHint: .Up) + scrollToItem = ListViewScrollToItem(index: 1, position: .top(-navigationBarSearchContentHeight), animated: true, curve: .Default(duration: 0.3), directionHint: .Up) targetProgress = 0.0 } else { - scrollToItem = ListViewScrollToItem(index: 1, position: .top(0.0), animated: true, curve: .Default(duration: 0.25), directionHint: .Up) + scrollToItem = ListViewScrollToItem(index: 1, position: .top(0.0), animated: true, curve: .Default(duration: 0.3), directionHint: .Up) targetProgress = 1.0 } searchNode.updateExpansionProgress(targetProgress, animated: true) @@ -239,6 +239,8 @@ public class ContactsController: ViewController { switch offset { case let .known(offset): progress = max(0.0, (searchContentNode.nominalHeight - max(0.0, offset - 50.0))) / searchContentNode.nominalHeight + case .none: + progress = 1.0 default: break } @@ -277,9 +279,6 @@ public class ContactsController: ViewController { private func activateSearch() { if self.displayNavigationBar { - if let scrollToTop = self.scrollToTop { - scrollToTop() - } if let searchContentNode = self.searchContentNode { self.contactsNode.activateSearch(placeholderNode: searchContentNode.placeholderNode) } diff --git a/TelegramUI/ContactsControllerNode.swift b/TelegramUI/ContactsControllerNode.swift index 52c967a6ea..2e0d409c13 100644 --- a/TelegramUI/ContactsControllerNode.swift +++ b/TelegramUI/ContactsControllerNode.swift @@ -97,8 +97,7 @@ final class ContactsControllerNode: ASDisplayNode { private func updateThemeAndStrings() { self.backgroundColor = self.presentationData.theme.chatList.backgroundColor - - self.searchDisplayController?.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings) + self.searchDisplayController?.updatePresentationData(self.presentationData) } func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, actualNavigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { @@ -124,7 +123,7 @@ final class ContactsControllerNode: ASDisplayNode { return } - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: false, categories: [.cloudContacts, .global, .deviceContacts], openPeer: { [weak self] peer in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: false, categories: [.cloudContacts, .global, .deviceContacts], openPeer: { [weak self] peer in if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch { requestOpenPeerFromSearch(peer) } diff --git a/TelegramUI/ContactsSearchContainerNode.swift b/TelegramUI/ContactsSearchContainerNode.swift index a53ebb4ccf..9d0778dd8e 100644 --- a/TelegramUI/ContactsSearchContainerNode.swift +++ b/TelegramUI/ContactsSearchContainerNode.swift @@ -13,6 +13,8 @@ private enum ContactListSearchGroup { private struct ContactListSearchEntry: Identifiable, Comparable { let index: Int + let theme: PresentationTheme + let strings: PresentationStrings let peer: ContactListPeer let presence: PeerPresence? let group: ContactListSearchGroup @@ -26,6 +28,12 @@ private struct ContactListSearchEntry: Identifiable, Comparable { if lhs.index != rhs.index { return false } + if lhs.theme !== rhs.theme { + return false + } + if lhs.strings !== rhs.strings { + return false + } if lhs.peer != rhs.peer { return false } @@ -49,26 +57,26 @@ private struct ContactListSearchEntry: Identifiable, Comparable { return lhs.index < rhs.index } - func item(account: Account, theme: PresentationTheme, strings: PresentationStrings, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void) -> ListViewItem { + func item(account: Account, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void) -> ListViewItem { let header: ListViewItemHeader let status: ContactsPeerItemStatus switch self.group { case .contacts: - header = ChatListSearchItemHeader(type: .contacts, theme: theme, strings: strings, actionTitle: nil, action: nil) + header = ChatListSearchItemHeader(type: .contacts, theme: self.theme, strings: self.strings, actionTitle: nil, action: nil) if let presence = self.presence { status = .presence(presence, timeFormat) } else { status = .none } case .global: - header = ChatListSearchItemHeader(type: .globalPeers, theme: theme, strings: strings, actionTitle: nil, action: nil) + header = ChatListSearchItemHeader(type: .globalPeers, theme: self.theme, strings: self.strings, actionTitle: nil, action: nil) if case let .peer(peer, _) = self.peer, let _ = peer.addressName { status = .addressName("") } else { status = .none } case .deviceContacts: - header = ChatListSearchItemHeader(type: .deviceContacts, theme: theme, strings: strings, actionTitle: nil, action: nil) + header = ChatListSearchItemHeader(type: .deviceContacts, theme: self.theme, strings: self.strings, actionTitle: nil, action: nil) status = .none } let peer = self.peer @@ -79,7 +87,7 @@ private struct ContactListSearchEntry: Identifiable, Comparable { case let .deviceContact(stableId, contact): peerItem = .deviceContact(stableId: stableId, contact: contact) } - return ContactsPeerItem(theme: theme, strings: strings, sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, account: account, peerMode: .peer, peer: peerItem, status: status, enabled: self.enabled, selection: .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in + return ContactsPeerItem(theme: self.theme, strings: self.strings, sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, account: account, peerMode: .peer, peer: peerItem, status: status, enabled: self.enabled, selection: .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in openPeer(peer) }) } @@ -92,12 +100,12 @@ struct ContactListSearchContainerTransition { let isSearching: Bool } -private func contactListSearchContainerPreparedRecentTransition(from fromEntries: [ContactListSearchEntry], to toEntries: [ContactListSearchEntry], isSearching: Bool, account: Account, theme: PresentationTheme, strings: PresentationStrings, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void) -> ContactListSearchContainerTransition { +private func contactListSearchContainerPreparedRecentTransition(from fromEntries: [ContactListSearchEntry], to toEntries: [ContactListSearchEntry], isSearching: Bool, account: Account, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, timeFormat: PresentationDateTimeFormat, openPeer: @escaping (ContactListPeer) -> Void) -> ContactListSearchContainerTransition { let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } - let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, theme: theme, strings: strings, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer), directionHint: nil) } - let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, theme: theme, strings: strings, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer), directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, timeFormat: timeFormat, openPeer: openPeer), directionHint: nil) } return ContactListSearchContainerTransition(deletions: deletions, insertions: insertions, updates: updates, isSearching: isSearching) } @@ -156,7 +164,7 @@ final class ContactsSearchContainerNode: SearchDisplayControllerContentNode { let themeAndStringsPromise = self.themeAndStringsPromise - let searchItems = searchQuery.get() + let searchItems = self.searchQuery.get() |> mapToSignal { query -> Signal<[ContactListSearchEntry]?, NoError> in if let query = query, !query.isEmpty { let foundLocalContacts: Signal<([Peer], [PeerId: PeerPresence]), NoError> @@ -186,92 +194,92 @@ final class ContactsSearchContainerNode: SearchDisplayControllerContentNode { } return combineLatest(foundLocalContacts, foundRemoteContacts, foundDeviceContacts, themeAndStringsPromise.get()) - |> delay(0.1, queue: Queue.concurrentDefaultQueue()) - |> map { localPeersAndPresences, remotePeers, deviceContacts, themeAndStrings -> [ContactListSearchEntry] in - var entries: [ContactListSearchEntry] = [] - var existingPeerIds = Set() - var disabledPeerIds = Set() - for filter in filters { - switch filter { - case .excludeSelf: - existingPeerIds.insert(account.peerId) - case let .exclude(peerIds): - existingPeerIds = existingPeerIds.union(peerIds) - case let .disable(peerIds): - disabledPeerIds = disabledPeerIds.union(peerIds) - } + |> delay(0.1, queue: Queue.concurrentDefaultQueue()) + |> map { localPeersAndPresences, remotePeers, deviceContacts, themeAndStrings -> [ContactListSearchEntry] in + var entries: [ContactListSearchEntry] = [] + var existingPeerIds = Set() + var disabledPeerIds = Set() + for filter in filters { + switch filter { + case .excludeSelf: + existingPeerIds.insert(account.peerId) + case let .exclude(peerIds): + existingPeerIds = existingPeerIds.union(peerIds) + case let .disable(peerIds): + disabledPeerIds = disabledPeerIds.union(peerIds) } - var existingNormalizedPhoneNumbers = Set() - var index = 0 - for peer in localPeersAndPresences.0 { - if existingPeerIds.contains(peer.id) { + } + var existingNormalizedPhoneNumbers = Set() + var index = 0 + for peer in localPeersAndPresences.0 { + if existingPeerIds.contains(peer.id) { + continue + } + existingPeerIds.insert(peer.id) + var enabled = true + if onlyWriteable { + enabled = canSendMessagesToPeer(peer) + } + entries.append(ContactListSearchEntry(index: index, theme: themeAndStrings.0, strings: themeAndStrings.1, peer: .peer(peer: peer, isGlobal: false), presence: localPeersAndPresences.1[peer.id], group: .contacts, enabled: enabled)) + if searchDeviceContacts, let user = peer as? TelegramUser, let phone = user.phone { + existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone))) + } + index += 1 + } + if let remotePeers = remotePeers { + for peer in remotePeers.0 { + if !(peer.peer is TelegramUser) { continue } - existingPeerIds.insert(peer.id) - var enabled = true - if onlyWriteable { - enabled = canSendMessagesToPeer(peer) - } - entries.append(ContactListSearchEntry(index: index, peer: .peer(peer: peer, isGlobal: false), presence: localPeersAndPresences.1[peer.id], group: .contacts, enabled: enabled)) - if searchDeviceContacts, let user = peer as? TelegramUser, let phone = user.phone { - existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone))) - } - index += 1 - } - if let remotePeers = remotePeers { - for peer in remotePeers.0 { - if !(peer.peer is TelegramUser) { - continue + if !existingPeerIds.contains(peer.peer.id) { + existingPeerIds.insert(peer.peer.id) + + var enabled = true + if onlyWriteable { + enabled = canSendMessagesToPeer(peer.peer) } - if !existingPeerIds.contains(peer.peer.id) { - existingPeerIds.insert(peer.peer.id) - - var enabled = true - if onlyWriteable { - enabled = canSendMessagesToPeer(peer.peer) - } - - entries.append(ContactListSearchEntry(index: index, peer: .peer(peer: peer.peer, isGlobal: true), presence: nil, group: .global, enabled: enabled)) - if searchDeviceContacts, let user = peer.peer as? TelegramUser, let phone = user.phone { - existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone))) - } - index += 1 + + entries.append(ContactListSearchEntry(index: index, theme: themeAndStrings.0, strings: themeAndStrings.1, peer: .peer(peer: peer.peer, isGlobal: true), presence: nil, group: .global, enabled: enabled)) + if searchDeviceContacts, let user = peer.peer as? TelegramUser, let phone = user.phone { + existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone))) + } + index += 1 + } + } + for peer in remotePeers.1 { + if !(peer.peer is TelegramUser) { + continue + } + if !existingPeerIds.contains(peer.peer.id) { + existingPeerIds.insert(peer.peer.id) + + var enabled = true + if onlyWriteable { + enabled = canSendMessagesToPeer(peer.peer) + } + + entries.append(ContactListSearchEntry(index: index, theme: themeAndStrings.0, strings: themeAndStrings.1, peer: .peer(peer: peer.peer, isGlobal: true), presence: nil, group: .global, enabled: enabled)) + if searchDeviceContacts, let user = peer.peer as? TelegramUser, let phone = user.phone { + existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone))) } - } - for peer in remotePeers.1 { - if !(peer.peer is TelegramUser) { - continue - } - if !existingPeerIds.contains(peer.peer.id) { - existingPeerIds.insert(peer.peer.id) - - var enabled = true - if onlyWriteable { - enabled = canSendMessagesToPeer(peer.peer) - } - - entries.append(ContactListSearchEntry(index: index, peer: .peer(peer: peer.peer, isGlobal: true), presence: nil, group: .global, enabled: enabled)) - if searchDeviceContacts, let user = peer.peer as? TelegramUser, let phone = user.phone { - existingNormalizedPhoneNumbers.insert(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone))) - } - index += 1 - } - } - } - if let _ = remotePeers, let deviceContacts = deviceContacts { - outer: for (stableId, contact) in deviceContacts { - inner: for phoneNumber in contact.phoneNumbers { - let normalizedNumber = DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phoneNumber.value)) - if existingNormalizedPhoneNumbers.contains(normalizedNumber) { - continue outer - } - } - entries.append(ContactListSearchEntry(index: index, peer: .deviceContact(stableId, contact), presence: nil, group: .deviceContacts, enabled: true)) index += 1 } } - return entries } + if let _ = remotePeers, let deviceContacts = deviceContacts { + outer: for (stableId, contact) in deviceContacts { + inner: for phoneNumber in contact.phoneNumbers { + let normalizedNumber = DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phoneNumber.value)) + if existingNormalizedPhoneNumbers.contains(normalizedNumber) { + continue outer + } + } + entries.append(ContactListSearchEntry(index: index, theme: themeAndStrings.0, strings: themeAndStrings.1, peer: .deviceContact(stableId, contact), presence: nil, group: .deviceContacts, enabled: true)) + index += 1 + } + } + return entries + } } else { return .single(nil) } @@ -284,7 +292,7 @@ final class ContactsSearchContainerNode: SearchDisplayControllerContentNode { if let strongSelf = self { let previousItems = previousSearchItems.swap(items ?? []) - let transition = contactListSearchContainerPreparedRecentTransition(from: previousItems, to: items ?? [], isSearching: items != nil, account: account, theme: strongSelf.presentationData.theme, strings: strongSelf.presentationData.strings, nameSortOrder: strongSelf.presentationData.nameSortOrder, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder, timeFormat: strongSelf.presentationData.dateTimeFormat, openPeer: { peer in self?.listNode.clearHighlightAnimated(true) + let transition = contactListSearchContainerPreparedRecentTransition(from: previousItems, to: items ?? [], isSearching: items != nil, account: account, nameSortOrder: strongSelf.presentationData.nameSortOrder, nameDisplayOrder: strongSelf.presentationData.nameDisplayOrder, timeFormat: strongSelf.presentationData.dateTimeFormat, openPeer: { peer in self?.listNode.clearHighlightAnimated(true) self?.openPeer(peer) }) @@ -307,6 +315,14 @@ final class ContactsSearchContainerNode: SearchDisplayControllerContentNode { self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) } + override func updatePresentationData(_ presentationData: PresentationData) { + super.updatePresentationData(presentationData) + + self.presentationData = presentationData + self.themeAndStringsPromise.set(.single((presentationData.theme, presentationData.strings))) + self.listNode.backgroundColor = self.presentationData.theme.list.plainBackgroundColor + } + override func searchTextUpdated(text: String) { if text.isEmpty { self.searchQuery.set(.single(nil)) diff --git a/TelegramUI/CounterContollerTitleView.swift b/TelegramUI/CounterContollerTitleView.swift index 0caf25d5c9..87a740f87c 100644 --- a/TelegramUI/CounterContollerTitleView.swift +++ b/TelegramUI/CounterContollerTitleView.swift @@ -10,18 +10,13 @@ struct CounterContollerTitle: Equatable { final class CounterContollerTitleView: UIView { private var theme: PresentationTheme private let titleNode: ASTextNode - - func f() { - - } + private let subtitleNode: ASTextNode var title: CounterContollerTitle = CounterContollerTitle(title: "", counter: "") { didSet { if self.title != oldValue { - let string = NSMutableAttributedString() - string.append(NSAttributedString(string: title.title, font: Font.medium(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)) - string.append(NSAttributedString(string: " " + title.counter, font: Font.regular(15.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)) - self.titleNode.attributedText = string + self.titleNode.attributedText = NSAttributedString(string: self.title.title, font: Font.medium(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor) + self.subtitleNode.attributedText = NSAttributedString(string: self.title.counter, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor) self.setNeedsLayout() } @@ -37,9 +32,16 @@ final class CounterContollerTitleView: UIView { self.titleNode.truncationMode = .byTruncatingTail self.titleNode.isOpaque = false + self.subtitleNode = ASTextNode() + self.subtitleNode.displaysAsynchronously = false + self.subtitleNode.maximumNumberOfLines = 1 + self.subtitleNode.truncationMode = .byTruncatingTail + self.subtitleNode.isOpaque = false + super.init(frame: CGRect()) self.addSubnode(self.titleNode) + self.addSubnode(self.subtitleNode) } required init?(coder aDecoder: NSCoder) { @@ -50,11 +52,16 @@ final class CounterContollerTitleView: UIView { super.layoutSubviews() let size = self.bounds.size + let spacing: CGFloat = 0.0 let titleSize = self.titleNode.measure(CGSize(width: max(1.0, size.width), height: size.height)) - let combinedHeight = titleSize.height + let subtitleSize = self.subtitleNode.measure(CGSize(width: max(1.0, size.width), height: size.height)) + let combinedHeight = titleSize.height + subtitleSize.height + spacing let titleFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0)), size: titleSize) self.titleNode.frame = titleFrame + + let subtitleFrame = CGRect(origin: CGPoint(x: floor((size.width - subtitleSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0) + titleSize.height + spacing), size: subtitleSize) + self.subtitleNode.frame = subtitleFrame } } diff --git a/TelegramUI/FetchCachedRepresentations.swift b/TelegramUI/FetchCachedRepresentations.swift index c6d6396b8f..abfb78e452 100644 --- a/TelegramUI/FetchCachedRepresentations.swift +++ b/TelegramUI/FetchCachedRepresentations.swift @@ -54,6 +54,14 @@ public func fetchCachedResourceRepresentation(account: Account, resource: MediaR } return fetchCachedScaledVideoFirstFrameRepresentation(account: account, resource: resource, resourceData: data, representation: representation) } + } else if let representation = representation as? CachedBlurredWallpaperRepresentation { + return account.postbox.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false)) + |> mapToSignal { data -> Signal in + if !data.complete { + return .complete() + } + return fetchCachedBlurredWallpaperRepresentation(account: account, resource: resource, resourceData: data, representation: representation) + } } return .never() } @@ -281,3 +289,32 @@ private func fetchCachedScaledVideoFirstFrameRepresentation(account: Account, re }) |> runOn(account.graphicsThreadPool) } } + +private func fetchCachedBlurredWallpaperRepresentation(account: Account, resource: MediaResource, resourceData: MediaResourceData, representation: CachedBlurredWallpaperRepresentation) -> Signal { + return Signal({ subscriber in + if let data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) { + if let image = UIImage(data: data) { + var randomId: Int64 = 0 + arc4random_buf(&randomId, 8) + let path = NSTemporaryDirectory() + "\(randomId)" + let url = URL(fileURLWithPath: path) + + if let colorImage = blurredImage(image, radius: 45.0), let colorDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) { + CGImageDestinationSetProperties(colorDestination, [:] as CFDictionary) + + let colorQuality: Float = 0.5 + + let options = NSMutableDictionary() + options.setObject(colorQuality as NSNumber, forKey: kCGImageDestinationLossyCompressionQuality as NSString) + + CGImageDestinationAddImage(colorDestination, colorImage.cgImage!, options as CFDictionary) + if CGImageDestinationFinalize(colorDestination) { + subscriber.putNext(CachedMediaResourceRepresentationResult(temporaryPath: path)) + subscriber.putCompletion() + } + } + } + } + return EmptyDisposable + }) |> runOn(account.graphicsThreadPool) +} diff --git a/TelegramUI/FixSearchableListNodeScrolling.swift b/TelegramUI/FixSearchableListNodeScrolling.swift index 43acd9bcd9..4126e09420 100644 --- a/TelegramUI/FixSearchableListNodeScrolling.swift +++ b/TelegramUI/FixSearchableListNodeScrolling.swift @@ -33,10 +33,10 @@ func fixNavigationSearchableListNodeScrolling(_ listNode: ListView, searchNode: let scrollToItem: ListViewScrollToItem let targetProgress: CGFloat if searchNode.expansionProgress < 0.6 { - scrollToItem = ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight), animated: true, curve: .Default(duration: 0.25), directionHint: .Up) + scrollToItem = ListViewScrollToItem(index: 0, position: .top(-navigationBarSearchContentHeight), animated: true, curve: .Default(duration: 0.3), directionHint: .Up) targetProgress = 0.0 } else { - scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: 0.25), directionHint: .Up) + scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: 0.3), directionHint: .Up) targetProgress = 1.0 } searchNode.updateExpansionProgress(targetProgress, animated: true) diff --git a/TelegramUI/GridMessageItem.swift b/TelegramUI/GridMessageItem.swift index 666ef90e34..72d0714b5a 100644 --- a/TelegramUI/GridMessageItem.swift +++ b/TelegramUI/GridMessageItem.swift @@ -7,19 +7,30 @@ import SwiftSignalKit private let videoAccessoryFont: UIFont = Font.regular(11) -private final class GridMessageVideoAccessoryNode : ASDisplayNode { - +private let videoAccessoryBackgorund: UIImage? = { + let diameter: CGFloat = 8.0 + return generateImage(CGSize(width: diameter, height: diameter), contextGenerator: { size, context in + context.setBlendMode(.copy) + context.setFillColor(UIColor.clear.cgColor) + context.fill(CGRect(origin: CGPoint(), size: size)) + context.setBlendMode(.normal) + context.setFillColor(UIColor(white: 0.0, alpha: 0.6).cgColor) + context.fillEllipse(in: CGRect(origin: CGPoint(), size: size)) + }, opaque: false)?.stretchableImage(withLeftCapWidth: Int(diameter / 2.0), topCapHeight: Int(diameter / 2.0)) +}() + +private final class GridMessageVideoAccessoryNode : ASImageNode { private let textNode: ImmediateTextNode = ImmediateTextNode() override init() { super.init() + self.image = videoAccessoryBackgorund self.textNode.displaysAsynchronously = false self.textNode.maximumNumberOfLines = 1 self.textNode.isUserInteractionEnabled = false self.textNode.textAlignment = .left self.textNode.lineSpacing = 0.1 self.addSubnode(self.textNode) - self.backgroundColor = UIColor(white: 0.0, alpha: 0.6) } var contentSize: CGSize { @@ -356,8 +367,21 @@ final class GridMessageItemNode: GridItemNode { func transitionNode(id: MessageId, media: Media) -> (ASDisplayNode, () -> UIView?)? { if self.messageId == id { let imageNode = self.imageNode - return (self.imageNode, { [weak imageNode] in - return imageNode?.view.snapshotContentTree(unhide: true) + return (self.imageNode, { [weak self, weak imageNode] in + var statusNodeHidden = false + var accessoryHidden = false + if let strongSelf = self { + statusNodeHidden = strongSelf.statusNode.isHidden + accessoryHidden = strongSelf.videoAccessoryNode.isHidden + strongSelf.statusNode.isHidden = true + strongSelf.videoAccessoryNode.isHidden = true + } + let view = imageNode?.view.snapshotContentTree(unhide: true) + if let strongSelf = self { + strongSelf.statusNode.isHidden = statusNodeHidden + strongSelf.videoAccessoryNode.isHidden = accessoryHidden + } + return view }) } else { return nil @@ -367,8 +391,18 @@ final class GridMessageItemNode: GridItemNode { func updateHiddenMedia() { if let controllerInteraction = self.controllerInteraction, let messageId = self.messageId, controllerInteraction.hiddenMedia[messageId] != nil { self.imageNode.isHidden = true + self.videoAccessoryNode.alpha = 0.0 + self.statusNode.alpha = 0.0 } else { self.imageNode.isHidden = false + if self.statusNode.alpha < 1.0 { + self.statusNode.alpha = 1.0 + self.statusNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } + if self.videoAccessoryNode.alpha < 1.0 { + self.videoAccessoryNode.alpha = 1.0 + self.videoAccessoryNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } } } diff --git a/TelegramUI/HashtagChatInputContextPanelNode.swift b/TelegramUI/HashtagChatInputContextPanelNode.swift index c6f08b1457..2b1f93cf8b 100644 --- a/TelegramUI/HashtagChatInputContextPanelNode.swift +++ b/TelegramUI/HashtagChatInputContextPanelNode.swift @@ -67,7 +67,6 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode { private var validLayout: (CGSize, CGFloat, CGFloat)? override init(account: Account, theme: PresentationTheme, strings: PresentationStrings) { - self.listView = ListView() self.listView.isOpaque = false self.listView.stackFromBottom = true diff --git a/TelegramUI/HorizontalStickersChatContextPanelNode.swift b/TelegramUI/HorizontalStickersChatContextPanelNode.swift index ecc4f54ae0..bb150f6428 100644 --- a/TelegramUI/HorizontalStickersChatContextPanelNode.swift +++ b/TelegramUI/HorizontalStickersChatContextPanelNode.swift @@ -59,8 +59,8 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { private let backgroundNode: ASDisplayNode private var validLayout: (CGSize, CGFloat, CGFloat, ChatPresentationInterfaceState)? - private var currentEntries: [StickerEntry] = [] - private var queuedTransitions: [StickerEntryTransition] = [] + private var currentEntries: [StickerEntry]? + private var queuedTransitions: [(StickerEntryTransition, Bool)] = [] public var controllerInteraction: ChatControllerInteraction? private let stickersInteraction: HorizontalStickersChatContextPanelInteraction @@ -72,6 +72,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { self.gridNode = GridNode() self.gridNode.view.disablesInteractiveTransitionGestureRecognizer = true + self.gridNode.scrollView.alwaysBounceVertical = true self.backgroundNode = ASDisplayNode() self.backgroundNode.backgroundColor = theme.list.plainBackgroundColor @@ -172,7 +173,8 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { } func updateResults(_ results: [TelegramMediaFile]) { - let previousEntries = self.currentEntries + let firstTime = self.currentEntries == nil + let previousEntries = self.currentEntries ?? [] var entries: [StickerEntry] = [] for i in 0 ..< results.count { entries.append(StickerEntry(index: i, file: results[i])) @@ -184,11 +186,11 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { } let transition = preparedGridEntryTransition(account: self.account, from: previousEntries, to: entries, stickersInteraction: self.stickersInteraction, interfaceInteraction: self.interfaceInteraction!) - self.enqueueTransition(transition) + self.enqueueTransition(transition, firstTime: firstTime) } - private func enqueueTransition(_ transition: StickerEntryTransition) { - self.queuedTransitions.append(transition) + private func enqueueTransition(_ transition: StickerEntryTransition, firstTime: Bool) { + self.queuedTransitions.append((transition, firstTime)) if self.validLayout != nil { self.dequeueTransitions() } @@ -196,16 +198,18 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { private func dequeueTransitions() { while !self.queuedTransitions.isEmpty { - let transition = self.queuedTransitions.removeFirst() + let (transition, firstTime) = self.queuedTransitions.removeFirst() self.gridNode.transaction(GridNodeTransaction(deleteItems: transition.deletions, insertItems: transition.insertions, updateItems: transition.updates, scrollToItem: transition.scrollToItem, updateLayout: nil, itemTransition: .immediate, stationaryItems: transition.stationaryItems, updateFirstIndexInSectionOffset: transition.updateFirstIndexInSectionOffset), completion: { [weak self] _ in if let strongSelf = self { strongSelf.backgroundNode.frame = CGRect(x: 0.0, y: 0.0, width: strongSelf.bounds.width, height: strongSelf.gridNode.scrollView.contentSize.height + 500.0) + + if firstTime { + let position = strongSelf.gridNode.layer.position + let offset = strongSelf.gridNode.frame.height + strongSelf.gridNode.scrollView.contentOffset.y + strongSelf.gridNode.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + offset), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in }) + } } -// if let topItemOffset = topItemOffset { -// let position = strongSelf.listView.layer.position -// strongSelf.listView.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset)), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring) -// } }) } } @@ -217,7 +221,9 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { } override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { - + let hadValidLayout = self.validLayout != nil + self.validLayout = (size, leftInset, rightInset, interfaceState) + var insets = UIEdgeInsets() insets.top = self.topInsetForLayout(size: size) insets.left = leftInset @@ -233,11 +239,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { } }) - let dequeue = self.validLayout == nil - self.validLayout = (size, leftInset, rightInset, interfaceState) - - if dequeue { - self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + if !hadValidLayout { self.dequeueTransitions() } @@ -247,14 +249,11 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { } override func animateOut(completion: @escaping () -> Void) { - self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { _ in + let position = self.gridNode.layer.position + let offset = self.gridNode.frame.height + self.gridNode.scrollView.contentOffset.y + self.gridNode.layer.animatePosition(from: position, to: CGPoint(x: position.x, y: position.y + offset), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in completion() }) -// let position = self.gridNode.layer.position -// let offset = self.gridNode.scrollView.contentOffset.y + self.gridNode.scrollView.contentInset.top + self.gridNode.bounds.height - self.gridNode.scrollView.contentInset.top -// self.gridNode.layer.animatePosition(from: position, to: CGPoint(x: position.x, y: position.y + (self.gridNode.bounds.height - offset)), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in -// completion() -// }) } override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { diff --git a/TelegramUI/ImageBlur.swift b/TelegramUI/ImageBlur.swift new file mode 100644 index 0000000000..715c41883a --- /dev/null +++ b/TelegramUI/ImageBlur.swift @@ -0,0 +1,59 @@ +import UIKit +import Accelerate + +private func imageBuffer(from data: UnsafeMutableRawPointer!, width: vImagePixelCount, height: vImagePixelCount, rowBytes: Int) -> vImage_Buffer { + return vImage_Buffer(data: data, height: vImagePixelCount(height), width: vImagePixelCount(width), rowBytes: rowBytes) +} + +func blurredImage(_ image: UIImage, radius: CGFloat, iterations: Int = 3) -> UIImage? { + guard let cgImage = image.cgImage, let providerData = cgImage.dataProvider?.data else { + return nil + } + + if image.size.width <= 0.0 || image.size.height <= 0 || radius <= 0 { + return image + } + + var boxSize = UInt32(radius) + if boxSize % 2 == 0 { + boxSize += 1 + } + + let bytes = cgImage.bytesPerRow * cgImage.height + let inData = malloc(bytes) + var inBuffer = imageBuffer(from: inData, width: vImagePixelCount(cgImage.width), height: vImagePixelCount(cgImage.height), rowBytes: cgImage.bytesPerRow) + + let outData = malloc(bytes) + var outBuffer = imageBuffer(from: outData, width: vImagePixelCount(cgImage.width), height: vImagePixelCount(cgImage.height), rowBytes: cgImage.bytesPerRow) + + let tempSize = vImageBoxConvolve_ARGB8888(&inBuffer, &outBuffer, nil, 0, 0, boxSize, boxSize, nil, vImage_Flags(kvImageEdgeExtend + kvImageGetTempBufferSize)) + let tempData = malloc(tempSize) + + defer { + free(inData) + free(outData) + free(tempData) + } + + let source = CFDataGetBytePtr(providerData) + memcpy(inBuffer.data, source, bytes) + + for _ in 0 ..< iterations { + vImageBoxConvolve_ARGB8888(&inBuffer, &outBuffer, tempData, 0, 0, boxSize, boxSize, nil, vImage_Flags(kvImageEdgeExtend)) + + let temp = inBuffer.data + inBuffer.data = outBuffer.data + outBuffer.data = temp + } + + let context = cgImage.colorSpace.flatMap { + CGContext(data: inBuffer.data, width: cgImage.width, height: cgImage.height, bitsPerComponent: cgImage.bitsPerComponent, bytesPerRow: cgImage.bytesPerRow, space: $0, bitmapInfo: cgImage.bitmapInfo.rawValue) + } + + let blurredCGImage = context?.makeImage() + if let blurredCGImage = blurredCGImage { + return UIImage(cgImage: blurredCGImage, scale: image.scale, orientation: image.imageOrientation) + } else { + return nil + } +} diff --git a/TelegramUI/InstantImageGalleryItem.swift b/TelegramUI/InstantImageGalleryItem.swift index 5d5678b7ed..7cf7204fc7 100644 --- a/TelegramUI/InstantImageGalleryItem.swift +++ b/TelegramUI/InstantImageGalleryItem.swift @@ -100,7 +100,7 @@ final class InstantImageGalleryItemNode: ZoomableContentGalleryItemNode { super.init() - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } diff --git a/TelegramUI/InviteContactsController.swift b/TelegramUI/InviteContactsController.swift index 773f18754c..fb7c7cdb4e 100644 --- a/TelegramUI/InviteContactsController.swift +++ b/TelegramUI/InviteContactsController.swift @@ -41,6 +41,9 @@ public class InviteContactsController: ViewController, MFMessageComposeViewContr self.scrollToTop = { [weak self] in if let strongSelf = self { + if let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateExpansionProgress(1.0, animated: true) + } strongSelf.contactsNode.scrollToTop() } } @@ -162,7 +165,7 @@ public class InviteContactsController: ViewController, MFMessageComposeViewContr override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { super.containerLayoutUpdated(layout, transition: transition) - self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, transition: transition) + self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition) } private func activateSearch() { diff --git a/TelegramUI/InviteContactsControllerNode.swift b/TelegramUI/InviteContactsControllerNode.swift index dc5295b5b9..0ee3e93929 100644 --- a/TelegramUI/InviteContactsControllerNode.swift +++ b/TelegramUI/InviteContactsControllerNode.swift @@ -6,14 +6,11 @@ import TelegramCore import SwiftSignalKit private enum InviteContactsEntryId: Hashable { - case search case option(index: Int) case contactId(String) var hashValue: Int { switch self { - case .search: - return 0 case let .option(index): return (index + 2).hashValue case let .contactId(contactId): @@ -27,51 +24,39 @@ private enum InviteContactsEntryId: Hashable { static func ==(lhs: InviteContactsEntryId, rhs: InviteContactsEntryId) -> Bool { switch lhs { - case .search: - switch rhs { - case .search: + case let .option(index): + if case .option(index) = rhs { return true - default: + } else { return false - } - case let .option(index): - if case .option(index) = rhs { - return true - } else { - return false - } - case let .contactId(lhsId): - switch rhs { - case let .contactId(rhsId): - return lhsId == rhsId - default: - return false - } + } + case let .contactId(lhsId): + switch rhs { + case let .contactId(rhsId): + return lhsId == rhsId + default: + return false + } } } } private final class InviteContactsInteraction { - let activateSearch: () -> Void let toggleContact: (String) -> Void let shareTelegram: () -> Void - init(activateSearch: @escaping () -> Void, toggleContact: @escaping (String) -> Void, shareTelegram: @escaping () -> Void) { - self.activateSearch = activateSearch + init(toggleContact: @escaping (String) -> Void, shareTelegram: @escaping () -> Void) { self.toggleContact = toggleContact self.shareTelegram = shareTelegram } } private enum InviteContactsEntry: Comparable, Identifiable { - case search(PresentationTheme, PresentationStrings) case option(Int, ContactListAdditionalOption, PresentationTheme, PresentationStrings) case peer(Int, DeviceContactStableId, DeviceContactBasicData, Int32, ContactsPeerItemSelection, PresentationTheme, PresentationStrings, PresentationPersonNameOrder, PresentationPersonNameOrder) var stableId: InviteContactsEntryId { switch self { - case .search: - return .search case let .option(index, _, _, _): return .option(index: index) case let .peer(_, id, _, _, _, _, _, _, _): @@ -81,34 +66,24 @@ private enum InviteContactsEntry: Comparable, Identifiable { func item(account: Account, interaction: InviteContactsInteraction) -> ListViewItem { switch self { - case let .search(theme, strings): - return ChatListSearchItem(theme: theme, placeholder: strings.Common_Search, activate: { - interaction.activateSearch() - }) - case let .option(_, option, theme, _): - return ContactListActionItem(theme: theme, title: option.title, icon: option.icon, header: nil, action: option.action) - case let .peer(_, id, contact, count, selection, theme, strings, nameSortOrder, nameDisplayOrder): - let status: ContactsPeerItemStatus - if count != 0 { - status = .custom(strings.Contacts_ImportersCount(count)) - } else { - status = .none - } - let peer = TelegramUser(id: PeerId(namespace: -1, id: 0), accessHash: nil, firstName: contact.firstName, lastName: contact.lastName, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) - return ContactsPeerItem(theme: theme, strings: strings, sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, account: account, peerMode: .peer, peer: .peer(peer: peer, chatPeer: peer), status: status, enabled: true, selection: selection, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: ChatListSearchItemHeader(type: .contacts, theme: theme, strings: strings, actionTitle: nil, action: nil), action: { _ in - interaction.toggleContact(id) - }) + case let .option(_, option, theme, _): + return ContactListActionItem(theme: theme, title: option.title, icon: option.icon, header: nil, action: option.action) + case let .peer(_, id, contact, count, selection, theme, strings, nameSortOrder, nameDisplayOrder): + let status: ContactsPeerItemStatus + if count != 0 { + status = .custom(strings.Contacts_ImportersCount(count)) + } else { + status = .none + } + let peer = TelegramUser(id: PeerId(namespace: -1, id: 0), accessHash: nil, firstName: contact.firstName, lastName: contact.lastName, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) + return ContactsPeerItem(theme: theme, strings: strings, sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, account: account, peerMode: .peer, peer: .peer(peer: peer, chatPeer: peer), status: status, enabled: true, selection: selection, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: ChatListSearchItemHeader(type: .contacts, theme: theme, strings: strings, actionTitle: nil, action: nil), action: { _ in + interaction.toggleContact(id) + }) } } static func ==(lhs: InviteContactsEntry, rhs: InviteContactsEntry) -> Bool { switch lhs { - case let .search(lhsTheme, lhsStrings): - if case let .search(rhsTheme, rhsStrings) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings { - return true - } else { - return false - } case let .option(lhsIndex, lhsOption, lhsTheme, lhsStrings): if case let .option(rhsIndex, rhsOption, rhsTheme, rhsStrings) = rhs, lhsIndex == rhsIndex, lhsOption == rhsOption, lhsTheme === rhsTheme, lhsStrings === rhsStrings { return true @@ -117,61 +92,57 @@ private enum InviteContactsEntry: Comparable, Identifiable { } case let .peer(lhsIndex, lhsId, lhsContact, lhsCount, lhsSelection, lhsTheme, lhsStrings, lhsSortOrder, lhsDisplayOrder): switch rhs { - case let .peer(rhsIndex, rhsId, rhsContact, rhsCount, rhsSelection, rhsTheme, rhsStrings, rhsSortOrder, rhsDisplayOrder): - if lhsIndex != rhsIndex { + case let .peer(rhsIndex, rhsId, rhsContact, rhsCount, rhsSelection, rhsTheme, rhsStrings, rhsSortOrder, rhsDisplayOrder): + if lhsIndex != rhsIndex { + return false + } + if lhsId != rhsId { + return false + } + if lhsContact != rhsContact { + return false + } + if lhsCount != rhsCount { + return false + } + if lhsSelection != rhsSelection { + return false + } + if lhsTheme !== rhsTheme { + return false + } + if lhsStrings !== rhsStrings { + return false + } + if lhsSortOrder != rhsSortOrder { + return false + } + if lhsDisplayOrder != rhsDisplayOrder { + return false + } + return true + default: return false - } - if lhsId != rhsId { - return false - } - if lhsContact != rhsContact { - return false - } - if lhsCount != rhsCount { - return false - } - if lhsSelection != rhsSelection { - return false - } - if lhsTheme !== rhsTheme { - return false - } - if lhsStrings !== rhsStrings { - return false - } - if lhsSortOrder != rhsSortOrder { - return false - } - if lhsDisplayOrder != rhsDisplayOrder { - return false - } - return true - default: - return false } } } static func <(lhs: InviteContactsEntry, rhs: InviteContactsEntry) -> Bool { switch lhs { - case .search: - return true - case let .option(lhsIndex, _, _, _): - switch rhs { - case .search: - return false - case let .option(rhsIndex, _, _, _): - return lhsIndex < rhsIndex - case .peer: - return true - } - case let .peer(lhsIndex, _, _, _, _, _, _, _, _): - switch rhs { - case .search, .option: - return false - case let .peer(rhsIndex, _, _, _, _, _, _, _, _): - return lhsIndex < rhsIndex - } + case let .option(lhsIndex, _, _, _): + switch rhs { + case let .option(rhsIndex, _, _, _): + return lhsIndex < rhsIndex + case .peer: + return true + } + case let .peer(lhsIndex, _, _, _, _, _, _, _, _): + switch rhs { + case .option: + return false + case let .peer(rhsIndex, _, _, _, _, _, _, _, _): + return lhsIndex < rhsIndex + } } } } @@ -261,7 +232,7 @@ final class InviteContactsControllerNode: ASDisplayNode { private let account: Account private var searchDisplayController: SearchDisplayController? - private var validLayout: (ContainerViewLayout, CGFloat)? + private var validLayout: (ContainerViewLayout, CGFloat, CGFloat)? var navigationBar: NavigationBar? @@ -280,8 +251,8 @@ final class InviteContactsControllerNode: ASDisplayNode { self.selectionStatePromise.set(.single(self.selectionState)) self.countPanelNode.badge = "\(self.selectionState.selectedContactIndices.count)" if oldValue.selectedContactIndices.isEmpty != self.selectionState.selectedContactIndices.isEmpty { - if let (layout, navigationHeight) = self.validLayout { - self.containerLayoutUpdated(layout, navigationBarHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring)) + if let (layout, navigationHeight, actualNavigationHeight) = self.validLayout { + self.containerLayoutUpdated(layout, navigationBarHeight: navigationHeight, actualNavigationBarHeight: actualNavigationHeight, transition: .animated(duration: 0.3, curve: .spring)) } } } @@ -359,9 +330,7 @@ final class InviteContactsControllerNode: ASDisplayNode { let themeAndStringsPromise = self.themeAndStringsPromise let previousEntries = Atomic<[InviteContactsEntry]?>(value: nil) - let interaction = InviteContactsInteraction(activateSearch: { [weak self] in - self?.requestActivateSearch?() - }, toggleContact: { [weak self] id in + let interaction = InviteContactsInteraction(toggleContact: { [weak self] id in if let strongSelf = self { strongSelf.selectionState = strongSelf.selectionState.withToggledContactId(id) } @@ -479,17 +448,16 @@ final class InviteContactsControllerNode: ASDisplayNode { private func updateThemeAndStrings() { self.backgroundColor = self.presentationData.theme.chatList.backgroundColor - - self.searchDisplayController?.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings) + self.searchDisplayController?.updatePresentationData(self.presentationData) } func scrollToTop() { self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) } - func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, actualNavigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { let hadValidLayout = self.validLayout != nil - self.validLayout = (layout, navigationBarHeight) + self.validLayout = (layout, navigationBarHeight, actualNavigationBarHeight) var insets = layout.insets(options: [.input]) insets.top += navigationBarHeight @@ -501,6 +469,9 @@ final class InviteContactsControllerNode: ASDisplayNode { insets.left += layout.safeInsets.left insets.right += layout.safeInsets.right + var headerInsets = layout.insets(options: [.input]) + headerInsets.top += actualNavigationBarHeight + let countPanelHeight = self.countPanelNode.updateLayout(width: layout.size.width, bottomInset: layout.intrinsicInsets.bottom, transition: transition) if self.selectionState.selectedContactIndices.isEmpty { transition.updateFrame(node: self.countPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height), size: CGSize(width: layout.size.width, height: countPanelHeight))) @@ -534,7 +505,7 @@ final class InviteContactsControllerNode: ASDisplayNode { listViewCurve = .Default(duration: nil) } - let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: layout.size, insets: insets, duration: duration, curve: listViewCurve) + let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: layout.size, insets: insets, headerInsets: headerInsets, duration: duration, curve: listViewCurve) self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) @@ -544,11 +515,11 @@ final class InviteContactsControllerNode: ASDisplayNode { } func activateSearch(placeholderNode: SearchBarPlaceholderNode) { - guard let (containerLayout, navigationBarHeight) = self.validLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else { + guard let (containerLayout, navigationBarHeight, _) = self.validLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else { return } - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: false, categories: [.deviceContacts], openPeer: { _ in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: false, categories: [.deviceContacts], openPeer: { _ in }), cancel: { [weak self] in if let requestDeactivateSearch = self?.requestDeactivateSearch { requestDeactivateSearch() diff --git a/TelegramUI/LocalizationListController.swift b/TelegramUI/LocalizationListController.swift index 585ae759fb..dd93cc6970 100644 --- a/TelegramUI/LocalizationListController.swift +++ b/TelegramUI/LocalizationListController.swift @@ -119,9 +119,6 @@ public class LocalizationListController: ViewController { }, present: { [weak self] c, a in self?.present(c, in: .window(.root), with: a) }) - self._ready.set(self.controllerNode._ready.get()) - - self.displayNodeDidLoad() self.controllerNode.listNode.visibleContentOffsetChanged = { [weak self] offset in if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode { @@ -134,6 +131,10 @@ public class LocalizationListController: ViewController { let _ = fixNavigationSearchableListNodeScrolling(strongSelf.controllerNode.listNode, searchNode: searchContentNode) } } + + self._ready.set(self.controllerNode._ready.get()) + + self.displayNodeDidLoad() } override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { diff --git a/TelegramUI/LocalizationListControllerNode.swift b/TelegramUI/LocalizationListControllerNode.swift index abb1f69add..3cff315520 100644 --- a/TelegramUI/LocalizationListControllerNode.swift +++ b/TelegramUI/LocalizationListControllerNode.swift @@ -21,13 +21,10 @@ private enum LanguageListEntryType { } private enum LanguageListEntry: Comparable, Identifiable { - case search(Int) case localization(index: Int, info: LocalizationInfo, type: LanguageListEntryType, selected: Bool, activity: Bool, revealed: Bool, editing: Bool) var stableId: LanguageListEntryId { switch self { - case .search: - return .search case let .localization(_, info, _, _, _, _, _): return .localization(info.languageCode) } @@ -35,8 +32,6 @@ private enum LanguageListEntry: Comparable, Identifiable { private func index() -> Int { switch self { - case let .search(index): - return index case let .localization(index, _, _, _, _, _, _): return index } @@ -48,10 +43,6 @@ private enum LanguageListEntry: Comparable, Identifiable { func item(theme: PresentationTheme, strings: PresentationStrings, searchMode: Bool, openSearch: @escaping () -> Void, selectLocalization: @escaping (LocalizationInfo) -> Void, setItemWithRevealedOptions: @escaping (String?, String?) -> Void, removeItem: @escaping (String) -> Void) -> ListViewItem { switch self { - case .search: - return ChatListSearchItem(theme: theme, placeholder: strings.Common_Search, activate: { - openSearch() - }) case let .localization(_, info, type, selected, activity, revealed, editing): return LocalizationListItem(theme: theme, strings: strings, id: info.languageCode, title: info.title, subtitle: info.localizedTitle, checked: selected, activity: activity, editing: LocalizationListItemEditing(editable: !selected && !searchMode && !info.isOfficial, editing: editing, revealed: !selected && revealed, reorderable: false), sectionId: type == .official ? LanguageListSection.official.rawValue : LanguageListSection.unofficial.rawValue, alwaysPlain: searchMode, action: { selectLocalization(info) @@ -178,7 +169,7 @@ private final class LocalizationListSearchContainerNode: SearchDisplayController self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) } - private func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) { + func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) { self.listNode.backgroundColor = theme.chatList.backgroundColor } @@ -380,7 +371,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode { var existingIds = Set() if let localizationListState = (view.views[preferencesKey] as? PreferencesView)?.values[PreferencesKeys.localizationListState] as? LocalizationListState, !localizationListState.availableOfficialLocalizations.isEmpty { strongSelf.currentListState = localizationListState - //entries.append(.search(entries.count)) + let availableSavedLocalizations = localizationListState.availableSavedLocalizations.filter({ info in !localizationListState.availableOfficialLocalizations.contains(where: { $0.languageCode == info.languageCode }) }) if availableSavedLocalizations.isEmpty { updateCanStartEditing(nil) @@ -422,7 +413,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode { self.presentationDataValue.set(.single((presentationData.theme, presentationData.strings))) self.backgroundColor = presentationData.theme.list.blocksBackgroundColor self.listNode.keepTopItemOverscrollBackground = ListViewKeepTopItemOverscrollBackground(color: presentationData.theme.chatList.backgroundColor, direction: true) - self.searchDisplayController?.updateThemeAndStrings(theme: self.presentationData.theme, strings: presentationData.strings) + self.searchDisplayController?.updatePresentationData(presentationData) } func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { @@ -555,7 +546,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode { return } - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: LocalizationListSearchContainerNode(account: self.account, listState: self.currentListState ?? LocalizationListState.defaultSettings, selectLocalization: { [weak self] info in self?.selectLocalization(info) }, applyingCode: self.applyingCode.get()), cancel: { [weak self] in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: LocalizationListSearchContainerNode(account: self.account, listState: self.currentListState ?? LocalizationListState.defaultSettings, selectLocalization: { [weak self] info in self?.selectLocalization(info) }, applyingCode: self.applyingCode.get()), cancel: { [weak self] in self?.requestDeactivateSearch() }) @@ -565,7 +556,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode { if isSearchBar { strongPlaceholderNode.supernode?.insertSubnode(subnode, aboveSubnode: strongPlaceholderNode) } else { - strongSelf.insertSubnode(subnode, belowSubnode: navigationBar) + strongSelf.insertSubnode(subnode, belowSubnode: strongSelf.navigationBar) } } }, placeholder: placeholderNode) @@ -579,6 +570,6 @@ final class LocalizationListControllerNode: ViewControllerTracingNode { } func scrollToTop() { - self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: 0.3), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) } } diff --git a/TelegramUI/NativeVideoContent.swift b/TelegramUI/NativeVideoContent.swift index 83fd9dbb61..9c201d1ac2 100644 --- a/TelegramUI/NativeVideoContent.swift +++ b/TelegramUI/NativeVideoContent.swift @@ -198,7 +198,7 @@ private final class NativeVideoContentNode: ASDisplayNode, UniversalVideoContent self._bufferingStatus.set(.single(nil)) } - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } } diff --git a/TelegramUI/NavigationBarSearchContentNode.swift b/TelegramUI/NavigationBarSearchContentNode.swift index 0cbcaa5add..18eb2247ea 100644 --- a/TelegramUI/NavigationBarSearchContentNode.swift +++ b/TelegramUI/NavigationBarSearchContentNode.swift @@ -10,6 +10,7 @@ class NavigationBarSearchContentNode: NavigationBarContentNode { var placeholder: String let placeholderNode: SearchBarPlaceholderNode + var placeholderHeight: CGFloat? private var disabledOverlay: ASDisplayNode? private(set) var expansionProgress: CGFloat = 1.0 @@ -43,6 +44,8 @@ class NavigationBarSearchContentNode: NavigationBarContentNode { switch offset { case let .known(offset): progress = max(0.0, (self.nominalHeight - offset)) / self.nominalHeight + case .none: + progress = 1.0 default: break } @@ -54,7 +57,7 @@ class NavigationBarSearchContentNode: NavigationBarContentNode { if newProgress != self.expansionProgress { self.expansionProgress = newProgress - let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.25, curve: .easeInOut) : .immediate + let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate if let validLayout = self.validLayout, animated { self.updatePlaceholder(self.expansionProgress, size: validLayout.0, leftInset: validLayout.1, rightInset: validLayout.2, transition: transition) } @@ -74,7 +77,12 @@ class NavigationBarSearchContentNode: NavigationBarContentNode { } if let disabledOverlay = self.disabledOverlay { disabledOverlay.backgroundColor = self.theme?.rootController.navigationBar.backgroundColor.withAlphaComponent(0.4) - disabledOverlay.frame = placeholderNode.frame + + var disabledOverlayFrame = self.placeholderNode.frame + if let searchBarHeight = self.placeholderHeight { + disabledOverlayFrame.size.height = searchBarHeight + } + disabledOverlay.frame = disabledOverlayFrame } } else if let disabledOverlay = self.disabledOverlay { self.disabledOverlay = nil @@ -96,12 +104,19 @@ class NavigationBarSearchContentNode: NavigationBarContentNode { let fraction = fieldHeight / self.nominalHeight let visibleProgress = max(0.0, self.expansionProgress - 1.0 + fraction) / fraction - let makeLayout = self.placeholderNode.asyncLayout() - let applyLayout = makeLayout(NSAttributedString(string: self.placeholder, font: searchBarFont, textColor: self.theme?.rootController.activeNavigationSearchBar.inputPlaceholderTextColor ?? UIColor(rgb: 0x8e8e93)), CGSize(width: baseWidth, height: fieldHeight), visibleProgress, self.theme?.rootController.activeNavigationSearchBar.inputPlaceholderTextColor ?? UIColor(rgb: 0x8e8e93), self.theme?.rootController.activeNavigationSearchBar.inputFillColor ?? .clear, self.theme?.rootController.navigationBar.backgroundColor ?? .clear, transition) - applyLayout() + let searchBarNodeLayout = self.placeholderNode.asyncLayout() + let (searchBarHeight, searchBarApply) = searchBarNodeLayout(NSAttributedString(string: self.placeholder, font: searchBarFont, textColor: self.theme?.rootController.activeNavigationSearchBar.inputPlaceholderTextColor ?? UIColor(rgb: 0x8e8e93)), CGSize(width: baseWidth, height: fieldHeight), visibleProgress, self.theme?.rootController.activeNavigationSearchBar.inputPlaceholderTextColor ?? UIColor(rgb: 0x8e8e93), self.theme?.rootController.activeNavigationSearchBar.inputFillColor ?? .clear, self.theme?.rootController.navigationBar.backgroundColor ?? .clear, transition) + searchBarApply() let searchBarFrame = CGRect(origin: CGPoint(x: padding + leftInset, y: 8.0), size: CGSize(width: baseWidth, height: fieldHeight)) transition.updateFrame(node: self.placeholderNode, frame: searchBarFrame) + + self.placeholderHeight = searchBarHeight + if let disabledOverlay = self.disabledOverlay { + var disabledOverlayFrame = self.placeholderNode.frame + disabledOverlayFrame.size.height = searchBarHeight + transition.updateFrame(node: disabledOverlay, frame: disabledOverlayFrame) + } } override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition) { diff --git a/TelegramUI/NotificationExceptionControllerNode.swift b/TelegramUI/NotificationExceptionControllerNode.swift index 043e568c3f..8237b54bcf 100644 --- a/TelegramUI/NotificationExceptionControllerNode.swift +++ b/TelegramUI/NotificationExceptionControllerNode.swift @@ -29,6 +29,7 @@ private final class NotificationExceptionState : Equatable { func withUpdatedEditing(_ editing: Bool) -> NotificationExceptionState { return NotificationExceptionState(mode: self.mode, isSearchMode: self.isSearchMode, revealedPeerId: self.revealedPeerId, editing: editing) } + func withUpdatedRevealedPeerId(_ revealedPeerId: PeerId?) -> NotificationExceptionState { return NotificationExceptionState(mode: self.mode, isSearchMode: self.isSearchMode, revealedPeerId: revealedPeerId, editing: self.editing) } @@ -36,17 +37,16 @@ private final class NotificationExceptionState : Equatable { func withUpdatedPeerSound(_ peer: Peer, _ sound: PeerMessageSound) -> NotificationExceptionState { return NotificationExceptionState(mode: mode.withUpdatedPeerSound(peer, sound), isSearchMode: isSearchMode, revealedPeerId: self.revealedPeerId, editing: self.editing) } + func withUpdatedPeerMuteInterval(_ peer: Peer, _ muteInterval: Int32?) -> NotificationExceptionState { return NotificationExceptionState(mode: mode.withUpdatedPeerMuteInterval(peer, muteInterval), isSearchMode: isSearchMode, revealedPeerId: self.revealedPeerId, editing: self.editing) } - static func == (lhs: NotificationExceptionState, rhs: NotificationExceptionState) -> Bool { return lhs.mode == rhs.mode && lhs.isSearchMode == rhs.isSearchMode && lhs.revealedPeerId == rhs.revealedPeerId && lhs.editing == rhs.editing } } - public struct NotificationExceptionWrapper : Equatable { let settings: TelegramPeerNotificationSettings let date: TimeInterval? @@ -78,31 +78,31 @@ public struct NotificationExceptionWrapper : Equatable { public enum NotificationExceptionMode : Equatable { public static func == (lhs: NotificationExceptionMode, rhs: NotificationExceptionMode) -> Bool { switch lhs { - case let .users(lhsValue): - if case let .users(rhsValue) = rhs { - return lhsValue == rhsValue - } else { - return false - } - case let .groups(lhsValue): - if case let .groups(rhsValue) = rhs { - return lhsValue == rhsValue - } else { - return false - } - case let .channels(lhsValue): - if case let .channels(rhsValue) = rhs { - return lhsValue == rhsValue - } else { - return false - } + case let .users(lhsValue): + if case let .users(rhsValue) = rhs { + return lhsValue == rhsValue + } else { + return false + } + case let .groups(lhsValue): + if case let .groups(rhsValue) = rhs { + return lhsValue == rhsValue + } else { + return false + } + case let .channels(lhsValue): + if case let .channels(rhsValue) = rhs { + return lhsValue == rhsValue + } else { + return false + } } } var isEmpty: Bool { switch self { - case let .users(value), let .groups(value), let .channels(value): - return value.isEmpty + case let .users(value), let .groups(value), let .channels(value): + return value.isEmpty } } @@ -115,34 +115,34 @@ public enum NotificationExceptionMode : Equatable { var values = values if let value = values[peerId] { switch sound { - case .default: - switch value.settings.muteState { case .default: - values.removeValue(forKey: peerId) + switch value.settings.muteState { + case .default: + values.removeValue(forKey: peerId) + default: + values[peerId] = value.updateSettings({$0.withUpdatedMessageSound(sound)}).withUpdatedDate(Date().timeIntervalSince1970) + } default: values[peerId] = value.updateSettings({$0.withUpdatedMessageSound(sound)}).withUpdatedDate(Date().timeIntervalSince1970) - } - default: - values[peerId] = value.updateSettings({$0.withUpdatedMessageSound(sound)}).withUpdatedDate(Date().timeIntervalSince1970) } } else { switch sound { - case .default: - break - default: - values[peerId] = NotificationExceptionWrapper(settings: TelegramPeerNotificationSettings(muteState: .default, messageSound: sound), peer: peer, date: Date().timeIntervalSince1970) + case .default: + break + default: + values[peerId] = NotificationExceptionWrapper(settings: TelegramPeerNotificationSettings(muteState: .default, messageSound: sound), peer: peer, date: Date().timeIntervalSince1970) } } return values } switch self { - case let .groups(values): - return .groups(apply(values, peer.id, sound)) - case let .users(values): - return .users(apply(values, peer.id, sound)) - case let .channels(values): - return .channels(apply(values, peer.id, sound)) + case let .groups(values): + return .groups(apply(values, peer.id, sound)) + case let .users(values): + return .users(apply(values, peer.id, sound)) + case let .channels(values): + return .channels(apply(values, peer.id, sound)) } } @@ -151,22 +151,22 @@ public enum NotificationExceptionMode : Equatable { var values = values if let value = values[peerId] { switch muteState { - case .default: - switch value.settings.messageSound { case .default: - values.removeValue(forKey: peerId) + switch value.settings.messageSound { + case .default: + values.removeValue(forKey: peerId) + default: + values[peerId] = value.updateSettings({$0.withUpdatedMuteState(muteState)}).withUpdatedDate(Date().timeIntervalSince1970) + } default: values[peerId] = value.updateSettings({$0.withUpdatedMuteState(muteState)}).withUpdatedDate(Date().timeIntervalSince1970) - } - default: - values[peerId] = value.updateSettings({$0.withUpdatedMuteState(muteState)}).withUpdatedDate(Date().timeIntervalSince1970) } } else { switch muteState { - case .default: - break - default: - values[peerId] = NotificationExceptionWrapper(settings: TelegramPeerNotificationSettings(muteState: muteState, messageSound: .default), peer: peer, date: Date().timeIntervalSince1970) + case .default: + break + default: + values[peerId] = NotificationExceptionWrapper(settings: TelegramPeerNotificationSettings(muteState: muteState, messageSound: .default), peer: peer, date: Date().timeIntervalSince1970) } } return values @@ -189,14 +189,13 @@ public enum NotificationExceptionMode : Equatable { muteState = .default } switch self { - case let .groups(values): - return .groups(apply(values, peer.id, muteState)) - case let .users(values): - return .users(apply(values, peer.id, muteState)) - case let .channels(values): - return .channels(apply(values, peer.id, muteState)) + case let .groups(values): + return .groups(apply(values, peer.id, muteState)) + case let .users(values): + return .users(apply(values, peer.id, muteState)) + case let .channels(values): + return .channels(apply(values, peer.id, muteState)) } - } var peerIds: [PeerId] { @@ -218,13 +217,9 @@ private func notificationsExceptionEntries(presentationData: PresentationData, s var entries: [NotificationExceptionEntry] = [] if !state.isSearchMode { - //if !state.mode.settings.isEmpty { - // entries.append(.search(presentationData.theme, presentationData.strings)) - //} entries.append(.addException(presentationData.theme, presentationData.strings, state.editing)) } - var index: Int = 0 for (_, value) in state.mode.settings.filter({ (_, value) in if let query = query, !query.isEmpty { @@ -257,38 +252,38 @@ private func notificationsExceptionEntries(presentationData: PresentationData, s if !value.peer.displayTitle.isEmpty { var title: String switch value.settings.muteState { - case let .muted(until): - if until >= Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970) { - if until < Int32.max - 1 { - let formatter = DateFormatter() - formatter.locale = Locale(identifier: presentationData.strings.baseLanguageCode) - - if Calendar.current.isDateInToday(Date(timeIntervalSince1970: Double(until))) { - formatter.dateFormat = "HH:mm" + case let .muted(until): + if until >= Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970) { + if until < Int32.max - 1 { + let formatter = DateFormatter() + formatter.locale = Locale(identifier: presentationData.strings.baseLanguageCode) + + if Calendar.current.isDateInToday(Date(timeIntervalSince1970: Double(until))) { + formatter.dateFormat = "HH:mm" + } else { + formatter.dateFormat = "E, d MMM HH:mm" + } + + let dateString = formatter.string(from: Date(timeIntervalSince1970: Double(until))) + + title = presentationData.strings.Notification_Exceptions_MutedUntil(dateString).0 } else { - formatter.dateFormat = "E, d MMM HH:mm" + title = presentationData.strings.Notification_Exceptions_AlwaysOff } - - let dateString = formatter.string(from: Date(timeIntervalSince1970: Double(until))) - - title = presentationData.strings.Notification_Exceptions_MutedUntil(dateString).0 } else { - title = presentationData.strings.Notification_Exceptions_AlwaysOff + title = presentationData.strings.Notification_Exceptions_AlwaysOn } - } else { + case .unmuted: title = presentationData.strings.Notification_Exceptions_AlwaysOn - } - case .unmuted: - title = presentationData.strings.Notification_Exceptions_AlwaysOn - default: - title = "" + default: + title = "" } switch value.settings.messageSound { - case .default: - break - default: - let soundName = localizedPeerNotificationSoundString(strings: presentationData.strings, sound: value.settings.messageSound) - title += (title.isEmpty ? presentationData.strings.Notification_Exceptions_Sound(soundName).0 : ", \(presentationData.strings.Notification_Exceptions_Sound(soundName).0)") + case .default: + break + default: + let soundName = localizedPeerNotificationSoundString(strings: presentationData.strings, sound: value.settings.messageSound) + title += (title.isEmpty ? presentationData.strings.Notification_Exceptions_Sound(soundName).0 : ", \(presentationData.strings.Notification_Exceptions_Sound(soundName).0)") } entries.append(.peer(index: index, peer: value.peer, theme: presentationData.theme, strings: presentationData.strings, dateFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, description: title, notificationSettings: value.settings, revealed: state.revealedPeerId == value.peer.id, editing: state.editing)) index += 1 @@ -305,6 +300,7 @@ private final class NotificationExceptionArguments { let selectPeer: ()->Void let updateRevealedPeerId:(PeerId?)->Void let deletePeer:(Peer) -> Void + init(account: Account, activateSearch:@escaping() -> Void, openPeer: @escaping(Peer) -> Void, selectPeer: @escaping()->Void, updateRevealedPeerId:@escaping(PeerId?)->Void, deletePeer: @escaping(Peer) -> Void) { self.account = account self.activateSearch = activateSearch @@ -315,7 +311,6 @@ private final class NotificationExceptionArguments { } } - private enum NotificationExceptionEntryId: Hashable { case search case peerId(Int64) @@ -338,27 +333,27 @@ private enum NotificationExceptionEntryId: Hashable { static func ==(lhs: NotificationExceptionEntryId, rhs: NotificationExceptionEntryId) -> Bool { switch lhs { - case .search: - switch rhs { case .search: - return true - default: - return false - } - case .addException: - switch rhs { + switch rhs { + case .search: + return true + default: + return false + } case .addException: - return true - default: - return false - } - case let .peerId(lhsId): - switch rhs { - case let .peerId(rhsId): - return lhsId == rhsId - default: - return false - } + switch rhs { + case .addException: + return true + default: + return false + } + case let .peerId(lhsId): + switch rhs { + case let .peerId(rhsId): + return lhsId == rhsId + default: + return false + } } } } @@ -368,8 +363,6 @@ private enum NotificationExceptionSectionId : ItemListSectionId { } private enum NotificationExceptionEntry : ItemListNodeEntry { - - var section: ItemListSectionId { return NotificationExceptionSectionId.general.rawValue } @@ -382,87 +375,84 @@ private enum NotificationExceptionEntry : ItemListNodeEntry { func item(_ arguments: NotificationExceptionArguments) -> ListViewItem { switch self { - case let .search(theme, strings): - return NotificationSearchItem(theme: theme, placeholder: strings.Common_Search, activate: { - arguments.activateSearch() - }) - case let .addException(theme, strings, editing): - return ItemListPeerActionItem(theme: theme, icon: PresentationResourcesItemList.addExceptionIcon(theme), title: strings.Notification_Exceptions_AddException, alwaysPlain: true, sectionId: self.section, editing: editing, action: { - arguments.selectPeer() - }) - case let .peer(_, peer, theme, strings, dateTimeFormat, nameDisplayOrder, value, _, revealed, editing): - return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.account, peer: peer, presence: nil, text: .text(value), label: .none, editing: ItemListPeerItemEditing(editable: true, editing: editing, revealed: revealed), switchValue: nil, enabled: true, sectionId: self.section, action: { - arguments.openPeer(peer) - }, setPeerIdWithRevealedOptions: { peerId, fromPeerId in - arguments.updateRevealedPeerId(peerId) - }, removePeer: { peerId in - arguments.deletePeer(peer) - }, hasTopStripe: false, hasTopGroupInset: false) + case let .search(theme, strings): + return NotificationSearchItem(theme: theme, placeholder: strings.Common_Search, activate: { + arguments.activateSearch() + }) + case let .addException(theme, strings, editing): + return ItemListPeerActionItem(theme: theme, icon: PresentationResourcesItemList.addExceptionIcon(theme), title: strings.Notification_Exceptions_AddException, alwaysPlain: true, sectionId: self.section, editing: editing, action: { + arguments.selectPeer() + }) + case let .peer(_, peer, theme, strings, dateTimeFormat, nameDisplayOrder, value, _, revealed, editing): + return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.account, peer: peer, presence: nil, text: .text(value), label: .none, editing: ItemListPeerItemEditing(editable: true, editing: editing, revealed: revealed), switchValue: nil, enabled: true, sectionId: self.section, action: { + arguments.openPeer(peer) + }, setPeerIdWithRevealedOptions: { peerId, fromPeerId in + arguments.updateRevealedPeerId(peerId) + }, removePeer: { peerId in + arguments.deletePeer(peer) + }, hasTopStripe: false, hasTopGroupInset: false) } } var stableId: NotificationExceptionEntryId { switch self { - case .search: - return .search - case .addException: - return .addException - case let .peer(_, peer, _, _, _, _, _, _, _, _): - return .peerId(peer.id.toInt64()) + case .search: + return .search + case .addException: + return .addException + case let .peer(_, peer, _, _, _, _, _, _, _, _): + return .peerId(peer.id.toInt64()) } } static func == (lhs: NotificationExceptionEntry, rhs: NotificationExceptionEntry) -> Bool { switch lhs { - case let .search(lhsTheme, lhsStrings): - switch rhs { - case let .search(rhsTheme, rhsStrings): - return lhsTheme === rhsTheme && lhsStrings === rhsStrings - default: - return false - } - case let .addException(lhsTheme, lhsStrings, lhsEditing): - switch rhs { - case let .addException(rhsTheme, rhsStrings, rhsEditing): - return lhsTheme === rhsTheme && lhsStrings === rhsStrings && lhsEditing == rhsEditing - default: - return false - } - case let .peer(lhsIndex, lhsPeer, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsNameOrder, lhsValue, lhsSettings, lhsRevealed, lhsEditing): - switch rhs { - case let .peer(rhsIndex, rhsPeer, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsNameOrder, rhsValue, rhsSettings, rhsRevealed, rhsEditing): - return lhsTheme === rhsTheme && lhsStrings === rhsStrings && lhsDateTimeFormat == rhsDateTimeFormat && lhsNameOrder == rhsNameOrder && lhsIndex == rhsIndex && lhsPeer.isEqual(rhsPeer) && lhsValue == rhsValue && lhsSettings == rhsSettings && lhsRevealed == rhsRevealed && lhsEditing == rhsEditing - default: - return false - } + case let .search(lhsTheme, lhsStrings): + switch rhs { + case let .search(rhsTheme, rhsStrings): + return lhsTheme === rhsTheme && lhsStrings === rhsStrings + default: + return false + } + case let .addException(lhsTheme, lhsStrings, lhsEditing): + switch rhs { + case let .addException(rhsTheme, rhsStrings, rhsEditing): + return lhsTheme === rhsTheme && lhsStrings === rhsStrings && lhsEditing == rhsEditing + default: + return false + } + case let .peer(lhsIndex, lhsPeer, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsNameOrder, lhsValue, lhsSettings, lhsRevealed, lhsEditing): + switch rhs { + case let .peer(rhsIndex, rhsPeer, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsNameOrder, rhsValue, rhsSettings, rhsRevealed, rhsEditing): + return lhsTheme === rhsTheme && lhsStrings === rhsStrings && lhsDateTimeFormat == rhsDateTimeFormat && lhsNameOrder == rhsNameOrder && lhsIndex == rhsIndex && lhsPeer.isEqual(rhsPeer) && lhsValue == rhsValue && lhsSettings == rhsSettings && lhsRevealed == rhsRevealed && lhsEditing == rhsEditing + default: + return false + } } } static func <(lhs: NotificationExceptionEntry, rhs: NotificationExceptionEntry) -> Bool { switch lhs { - case .search: - return true - case .addException: - switch rhs { - case .search, .addException: - return false - default: + case .search: return true - } - case let .peer(lhsIndex, _, _, _, _, _, _, _, _, _): - switch rhs { - case .search, .addException: - return false - case let .peer(rhsIndex, _, _, _, _, _, _, _, _, _): - return lhsIndex < rhsIndex - } + case .addException: + switch rhs { + case .search, .addException: + return false + default: + return true + } + case let .peer(lhsIndex, _, _, _, _, _, _, _, _, _): + switch rhs { + case .search, .addException: + return false + case let .peer(rhsIndex, _, _, _, _, _, _, _, _, _): + return lhsIndex < rhsIndex + } } } } - - - private struct NotificationExceptionNodeTransition { let deletions: [ListViewDeleteItem] let insertions: [ListViewInsertItem] @@ -484,12 +474,12 @@ private func preparedExceptionsListNodeTransition(theme: PresentationTheme, stri private extension PeerMuteState { var timeInterval: Int32? { switch self { - case .default: - return nil - case .unmuted: - return 0 - case let .muted(until): - return until + case .default: + return nil + case .unmuted: + return 0 + case let .muted(until): + return until } } } @@ -505,8 +495,8 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { private var didSetReady = false let _ready = ValuePromise() - private var containerLayout: (ContainerViewLayout, CGFloat)? - private let listNode: ListView + private var containerLayout: (ContainerViewLayout, CGFloat, CGFloat)? + let listNode: ListView private var queuedTransitions: [NotificationExceptionNodeTransition] = [] private var searchDisplayController: SearchDisplayController? @@ -516,7 +506,7 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { private var arguments: NotificationExceptionArguments? private let stateValue: Atomic - private let statePromise:ValuePromise = ValuePromise(ignoreRepeated: true) + private let statePromise: ValuePromise = ValuePromise(ignoreRepeated: true) private let navigationActionDisposable = MetaDisposable() private let updateNotificationsDisposable = MetaDisposable() @@ -539,11 +529,8 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { //self.listNode.keepBottomItemOverscrollBackground = presentationData.theme.chatList.backgroundColor super.init() - let stateValue = self.stateValue let statePromise = self.statePromise - - statePromise.set(NotificationExceptionState(mode: mode)) let updateState: ((NotificationExceptionState) -> NotificationExceptionState) -> Void = { f in @@ -555,7 +542,6 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { let updateNotificationsDisposable = self.updateNotificationsDisposable var peerIds: Set = Set(mode.peerIds) - let updateNotificationsView:()->Void = { updateState { current in peerIds = peerIds.union(current.mode.peerIds) @@ -584,15 +570,12 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { })) return current } - } - updateNotificationsView() - + updateNotificationsView() var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments?) -> Void)? - let presentationData = account.telegramApplicationContext.currentPresentationData.modify {$0} let updatePeerSound: (PeerId, PeerMessageSound) -> Signal = { peerId, sound in @@ -603,7 +586,6 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { return updatePeerMuteSetting(account: account, peerId: peerId, muteInterval: muteInterval) |> deliverOnMainQueue } - self.backgroundColor = presentationData.theme.list.blocksBackgroundColor self.addSubnode(self.listNode) @@ -611,10 +593,6 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { requestActivateSearch() } - - - - let arguments = NotificationExceptionArguments(account: account, activateSearch: { openSearch() }, openPeer: { [weak self] peer in @@ -636,14 +614,14 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { }, selectPeer: { var filter: ChatListNodePeersFilter = [.excludeRecent, .doNotSearchMessages, .removeSearchHeader] switch mode { - case .groups: - filter.insert(.onlyGroups) - case .users: - filter.insert(.onlyPrivateChats) - filter.insert(.excludeSavedMessages) - filter.insert(.excludeSecretChats) - case .channels: - filter.insert(.onlyChannels) + case .groups: + filter.insert(.onlyGroups) + case .users: + filter.insert(.onlyPrivateChats) + filter.insert(.excludeSavedMessages) + filter.insert(.excludeSecretChats) + case .channels: + filter.insert(.onlyChannels) } let controller = PeerSelectionController(account: account, filter: filter, hasContactSelector: false, title: presentationData.strings.Notifications_AddExceptionTitle) controller.peerSelected = { [weak controller] peerId in @@ -702,10 +680,9 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { let preferences = account.postbox.preferencesView(keys: [PreferencesKeys.globalNotifications]) - let previousEntriesHolder = Atomic<([NotificationExceptionEntry], PresentationTheme, PresentationStrings)?>(value: nil) - listDisposable = (combineLatest((account.applicationContext as! TelegramApplicationContext).presentationData, statePromise.get(), preferences) |> deliverOnMainQueue).start(next: { [weak self] (presentationData, state, prefs) in + self.listDisposable = (combineLatest((account.applicationContext as! TelegramApplicationContext).presentationData, statePromise.get(), preferences) |> deliverOnMainQueue).start(next: { [weak self] (presentationData, state, prefs) in let entries = notificationsExceptionEntries(presentationData: presentationData, state: state) let previousEntriesAndPresentationData = previousEntriesHolder.swap((entries, presentationData.theme, presentationData.strings)) @@ -722,8 +699,8 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { deinit { self.listDisposable?.dispose() - navigationActionDisposable.dispose() - updateNotificationsDisposable.dispose() + self.navigationActionDisposable.dispose() + self.updateNotificationsDisposable.dispose() } func updatePresentationData(_ presentationData: PresentationData) { @@ -731,12 +708,12 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { self.presentationDataValue.set(.single((presentationData.theme, presentationData.strings))) self.backgroundColor = presentationData.theme.list.blocksBackgroundColor self.listNode.keepTopItemOverscrollBackground = ListViewKeepTopItemOverscrollBackground(color: presentationData.theme.chatList.backgroundColor, direction: true) - self.searchDisplayController?.updateThemeAndStrings(theme: self.presentationData.theme, strings: presentationData.strings) + self.searchDisplayController?.updatePresentationData(self.presentationData) } - func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, actualNavigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { let hadValidLayout = self.containerLayout != nil - self.containerLayout = (layout, navigationBarHeight) + self.containerLayout = (layout, navigationBarHeight, actualNavigationBarHeight) var listInsets = layout.insets(options: [.input]) listInsets.top += navigationBarHeight @@ -746,22 +723,27 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { searchDisplayController.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition) } + var headerInsets = layout.insets(options: [.input]) + headerInsets.top += actualNavigationBarHeight + headerInsets.left += layout.safeInsets.left + headerInsets.right += layout.safeInsets.right + self.listNode.bounds = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height) self.listNode.position = CGPoint(x: layout.size.width / 2.0, y: layout.size.height / 2.0) var duration: Double = 0.0 var curve: UInt = 0 switch transition { - case .immediate: - break - case let .animated(animationDuration, animationCurve): - duration = animationDuration - switch animationCurve { - case .easeInOut: + case .immediate: break - case .spring: - curve = 7 - } + case let .animated(animationDuration, animationCurve): + duration = animationDuration + switch animationCurve { + case .easeInOut: + break + case .spring: + curve = 7 + } } let listViewCurve: ListViewAnimationCurve @@ -771,7 +753,7 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { listViewCurve = .Default(duration: duration) } - let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: layout.size, insets: listInsets, duration: duration, curve: listViewCurve) + let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: layout.size, insets: listInsets, headerInsets: headerInsets, duration: duration, curve: listViewCurve) self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) @@ -814,17 +796,16 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { } } - func toggleEditing() { - statePromise.set(stateValue.modify({$0.withUpdatedEditing(!$0.editing).withUpdatedRevealedPeerId(nil)})) + self.statePromise.set(stateValue.modify({$0.withUpdatedEditing(!$0.editing).withUpdatedRevealedPeerId(nil)})) } func activateSearch(placeholderNode: SearchBarPlaceholderNode) { - guard let (containerLayout, navigationBarHeight) = self.containerLayout, self.searchDisplayController == nil else { + guard let (containerLayout, navigationBarHeight, _) = self.containerLayout, self.searchDisplayController == nil else { return } - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: NotificationExceptionsSearchContainerNode(account: self.account, mode: self.stateValue.modify {$0}.mode, arguments: self.arguments!), cancel: { [weak self] in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: NotificationExceptionsSearchContainerNode(account: self.account, mode: self.stateValue.modify {$0}.mode, arguments: self.arguments!), cancel: { [weak self] in self?.requestDeactivateSearch() }) @@ -834,7 +815,7 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode { if isSearchBar { strongPlaceholderNode.supernode?.insertSubnode(subnode, aboveSubnode: strongPlaceholderNode) } else { - strongSelf.insertSubnode(subnode, belowSubnode: navigationBar) + strongSelf.insertSubnode(subnode, belowSubnode: strongSelf.navigationBar) } } }, placeholder: placeholderNode) @@ -904,7 +885,6 @@ private final class NotificationExceptionsSearchContainerNode: SearchDisplayCont self.addSubnode(self.dimNode) self.addSubnode(self.listNode) - let initialState = NotificationExceptionState(mode: mode, isSearchMode: true) let statePromise: ValuePromise = ValuePromise(initialState, ignoreRepeated: true) let stateValue:Atomic = Atomic(value: initialState) @@ -954,7 +934,7 @@ private final class NotificationExceptionsSearchContainerNode: SearchDisplayCont let previousEntriesHolder = Atomic<([NotificationExceptionEntry], PresentationTheme, PresentationStrings)?>(value: nil) - searchDisposable.set((combineLatest((account.applicationContext as! TelegramApplicationContext).presentationData, stateAndPeers, preferences) |> deliverOnMainQueue).start(next: { [weak self] (presentationData, state, prefs) in + self.searchDisposable.set((combineLatest((account.applicationContext as! TelegramApplicationContext).presentationData, stateAndPeers, preferences) |> deliverOnMainQueue).start(next: { [weak self] (presentationData, state, prefs) in let entries = notificationsExceptionEntries(presentationData: presentationData, state: state.0, query: state.1) let previousEntriesAndPresentationData = previousEntriesHolder.swap((entries, presentationData.theme, presentationData.strings)) @@ -1009,7 +989,7 @@ private final class NotificationExceptionsSearchContainerNode: SearchDisplayCont } private func enqueueTransition(_ transition: NotificationExceptionsSearchContainerTransition) { - enqueuedTransitions.append(transition) + self.enqueuedTransitions.append(transition) if self.hasValidLayout { while !self.enqueuedTransitions.isEmpty { @@ -1042,16 +1022,16 @@ private final class NotificationExceptionsSearchContainerNode: SearchDisplayCont var duration: Double = 0.0 var curve: UInt = 0 switch transition { - case .immediate: - break - case let .animated(animationDuration, animationCurve): - duration = animationDuration - switch animationCurve { - case .easeInOut: + case .immediate: break - case .spring: - curve = 7 - } + case let .animated(animationDuration, animationCurve): + duration = animationDuration + switch animationCurve { + case .easeInOut: + break + case .spring: + curve = 7 + } } let listViewCurve: ListViewAnimationCurve @@ -1064,8 +1044,8 @@ private final class NotificationExceptionsSearchContainerNode: SearchDisplayCont self.listNode.frame = CGRect(origin: CGPoint(), size: layout.size) self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: layout.size, insets: UIEdgeInsets(top: navigationBarHeight, left: 0.0, bottom: layout.insets(options: [.input]).bottom, right: 0.0), duration: duration, curve: listViewCurve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) - if !hasValidLayout { - hasValidLayout = true + if !self.hasValidLayout { + self.hasValidLayout = true while !self.enqueuedTransitions.isEmpty { self.dequeueTransition() } diff --git a/TelegramUI/NotificationExceptions.swift b/TelegramUI/NotificationExceptions.swift index 7dfbf1e281..a20e082ac7 100644 --- a/TelegramUI/NotificationExceptions.swift +++ b/TelegramUI/NotificationExceptions.swift @@ -27,7 +27,7 @@ public class NotificationExceptionsController: ViewController { private var searchContentNode: NavigationBarSearchContentNode? - public init(account: Account, mode: NotificationExceptionMode, updatedMode: @escaping(NotificationExceptionMode)->Void) { + public init(account: Account, mode: NotificationExceptionMode, updatedMode: @escaping(NotificationExceptionMode) -> Void) { self.account = account self.mode = mode self.updatedMode = updatedMode @@ -45,7 +45,12 @@ public class NotificationExceptionsController: ViewController { self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil) self.scrollToTop = { [weak self] in - self?.controllerNode.scrollToTop() + if let strongSelf = self { + if let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateExpansionProgress(1.0, animated: true) + } + strongSelf.controllerNode.scrollToTop() + } } self.presentationDataDisposable = (account.telegramApplicationContext.presentationData @@ -84,7 +89,6 @@ public class NotificationExceptionsController: ViewController { self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil) self.controllerNode.updatePresentationData(self.presentationData) - let editItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.editPressed)) let doneItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed)) if self.navigationItem.rightBarButtonItem === self.editItem { @@ -119,6 +123,19 @@ public class NotificationExceptionsController: ViewController { }, pushController: { [weak self] c in (self?.navigationController as? NavigationController)?.pushViewController(c) }) + + self.controllerNode.listNode.visibleContentOffsetChanged = { [weak self] offset in + if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateListVisibleContentOffset(offset) + } + } + + self.controllerNode.listNode.didEndScrolling = { [weak self] in + if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode { + let _ = fixNavigationSearchableListNodeScrolling(strongSelf.controllerNode.listNode, searchNode: searchContentNode) + } + } + self._ready.set(self.controllerNode._ready.get()) self.displayNodeDidLoad() @@ -127,7 +144,7 @@ public class NotificationExceptionsController: ViewController { override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { super.containerLayoutUpdated(layout, transition: transition) - self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, transition: transition) + self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition) } @objc private func editPressed() { diff --git a/TelegramUI/NotificationSearchItem.swift b/TelegramUI/NotificationSearchItem.swift index e853d5f99d..940b1dfb04 100644 --- a/TelegramUI/NotificationSearchItem.swift +++ b/TelegramUI/NotificationSearchItem.swift @@ -108,7 +108,7 @@ class NotificationSearchItemNode: ListViewItemNode { let backgroundColor = item.theme.chatList.itemBackgroundColor - let searchBarApply = searchBarNodeLayout(NSAttributedString(string: placeholder ?? "", font: searchBarFont, textColor: UIColor(rgb: 0x8e8e93)), CGSize(width: baseWidth - 16.0, height: 28.0), 1.0, UIColor(rgb: 0x8e8e93), item.theme.chatList.regularSearchBarColor, backgroundColor, .immediate) + let (_, searchBarApply) = searchBarNodeLayout(NSAttributedString(string: placeholder ?? "", font: searchBarFont, textColor: UIColor(rgb: 0x8e8e93)), CGSize(width: baseWidth - 16.0, height: 28.0), 1.0, UIColor(rgb: 0x8e8e93), item.theme.chatList.regularSearchBarColor, backgroundColor, .immediate) let layout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: 44.0), insets: UIEdgeInsets()) diff --git a/TelegramUI/OpenChatMessage.swift b/TelegramUI/OpenChatMessage.swift index fbc05f6c98..bc96375a52 100644 --- a/TelegramUI/OpenChatMessage.swift +++ b/TelegramUI/OpenChatMessage.swift @@ -403,3 +403,25 @@ func openChatInstantPage(account: Account, message: Message, navigationControlle } } } + +func openChatWallpaper(account: Account, message: Message, present: @escaping (ViewController, Any?) -> Void) { + for media in message.media { + if let webpage = media as? TelegramMediaWebpage, case let .Loaded(content) = webpage.content { + let _ = (resolveUrl(account: account, url: content.url) + |> deliverOnMainQueue).start(next: { resolvedUrl in + if case let .wallpaper(parameter) = resolvedUrl { + let source: WallpaperListPreviewSource + switch parameter { + case let .slug(slug): + source = .slug(slug, content.file) + case let .color(color): + source = .wallpaper(.color(Int32(color.rgb))) + } + + let controller = WallpaperListPreviewController(account: account, source: source) + present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) + } + }) + } + } +} diff --git a/TelegramUI/OpenResolvedUrl.swift b/TelegramUI/OpenResolvedUrl.swift index 2d4757533f..0cd5d20bdb 100644 --- a/TelegramUI/OpenResolvedUrl.swift +++ b/TelegramUI/OpenResolvedUrl.swift @@ -193,11 +193,21 @@ func openResolvedUrl(_ resolvedUrl: ResolvedUrl, account: Account, context: Open (navigationController.viewControllers.last as? ViewController)?.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: ViewControllerPresentationAnimation.modalSheet)) } } - case let .wallpaper(slug): + case let .wallpaper(parameter): let presentationData = account.telegramApplicationContext.currentPresentationData.with { $0 } - let controller = OverlayStatusController(theme: presentationData.theme, strings: presentationData.strings, type: .loading(cancelled: nil)) - present(controller, nil) - let _ = (getWallpaper(account: account, slug: slug) + var controller: OverlayStatusController? + + let signal: Signal + switch parameter { + case let .slug(slug): + signal = getWallpaper(account: account, slug: slug) + controller = OverlayStatusController(theme: presentationData.theme, strings: presentationData.strings, type: .loading(cancelled: nil)) + present(controller!, nil) + case let .color(color): + signal = .single(.color(Int32(color.rgb))) + } + + let _ = (signal |> deliverOnMainQueue).start(next: { [weak controller] wallpaper in controller?.dismiss() let wallpaperController = WallpaperListPreviewController(account: account, source: .wallpaper(wallpaper)) diff --git a/TelegramUI/OpenUrl.swift b/TelegramUI/OpenUrl.swift index c8345911c6..b0bb2198ca 100644 --- a/TelegramUI/OpenUrl.swift +++ b/TelegramUI/OpenUrl.swift @@ -546,18 +546,20 @@ public func openExternalUrl(account: Account, context: OpenURLContext = .generic } } else if parsedUrl.host == "bg" { if let components = URLComponents(string: "/?" + query) { - var slug: String? + var parameter: String? if let queryItems = components.queryItems { for queryItem in queryItems { if let value = queryItem.value { if queryItem.name == "slug" { - slug = value + parameter = value + } else if queryItem.name == "color" { + parameter = value } } } } - if let slug = slug { - convertedUrl = "https://t.me/bg/\(slug)" + if let parameter = parameter { + convertedUrl = "https://t.me/bg/\(parameter)" } } } diff --git a/TelegramUI/OverlayMediaControllerNode.swift b/TelegramUI/OverlayMediaControllerNode.swift index 2f219019c3..5386502918 100644 --- a/TelegramUI/OverlayMediaControllerNode.swift +++ b/TelegramUI/OverlayMediaControllerNode.swift @@ -95,7 +95,6 @@ final class OverlayMediaControllerNode: ASDisplayNode, UIGestureRecognizerDelega private func nodePosition(layout: ContainerViewLayout, size: CGSize, location: CGPoint, hidden: Bool, isMinimized: Bool, tempExtendedTopInset: Bool) -> CGPoint { var layoutInsets = layout.insets(options: [.input]) - layoutInsets.top += 37.0 layoutInsets.bottom += 48.0 if tempExtendedTopInset { layoutInsets.top += 38.0 diff --git a/TelegramUI/OverlayPlayerControllerNode.swift b/TelegramUI/OverlayPlayerControllerNode.swift index 345041507e..2103833f0d 100644 --- a/TelegramUI/OverlayPlayerControllerNode.swift +++ b/TelegramUI/OverlayPlayerControllerNode.swift @@ -54,7 +54,7 @@ final class OverlayPlayerControllerNode: ViewControllerTracingNode, UIGestureRec } else { return false } - }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _ in }, navigateToMessage: { _, _ in }, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendMessage: { _ in }, sendSticker: { _, _ in }, sendGif: { _ in }, requestMessageActionCallback: { _, _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in + }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _ in }, navigateToMessage: { _, _ in }, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendMessage: { _ in }, sendSticker: { _, _ in }, sendGif: { _ in }, requestMessageActionCallback: { _, _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _ in }, openWallpaper: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in }, presentController: { _, _ in }, navigationController: { return nil }, presentGlobalOverlayController: { _, _ in diff --git a/TelegramUI/PeerAvatarImageGalleryItem.swift b/TelegramUI/PeerAvatarImageGalleryItem.swift index 5a249b3e7c..ec9d61cdb3 100644 --- a/TelegramUI/PeerAvatarImageGalleryItem.swift +++ b/TelegramUI/PeerAvatarImageGalleryItem.swift @@ -115,7 +115,7 @@ final class PeerAvatarImageGalleryItemNode: ZoomableContentGalleryItemNode { super.init() - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } diff --git a/TelegramUI/PeerMediaCollectionController.swift b/TelegramUI/PeerMediaCollectionController.swift index 9586bda8b5..1792be3a32 100644 --- a/TelegramUI/PeerMediaCollectionController.swift +++ b/TelegramUI/PeerMediaCollectionController.swift @@ -193,6 +193,12 @@ public class PeerMediaCollectionController: TelegramController { if let strongSelf = self, strongSelf.isNodeLoaded, let navigationController = strongSelf.navigationController as? NavigationController, let message = strongSelf.mediaCollectionDisplayNode.messageForGallery(message.id)?.message { openChatInstantPage(account: strongSelf.account, message: message, navigationController: navigationController) } + }, openWallpaper: { [weak self] message in + if let strongSelf = self, strongSelf.isNodeLoaded, let message = strongSelf.mediaCollectionDisplayNode.messageForGallery(message.id)?.message { + openChatWallpaper(account: strongSelf.account, message: message, present: { [weak self] c, a in + self?.present(c, in: .window(.root), with: a, blockInteraction: true) + }) + } }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in diff --git a/TelegramUI/PeerMediaCollectionControllerNode.swift b/TelegramUI/PeerMediaCollectionControllerNode.swift index 2af392b615..add7794375 100644 --- a/TelegramUI/PeerMediaCollectionControllerNode.swift +++ b/TelegramUI/PeerMediaCollectionControllerNode.swift @@ -374,13 +374,15 @@ class PeerMediaCollectionControllerNode: ASDisplayNode { } if let placeholderNode = maybePlaceholderNode { - self.searchDisplayController = SearchDisplayController(theme: self.mediaCollectionInterfaceState.theme, strings: self.mediaCollectionInterfaceState.strings, mode: .list, contentNode: ChatHistorySearchContainerNode(account: self.account, peerId: self.peerId, tagMask: tagMaskForMode(self.mediaCollectionInterfaceState.mode), interfaceInteraction: self.controllerInteraction), cancel: { [weak self] in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, contentNode: ChatHistorySearchContainerNode(account: self.account, peerId: self.peerId, tagMask: tagMaskForMode(self.mediaCollectionInterfaceState.mode), interfaceInteraction: self.controllerInteraction), cancel: { [weak self] in self?.requestDeactivateSearch() }) self.searchDisplayController?.containerLayoutUpdated(containerLayout, navigationBarHeight: navigationBarHeight, transition: .immediate) - self.searchDisplayController?.activate(insertSubnode: { subnode, isSearchBar in - self.insertSubnode(subnode, belowSubnode: navigationBar) + self.searchDisplayController?.activate(insertSubnode: { [weak self] subnode, isSearchBar in + if let strongSelf = self { + strongSelf.insertSubnode(subnode, belowSubnode: navigationBar) + } }, placeholder: placeholderNode) } diff --git a/TelegramUI/PeerSelectionController.swift b/TelegramUI/PeerSelectionController.swift index 4d58ac0049..f86a545c7a 100644 --- a/TelegramUI/PeerSelectionController.swift +++ b/TelegramUI/PeerSelectionController.swift @@ -59,6 +59,9 @@ public final class PeerSelectionController: ViewController { self.scrollToTop = { [weak self] in if let strongSelf = self { + if let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateExpansionProgress(1.0, animated: true) + } strongSelf.peerSelectionNode.scrollToTop() } } diff --git a/TelegramUI/PeerSelectionControllerNode.swift b/TelegramUI/PeerSelectionControllerNode.swift index 7347325179..84c81b0927 100644 --- a/TelegramUI/PeerSelectionControllerNode.swift +++ b/TelegramUI/PeerSelectionControllerNode.swift @@ -129,7 +129,7 @@ final class PeerSelectionControllerNode: ASDisplayNode { private func updateThemeAndStrings() { self.backgroundColor = self.presentationData.theme.chatList.backgroundColor - self.searchDisplayController?.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings) + self.searchDisplayController?.updatePresentationData(self.presentationData) self.chatListNode.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations) self.toolbarBackgroundNode?.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor @@ -215,7 +215,7 @@ final class PeerSelectionControllerNode: ASDisplayNode { } if self.chatListNode.supernode != nil { - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: ChatListSearchContainerNode(account: self.account, filter: self.filter, groupId: nil, openPeer: { [weak self] peer, _ in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ChatListSearchContainerNode(account: self.account, filter: self.filter, groupId: nil, openPeer: { [weak self] peer, _ in if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch { requestOpenPeerFromSearch(peer) } @@ -242,7 +242,7 @@ final class PeerSelectionControllerNode: ASDisplayNode { }, placeholder: placeholderNode) } else if let contactListNode = self.contactListNode, contactListNode.supernode != nil { - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: true, categories: [.cloudContacts, .global], openPeer: { [weak self] peer in + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(account: self.account, onlyWriteable: true, categories: [.cloudContacts, .global], openPeer: { [weak self] peer in if let strongSelf = self { switch peer { case let .peer(peer, _): diff --git a/TelegramUI/PlatformVideoContent.swift b/TelegramUI/PlatformVideoContent.swift index c5f9aca1ef..26fe6f548a 100644 --- a/TelegramUI/PlatformVideoContent.swift +++ b/TelegramUI/PlatformVideoContent.swift @@ -179,7 +179,7 @@ private final class PlatformVideoContentNode: ASDisplayNode, UniversalVideoConte self?.performActionAtEnd() }) - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } diff --git a/TelegramUI/PostboxKeys.swift b/TelegramUI/PostboxKeys.swift index f03752284b..880c9d2f9f 100644 --- a/TelegramUI/PostboxKeys.swift +++ b/TelegramUI/PostboxKeys.swift @@ -52,8 +52,10 @@ public struct ApplicationSpecificItemCacheCollectionId { private enum ApplicationSpecificOrderedItemListCollectionIdValues: Int32 { case webSearchRecentQueries = 0 + case wallpaperSearchRecentQueries = 1 } public struct ApplicationSpecificOrderedItemListCollectionId { public static let webSearchRecentQueries = applicationSpecificOrderedItemListCollectionId(ApplicationSpecificOrderedItemListCollectionIdValues.webSearchRecentQueries.rawValue) + public static let wallpaperSearchRecentQueries = applicationSpecificOrderedItemListCollectionId(ApplicationSpecificOrderedItemListCollectionIdValues.wallpaperSearchRecentQueries.rawValue) } diff --git a/TelegramUI/PresentationStrings.swift b/TelegramUI/PresentationStrings.swift index 95a18330cd..518af49d75 100644 --- a/TelegramUI/PresentationStrings.swift +++ b/TelegramUI/PresentationStrings.swift @@ -394,523 +394,523 @@ public final class PresentationStrings { public var AutoDownloadSettings_WiFi: String { return self._s[200]! } public var GroupInfo_GroupType: String { return self._s[201]! } public var StickerSettings_ContextHide: String { return self._s[202]! } - public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[203]! } + public var WallpaperPreview_Still: String { return self._s[203]! } + public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[204]! } public func CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[204]!, self._r[204]!, [_1, _2]) + return formatWithArgumentRanges(self._s[205]!, self._r[205]!, [_1, _2]) } - public var Group_Setup_HistoryTitle: String { return self._s[206]! } - public var Passport_Identity_FilesUploadNew: String { return self._s[207]! } - public var PasscodeSettings_AutoLock: String { return self._s[208]! } - public var Passport_Title: String { return self._s[209]! } - public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[210]! } - public var GroupPermission_NoSendGifs: String { return self._s[211]! } - public var State_WaitingForNetwork: String { return self._s[213]! } + public var Group_Setup_HistoryTitle: String { return self._s[207]! } + public var Passport_Identity_FilesUploadNew: String { return self._s[208]! } + public var PasscodeSettings_AutoLock: String { return self._s[209]! } + public var Passport_Title: String { return self._s[210]! } + public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[211]! } + public var GroupPermission_NoSendGifs: String { return self._s[212]! } + public var State_WaitingForNetwork: String { return self._s[214]! } public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[214]!, self._r[214]!, [_0, _1]) + return formatWithArgumentRanges(self._s[215]!, self._r[215]!, [_0, _1]) } - public var Calls_NotNow: String { return self._s[216]! } - public var UserInfo_SendMessage: String { return self._s[217]! } - public var TwoStepAuth_PasswordSet: String { return self._s[218]! } - public var Passport_DeleteDocument: String { return self._s[219]! } - public var SocksProxySetup_AddProxyTitle: String { return self._s[220]! } + public var Calls_NotNow: String { return self._s[217]! } + public var UserInfo_SendMessage: String { return self._s[218]! } + public var TwoStepAuth_PasswordSet: String { return self._s[219]! } + public var Passport_DeleteDocument: String { return self._s[220]! } + public var SocksProxySetup_AddProxyTitle: String { return self._s[221]! } public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[221]!, self._r[221]!, [_1]) + return formatWithArgumentRanges(self._s[222]!, self._r[222]!, [_1]) } - public var GroupRemoved_Remove: String { return self._s[222]! } - public var Passport_FieldIdentity: String { return self._s[223]! } + public var GroupRemoved_Remove: String { return self._s[223]! } + public var Passport_FieldIdentity: String { return self._s[224]! } public func CHAT_MESSAGE_FWDS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[224]!, self._r[224]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[225]!, self._r[225]!, [_1, _2, _3]) } - public var Group_Setup_TypePrivateHelp: String { return self._s[225]! } - public var Conversation_Processing: String { return self._s[227]! } + public var Group_Setup_TypePrivateHelp: String { return self._s[226]! } + public var Conversation_Processing: String { return self._s[228]! } public func MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[228]!, self._r[228]!, [_1]) + return formatWithArgumentRanges(self._s[229]!, self._r[229]!, [_1]) } public func MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[230]!, self._r[230]!, [_1]) + return formatWithArgumentRanges(self._s[231]!, self._r[231]!, [_1]) } - public var ChatSettings_AutoPlayAnimations: String { return self._s[231]! } - public var AuthSessions_LogOutApplicationsHelp: String { return self._s[234]! } - public var Month_GenFebruary: String { return self._s[235]! } + public var ChatSettings_AutoPlayAnimations: String { return self._s[232]! } + public var AuthSessions_LogOutApplicationsHelp: String { return self._s[235]! } + public var Month_GenFebruary: String { return self._s[236]! } public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[237]!, self._r[237]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[238]!, self._r[238]!, [_1, _2, _3, _4, _5]) } - public var Passport_Identity_TypeIdentityCard: String { return self._s[238]! } - public var GroupInfo_AddParticipant: String { return self._s[240]! } - public var KeyCommand_SendMessage: String { return self._s[241]! } - public var Map_LiveLocationShowAll: String { return self._s[243]! } - public var Checkout_Receipt_Title: String { return self._s[245]! } - public var Message_Contact: String { return self._s[246]! } - public var Call_StatusIncoming: String { return self._s[247]! } + public var Passport_Identity_TypeIdentityCard: String { return self._s[239]! } + public var GroupInfo_AddParticipant: String { return self._s[241]! } + public var KeyCommand_SendMessage: String { return self._s[242]! } + public var Map_LiveLocationShowAll: String { return self._s[244]! } + public var Checkout_Receipt_Title: String { return self._s[246]! } + public var Message_Contact: String { return self._s[247]! } + public var Call_StatusIncoming: String { return self._s[248]! } public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[248]!, self._r[248]!, [_1]) + return formatWithArgumentRanges(self._s[249]!, self._r[249]!, [_1]) } - public var Passport_FieldIdentityDetailsHelp: String { return self._s[250]! } - public var Conversation_ViewChannel: String { return self._s[251]! } + public var Passport_FieldIdentityDetailsHelp: String { return self._s[251]! } + public var Conversation_ViewChannel: String { return self._s[252]! } public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[252]!, self._r[252]!, [_0]) + return formatWithArgumentRanges(self._s[253]!, self._r[253]!, [_0]) } - public var Passport_Language_nl: String { return self._s[254]! } - public var Camera_Retake: String { return self._s[255]! } - public var AuthSessions_LogOutApplications: String { return self._s[256]! } - public var ApplyLanguage_ApplySuccess: String { return self._s[257]! } - public var Tour_Title6: String { return self._s[258]! } - public var Map_ChooseAPlace: String { return self._s[259]! } - public var CallSettings_Never: String { return self._s[261]! } + public var Passport_Language_nl: String { return self._s[255]! } + public var Camera_Retake: String { return self._s[256]! } + public var AuthSessions_LogOutApplications: String { return self._s[257]! } + public var ApplyLanguage_ApplySuccess: String { return self._s[258]! } + public var Tour_Title6: String { return self._s[259]! } + public var Map_ChooseAPlace: String { return self._s[260]! } + public var CallSettings_Never: String { return self._s[262]! } public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[262]!, self._r[262]!, [_0]) + return formatWithArgumentRanges(self._s[263]!, self._r[263]!, [_0]) } - public var ChannelRemoved_RemoveInfo: String { return self._s[263]! } - public var GroupInfo_InviteLink_Title: String { return self._s[264]! } + public var ChannelRemoved_RemoveInfo: String { return self._s[264]! } + public var GroupInfo_InviteLink_Title: String { return self._s[265]! } public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[265]!, self._r[265]!, [_1, _2]) + return formatWithArgumentRanges(self._s[266]!, self._r[266]!, [_1, _2]) } - public var KeyCommand_ScrollUp: String { return self._s[266]! } - public var ContactInfo_URLLabelHomepage: String { return self._s[267]! } + public var KeyCommand_ScrollUp: String { return self._s[267]! } + public var ContactInfo_URLLabelHomepage: String { return self._s[268]! } public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[268]!, self._r[268]!, [_0]) + return formatWithArgumentRanges(self._s[269]!, self._r[269]!, [_0]) } - public var Watch_LastSeen_WithinAWeek: String { return self._s[269]! } - public var Weekday_Tuesday: String { return self._s[270]! } - public var UserInfo_StartSecretChat: String { return self._s[272]! } - public var Passport_Identity_FilesTitle: String { return self._s[273]! } - public var Permissions_NotificationsAllow_v0: String { return self._s[274]! } - public var DialogList_DeleteConversationConfirmation: String { return self._s[276]! } - public var AuthSessions_Sessions: String { return self._s[277]! } - public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[279]! } - public var Call_StatusWaiting: String { return self._s[280]! } - public var CreateGroup_SoftUserLimitAlert: String { return self._s[281]! } - public var FastTwoStepSetup_HintHelp: String { return self._s[282]! } + public var WallpaperPreview_Perspective: String { return self._s[270]! } + public var Watch_LastSeen_WithinAWeek: String { return self._s[271]! } + public var Weekday_Tuesday: String { return self._s[272]! } + public var UserInfo_StartSecretChat: String { return self._s[274]! } + public var Passport_Identity_FilesTitle: String { return self._s[275]! } + public var Permissions_NotificationsAllow_v0: String { return self._s[276]! } + public var DialogList_DeleteConversationConfirmation: String { return self._s[278]! } + public var AuthSessions_Sessions: String { return self._s[279]! } + public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[281]! } + public var Call_StatusWaiting: String { return self._s[282]! } + public var CreateGroup_SoftUserLimitAlert: String { return self._s[283]! } + public var FastTwoStepSetup_HintHelp: String { return self._s[284]! } public func MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[283]!, self._r[283]!, [_1]) + return formatWithArgumentRanges(self._s[285]!, self._r[285]!, [_1]) } - public var Settings_LogoutConfirmationText: String { return self._s[284]! } - public var Passport_Identity_TypePassport: String { return self._s[286]! } - public var SocksProxySetup_SaveProxy: String { return self._s[289]! } - public var AccessDenied_SaveMedia: String { return self._s[290]! } - public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[292]! } - public var Settings_Title: String { return self._s[294]! } - public var Contacts_InviteSearchLabel: String { return self._s[296]! } - public var ConvertToSupergroup_Title: String { return self._s[297]! } + public var Settings_LogoutConfirmationText: String { return self._s[286]! } + public var Passport_Identity_TypePassport: String { return self._s[288]! } + public var SocksProxySetup_SaveProxy: String { return self._s[291]! } + public var AccessDenied_SaveMedia: String { return self._s[292]! } + public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[294]! } + public var Settings_Title: String { return self._s[296]! } + public var Contacts_InviteSearchLabel: String { return self._s[298]! } + public var ConvertToSupergroup_Title: String { return self._s[299]! } public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[298]!, self._r[298]!, [_0]) + return formatWithArgumentRanges(self._s[300]!, self._r[300]!, [_0]) } - public var InfoPlist_NSSiriUsageDescription: String { return self._s[299]! } - public var ChatSettings_AutomaticPhotoDownload: String { return self._s[300]! } - public var UserInfo_BotHelp: String { return self._s[301]! } - public var PrivacySettings_LastSeenEverybody: String { return self._s[302]! } - public var Checkout_Name: String { return self._s[303]! } - public var Channel_BanUser_BlockFor: String { return self._s[304]! } - public var Checkout_ShippingAddress: String { return self._s[305]! } - public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[306]! } - public var Channel_BanUser_PermissionSendPolls: String { return self._s[307]! } + public var InfoPlist_NSSiriUsageDescription: String { return self._s[301]! } + public var ChatSettings_AutomaticPhotoDownload: String { return self._s[302]! } + public var UserInfo_BotHelp: String { return self._s[303]! } + public var PrivacySettings_LastSeenEverybody: String { return self._s[304]! } + public var Checkout_Name: String { return self._s[305]! } + public var Channel_BanUser_BlockFor: String { return self._s[306]! } + public var Checkout_ShippingAddress: String { return self._s[307]! } + public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[308]! } + public var Channel_BanUser_PermissionSendPolls: String { return self._s[309]! } public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[310]!, self._r[310]!, [_0]) + return formatWithArgumentRanges(self._s[312]!, self._r[312]!, [_0]) } - public var Contacts_SortedByName: String { return self._s[311]! } - public var Group_LeaveGroup: String { return self._s[312]! } - public var Settings_UsernameEmpty: String { return self._s[313]! } + public var Contacts_SortedByName: String { return self._s[313]! } + public var Group_LeaveGroup: String { return self._s[314]! } + public var Settings_UsernameEmpty: String { return self._s[315]! } public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[314]!, self._r[314]!, [_0]) + return formatWithArgumentRanges(self._s[316]!, self._r[316]!, [_0]) } public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[315]!, self._r[315]!, [_1]) + return formatWithArgumentRanges(self._s[317]!, self._r[317]!, [_1]) } - public var Message_ImageExpired: String { return self._s[316]! } - public var TwoStepAuth_RecoveryFailed: String { return self._s[318]! } - public var UserInfo_AddToExisting: String { return self._s[319]! } - public var TwoStepAuth_EnabledSuccess: String { return self._s[320]! } + public var Message_ImageExpired: String { return self._s[318]! } + public var TwoStepAuth_RecoveryFailed: String { return self._s[320]! } + public var UserInfo_AddToExisting: String { return self._s[321]! } + public var TwoStepAuth_EnabledSuccess: String { return self._s[322]! } public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[321]!, self._r[321]!, [_1]) + return formatWithArgumentRanges(self._s[323]!, self._r[323]!, [_1]) } - public var Notifications_GroupNotificationsAlert: String { return self._s[322]! } - public var Passport_Language_km: String { return self._s[323]! } - public var SocksProxySetup_AdNoticeHelp: String { return self._s[325]! } - public var Notification_CallMissedShort: String { return self._s[326]! } - public var ReportPeer_ReasonOther_Send: String { return self._s[327]! } - public var Watch_Compose_Send: String { return self._s[328]! } - public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[331]! } - public var Conversation_HoldForVideo: String { return self._s[332]! } - public var CheckoutInfo_ErrorCityInvalid: String { return self._s[334]! } - public var Appearance_AutoNightThemeDisabled: String { return self._s[336]! } - public var Channel_LinkItem: String { return self._s[337]! } + public var Notifications_GroupNotificationsAlert: String { return self._s[324]! } + public var Passport_Language_km: String { return self._s[325]! } + public var SocksProxySetup_AdNoticeHelp: String { return self._s[327]! } + public var Notification_CallMissedShort: String { return self._s[328]! } + public var ReportPeer_ReasonOther_Send: String { return self._s[329]! } + public var Watch_Compose_Send: String { return self._s[330]! } + public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[333]! } + public var Conversation_HoldForVideo: String { return self._s[334]! } + public var CheckoutInfo_ErrorCityInvalid: String { return self._s[336]! } + public var Appearance_AutoNightThemeDisabled: String { return self._s[338]! } + public var Channel_LinkItem: String { return self._s[339]! } public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[338]!, self._r[338]!, [_0, _1]) + return formatWithArgumentRanges(self._s[340]!, self._r[340]!, [_0, _1]) } public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[341]!, self._r[341]!, [_0]) + return formatWithArgumentRanges(self._s[343]!, self._r[343]!, [_0]) } - public var Passport_Language_dv: String { return self._s[342]! } - public var Undo_LeftChannel: String { return self._s[343]! } - public var Notifications_ExceptionsMuted: String { return self._s[344]! } - public var Conversation_ContextMenuShare: String { return self._s[345]! } - public var Conversation_ContextMenuStickerPackInfo: String { return self._s[346]! } - public var ShareFileTip_Title: String { return self._s[347]! } - public var NotificationsSound_Chord: String { return self._s[348]! } - public var Passport_Address_EditTemporaryRegistration: String { return self._s[349]! } + public var Passport_Language_dv: String { return self._s[344]! } + public var Undo_LeftChannel: String { return self._s[345]! } + public var Notifications_ExceptionsMuted: String { return self._s[346]! } + public var Conversation_ContextMenuShare: String { return self._s[347]! } + public var Conversation_ContextMenuStickerPackInfo: String { return self._s[348]! } + public var ShareFileTip_Title: String { return self._s[349]! } + public var NotificationsSound_Chord: String { return self._s[350]! } + public var Passport_Address_EditTemporaryRegistration: String { return self._s[351]! } public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[350]!, self._r[350]!, [_0]) + return formatWithArgumentRanges(self._s[352]!, self._r[352]!, [_0]) } - public var Notification_CallOutgoingShort: String { return self._s[352]! } + public var Notification_CallOutgoingShort: String { return self._s[354]! } public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[353]!, self._r[353]!, [_1, _2]) + return formatWithArgumentRanges(self._s[355]!, self._r[355]!, [_1, _2]) } - public var Passport_Address_TypeUtilityBill: String { return self._s[354]! } + public var Passport_Address_TypeUtilityBill: String { return self._s[356]! } public func MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[355]!, self._r[355]!, [_1]) + return formatWithArgumentRanges(self._s[357]!, self._r[357]!, [_1]) } - public var ReportPeer_Report: String { return self._s[356]! } - public var GroupInfo_DeactivatedStatus: String { return self._s[357]! } - public var StickerPack_Send: String { return self._s[358]! } - public var Login_CodeSentInternal: String { return self._s[359]! } - public var GroupInfo_InviteLink_LinkSection: String { return self._s[360]! } + public var ReportPeer_Report: String { return self._s[358]! } + public var GroupInfo_DeactivatedStatus: String { return self._s[359]! } + public var StickerPack_Send: String { return self._s[360]! } + public var Login_CodeSentInternal: String { return self._s[361]! } + public var GroupInfo_InviteLink_LinkSection: String { return self._s[362]! } public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[361]!, self._r[361]!, [_0]) - } - public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[363]!, self._r[363]!, [_0]) } - public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[364]! } - public var ReportPeer_ReasonViolence: String { return self._s[366]! } - public var Map_Locating: String { return self._s[367]! } - public var AutoDownloadSettings_GroupChats: String { return self._s[369]! } - public var CheckoutInfo_SaveInfo: String { return self._s[370]! } - public var SharedMedia_EmptyLinksText: String { return self._s[372]! } - public var Passport_Address_CityPlaceholder: String { return self._s[373]! } - public var CheckoutInfo_ErrorStateInvalid: String { return self._s[374]! } - public var Channel_AdminLog_CanAddAdmins: String { return self._s[376]! } + public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[365]!, self._r[365]!, [_0]) + } + public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[366]! } + public var ReportPeer_ReasonViolence: String { return self._s[368]! } + public var Map_Locating: String { return self._s[369]! } + public var AutoDownloadSettings_GroupChats: String { return self._s[371]! } + public var CheckoutInfo_SaveInfo: String { return self._s[372]! } + public var SharedMedia_EmptyLinksText: String { return self._s[374]! } + public var Passport_Address_CityPlaceholder: String { return self._s[375]! } + public var CheckoutInfo_ErrorStateInvalid: String { return self._s[376]! } + public var Channel_AdminLog_CanAddAdmins: String { return self._s[378]! } public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[377]!, self._r[377]!, [_1]) + return formatWithArgumentRanges(self._s[379]!, self._r[379]!, [_1]) } public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[378]!, self._r[378]!, [_0]) + return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_0]) } - public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[379]! } + public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[381]! } public func PINNED_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_1]) + return formatWithArgumentRanges(self._s[382]!, self._r[382]!, [_1]) } - public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[381]! } - public var ChangePhoneNumberCode_Code: String { return self._s[382]! } + public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[383]! } + public var ChangePhoneNumberCode_Code: String { return self._s[384]! } public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[383]!, self._r[383]!, [_0]) + return formatWithArgumentRanges(self._s[385]!, self._r[385]!, [_0]) } - public var TwoStepAuth_SetupEmail: String { return self._s[384]! } - public var HashtagSearch_AllChats: String { return self._s[385]! } + public var TwoStepAuth_SetupEmail: String { return self._s[386]! } + public var HashtagSearch_AllChats: String { return self._s[387]! } public func CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[386]!, self._r[386]!, [_1]) + return formatWithArgumentRanges(self._s[388]!, self._r[388]!, [_1]) } - public var PhotoEditor_QualityHigh: String { return self._s[389]! } + public var PhotoEditor_QualityHigh: String { return self._s[391]! } public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[390]!, self._r[390]!, [_0]) + return formatWithArgumentRanges(self._s[392]!, self._r[392]!, [_0]) } - public var ApplyLanguage_ApplyLanguageAction: String { return self._s[391]! } - public var Message_LiveLocation: String { return self._s[392]! } - public var Cache_LowDiskSpaceText: String { return self._s[393]! } - public var Conversation_SendMessage: String { return self._s[394]! } - public var AuthSessions_EmptyTitle: String { return self._s[395]! } - public var CallSettings_UseLessData: String { return self._s[396]! } - public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[397]! } - public var Stickers_AddToFavorites: String { return self._s[398]! } - public var PhotoEditor_QualityLow: String { return self._s[399]! } - public var Watch_UserInfo_Unblock: String { return self._s[400]! } - public var Settings_Logout: String { return self._s[401]! } + public var ApplyLanguage_ApplyLanguageAction: String { return self._s[393]! } + public var Message_LiveLocation: String { return self._s[394]! } + public var Cache_LowDiskSpaceText: String { return self._s[395]! } + public var Conversation_SendMessage: String { return self._s[396]! } + public var AuthSessions_EmptyTitle: String { return self._s[397]! } + public var CallSettings_UseLessData: String { return self._s[398]! } + public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[399]! } + public var Stickers_AddToFavorites: String { return self._s[400]! } + public var PhotoEditor_QualityLow: String { return self._s[401]! } + public var Watch_UserInfo_Unblock: String { return self._s[402]! } + public var Settings_Logout: String { return self._s[403]! } public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[402]!, self._r[402]!, [_1]) + return formatWithArgumentRanges(self._s[404]!, self._r[404]!, [_1]) } - public var ContactInfo_PhoneLabelWork: String { return self._s[403]! } + public var ContactInfo_PhoneLabelWork: String { return self._s[405]! } public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[404]!, self._r[404]!, [_1, _2]) + return formatWithArgumentRanges(self._s[406]!, self._r[406]!, [_1, _2]) } public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[405]!, self._r[405]!, [_0]) + return formatWithArgumentRanges(self._s[407]!, self._r[407]!, [_0]) } - public var Watch_Notification_Joined: String { return self._s[406]! } - public var Group_Setup_TypePublicHelp: String { return self._s[407]! } - public var Passport_Scans_UploadNew: String { return self._s[408]! } - public var Checkout_LiabilityAlertTitle: String { return self._s[409]! } - public var DialogList_Title: String { return self._s[412]! } - public var NotificationSettings_ContactJoined: String { return self._s[413]! } - public var GroupInfo_LabelAdmin: String { return self._s[414]! } - public var KeyCommand_ChatInfo: String { return self._s[415]! } - public var Conversation_EditingCaptionPanelTitle: String { return self._s[416]! } - public var Call_ReportIncludeLog: String { return self._s[417]! } + public var Watch_Notification_Joined: String { return self._s[408]! } + public var Group_Setup_TypePublicHelp: String { return self._s[409]! } + public var Passport_Scans_UploadNew: String { return self._s[410]! } + public var Checkout_LiabilityAlertTitle: String { return self._s[411]! } + public var DialogList_Title: String { return self._s[414]! } + public var NotificationSettings_ContactJoined: String { return self._s[415]! } + public var GroupInfo_LabelAdmin: String { return self._s[416]! } + public var KeyCommand_ChatInfo: String { return self._s[417]! } + public var Conversation_EditingCaptionPanelTitle: String { return self._s[418]! } + public var Call_ReportIncludeLog: String { return self._s[419]! } public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[420]!, self._r[420]!, [_0]) + return formatWithArgumentRanges(self._s[422]!, self._r[422]!, [_0]) } - public var ChatAdmins_AllMembersAreAdmins: String { return self._s[421]! } - public var Conversation_DefaultRestrictedInline: String { return self._s[422]! } - public var Message_Sticker: String { return self._s[423]! } - public var LastSeen_JustNow: String { return self._s[425]! } - public var Passport_Email_EmailPlaceholder: String { return self._s[427]! } - public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[428]! } - public var Channel_EditAdmin_PermissionsHeader: String { return self._s[429]! } - public var TwoStepAuth_Email: String { return self._s[430]! } - public var PhotoEditor_BlurToolOff: String { return self._s[431]! } - public var Message_PinnedStickerMessage: String { return self._s[432]! } - public var ContactInfo_PhoneLabelPager: String { return self._s[433]! } - public var Passport_DiscardMessageTitle: String { return self._s[434]! } - public var Privacy_PaymentsTitle: String { return self._s[435]! } + public var ChatAdmins_AllMembersAreAdmins: String { return self._s[423]! } + public var Conversation_DefaultRestrictedInline: String { return self._s[424]! } + public var Message_Sticker: String { return self._s[425]! } + public var LastSeen_JustNow: String { return self._s[427]! } + public var Passport_Email_EmailPlaceholder: String { return self._s[429]! } + public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[430]! } + public var Channel_EditAdmin_PermissionsHeader: String { return self._s[431]! } + public var TwoStepAuth_Email: String { return self._s[432]! } + public var PhotoEditor_BlurToolOff: String { return self._s[433]! } + public var Message_PinnedStickerMessage: String { return self._s[434]! } + public var ContactInfo_PhoneLabelPager: String { return self._s[435]! } + public var Passport_DiscardMessageTitle: String { return self._s[436]! } + public var Privacy_PaymentsTitle: String { return self._s[437]! } public func MESSAGE_FWDS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[437]!, self._r[437]!, [_1, _2]) + return formatWithArgumentRanges(self._s[439]!, self._r[439]!, [_1, _2]) } - public var Appearance_ColorTheme: String { return self._s[438]! } - public var UserInfo_ShareContact: String { return self._s[439]! } - public var Passport_Address_TypePassportRegistration: String { return self._s[440]! } - public var Common_More: String { return self._s[441]! } - public var Watch_Message_Call: String { return self._s[442]! } - public var Profile_EncryptionKey: String { return self._s[445]! } - public var Privacy_TopPeers: String { return self._s[446]! } - public var Conversation_StopPollConfirmation: String { return self._s[447]! } + public var Appearance_ColorTheme: String { return self._s[440]! } + public var UserInfo_ShareContact: String { return self._s[441]! } + public var Passport_Address_TypePassportRegistration: String { return self._s[442]! } + public var Common_More: String { return self._s[443]! } + public var Watch_Message_Call: String { return self._s[444]! } + public var Profile_EncryptionKey: String { return self._s[447]! } + public var Privacy_TopPeers: String { return self._s[448]! } + public var Conversation_StopPollConfirmation: String { return self._s[449]! } public func CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[448]!, self._r[448]!, [_1, _2]) + return formatWithArgumentRanges(self._s[450]!, self._r[450]!, [_1, _2]) } - public var Privacy_TopPeersWarning: String { return self._s[450]! } - public var DialogList_SearchSectionMessages: String { return self._s[453]! } - public var Notifications_ChannelNotifications: String { return self._s[454]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[455]! } - public var Passport_Language_sk: String { return self._s[456]! } - public var Notification_MessageLifetime1h: String { return self._s[457]! } - public var Call_ReportSkip: String { return self._s[459]! } - public var Cache_ServiceFiles: String { return self._s[460]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[461]! } - public var Map_Hybrid: String { return self._s[462]! } - public var ChatSettings_AutoDownloadVideos: String { return self._s[465]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[466]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[467]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[470]! } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[472]! } - public var Conversation_LiveLocationYou: String { return self._s[473]! } - public var UserInfo_ShareBot: String { return self._s[476]! } - public var PhotoEditor_ShadowsTint: String { return self._s[477]! } - public var Message_Audio: String { return self._s[478]! } - public var Passport_Language_lt: String { return self._s[479]! } + public var Privacy_TopPeersWarning: String { return self._s[452]! } + public var DialogList_SearchSectionMessages: String { return self._s[455]! } + public var Notifications_ChannelNotifications: String { return self._s[456]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[457]! } + public var Passport_Language_sk: String { return self._s[458]! } + public var Notification_MessageLifetime1h: String { return self._s[459]! } + public var Call_ReportSkip: String { return self._s[461]! } + public var Cache_ServiceFiles: String { return self._s[462]! } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[463]! } + public var Map_Hybrid: String { return self._s[464]! } + public var ChatSettings_AutoDownloadVideos: String { return self._s[467]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[468]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[469]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[472]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[474]! } + public var Conversation_LiveLocationYou: String { return self._s[475]! } + public var UserInfo_ShareBot: String { return self._s[478]! } + public var PhotoEditor_ShadowsTint: String { return self._s[479]! } + public var Message_Audio: String { return self._s[480]! } + public var Passport_Language_lt: String { return self._s[481]! } public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[480]!, self._r[480]!, [_0]) + return formatWithArgumentRanges(self._s[482]!, self._r[482]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[481]! } - public var Conversation_FileICloudDrive: String { return self._s[482]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[483]! } + public var Permissions_SiriText_v0: String { return self._s[483]! } + public var Conversation_FileICloudDrive: String { return self._s[484]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[485]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[486]!, self._r[486]!, [_1, _2, _3, _4, _5, _6]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[485]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[487]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[486]!, self._r[486]!, [_0]) + return formatWithArgumentRanges(self._s[488]!, self._r[488]!, [_0]) } - public var Channel_SignMessages: String { return self._s[487]! } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[488]! } - public var Passport_ScanPassport: String { return self._s[489]! } - public var Watch_Suggestion_Thanks: String { return self._s[490]! } - public var BlockedUsers_AddNew: String { return self._s[491]! } - public var Watch_Message_Invoice: String { return self._s[492]! } + public var Channel_SignMessages: String { return self._s[489]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[490]! } + public var Passport_ScanPassport: String { return self._s[491]! } + public var Watch_Suggestion_Thanks: String { return self._s[492]! } + public var BlockedUsers_AddNew: String { return self._s[493]! } + public var Watch_Message_Invoice: String { return self._s[494]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[493]!, self._r[493]!, [_1, _2]) + return formatWithArgumentRanges(self._s[495]!, self._r[495]!, [_1, _2]) } - public var Month_GenJuly: String { return self._s[494]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[495]! } + public var Month_GenJuly: String { return self._s[496]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[497]! } public func CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[496]!, self._r[496]!, [_1, _2]) + return formatWithArgumentRanges(self._s[498]!, self._r[498]!, [_1, _2]) } - public var Notification_ChannelInviterSelf: String { return self._s[498]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[499]! } + public var Notification_ChannelInviterSelf: String { return self._s[500]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[501]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[500]!, self._r[500]!, [_1, _2]) + return formatWithArgumentRanges(self._s[502]!, self._r[502]!, [_1, _2]) } - public var CheckoutInfo_Title: String { return self._s[501]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[502]! } + public var CheckoutInfo_Title: String { return self._s[503]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[504]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[503]!, self._r[503]!, [_0]) + return formatWithArgumentRanges(self._s[505]!, self._r[505]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[504]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[505]! } - public var Passport_Language_de: String { return self._s[506]! } - public var Update_Title: String { return self._s[507]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[508]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[509]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[510]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[511]! } - public var NotificationsSound_Telegraph: String { return self._s[512]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[513]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[514]! } + public var Passport_Identity_MainPage: String { return self._s[506]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[507]! } + public var Passport_Language_de: String { return self._s[508]! } + public var Update_Title: String { return self._s[509]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[510]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[511]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[512]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[513]! } + public var NotificationsSound_Telegraph: String { return self._s[514]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[515]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[516]! } public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[515]!, self._r[515]!, [_0]) + return formatWithArgumentRanges(self._s[517]!, self._r[517]!, [_0]) } - public var Stickers_SuggestAll: String { return self._s[516]! } - public var Conversation_ForwardTitle: String { return self._s[517]! } + public var Stickers_SuggestAll: String { return self._s[518]! } + public var Conversation_ForwardTitle: String { return self._s[519]! } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[518]!, self._r[518]!, [_0]) + return formatWithArgumentRanges(self._s[520]!, self._r[520]!, [_0]) } - public var Calls_NewCall: String { return self._s[519]! } - public var Call_StatusEnded: String { return self._s[520]! } - public var Settings_ProxyConnected: String { return self._s[521]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[522]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[523]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[524]! } - public var Passport_PasswordPlaceholder: String { return self._s[525]! } - public var Message_PinnedInvoice: String { return self._s[526]! } - public var Passport_Identity_IssueDate: String { return self._s[527]! } - public var Passport_Language_pl: String { return self._s[528]! } + public var Calls_NewCall: String { return self._s[521]! } + public var Call_StatusEnded: String { return self._s[522]! } + public var Settings_ProxyConnected: String { return self._s[523]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[524]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[525]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[526]! } + public var Passport_PasswordPlaceholder: String { return self._s[527]! } + public var Message_PinnedInvoice: String { return self._s[528]! } + public var Passport_Identity_IssueDate: String { return self._s[529]! } + public var Passport_Language_pl: String { return self._s[530]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[529]!, self._r[529]!, [_0]) + return formatWithArgumentRanges(self._s[531]!, self._r[531]!, [_0]) } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[530]! } - public var Call_StatusConnecting: String { return self._s[531]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[532]! } + public var Call_StatusConnecting: String { return self._s[533]! } public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[532]!, self._r[532]!, [_0]) + return formatWithArgumentRanges(self._s[534]!, self._r[534]!, [_0]) } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[534]! } - public var Common_Edit: String { return self._s[535]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[536]! } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[536]! } + public var Common_Edit: String { return self._s[537]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[538]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[537]!, self._r[537]!, [_0]) + return formatWithArgumentRanges(self._s[539]!, self._r[539]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[538]! } - public var PrivateDataSettings_Title: String { return self._s[539]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[540]! } - public var ChatList_Read: String { return self._s[541]! } - public var GroupPermission_SectionTitle: String { return self._s[542]! } - public var Checkout_ErrorPaymentFailed: String { return self._s[544]! } - public var Update_UpdateApp: String { return self._s[545]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[546]! } - public var Settings_Appearance: String { return self._s[547]! } - public var Watch_Location_Access: String { return self._s[549]! } - public var ShareMenu_CopyShareLink: String { return self._s[551]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[552]! } + public var GroupInfo_ChatAdmins: String { return self._s[540]! } + public var PrivateDataSettings_Title: String { return self._s[541]! } + public var Login_CancelPhoneVerificationStop: String { return self._s[542]! } + public var ChatList_Read: String { return self._s[543]! } + public var GroupPermission_SectionTitle: String { return self._s[544]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[546]! } + public var Update_UpdateApp: String { return self._s[547]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[548]! } + public var Settings_Appearance: String { return self._s[549]! } + public var Watch_Location_Access: String { return self._s[551]! } + public var ShareMenu_CopyShareLink: String { return self._s[553]! } + public var TwoStepAuth_SetupHintTitle: String { return self._s[554]! } public func PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[554]!, self._r[554]!, [_1]) + return formatWithArgumentRanges(self._s[556]!, self._r[556]!, [_1]) } public func CHAT_MESSAGE_PHOTOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[555]!, self._r[555]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[557]!, self._r[557]!, [_1, _2, _3]) } public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[556]!, self._r[556]!, [_0]) + return formatWithArgumentRanges(self._s[558]!, self._r[558]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[557]! } - public var Weekday_ShortWednesday: String { return self._s[558]! } - public var Undo_LeftGroup: String { return self._s[561]! } + public var Notifications_ClassicTones: String { return self._s[559]! } + public var Weekday_ShortWednesday: String { return self._s[560]! } + public var Undo_LeftGroup: String { return self._s[563]! } public func CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_1]) + return formatWithArgumentRanges(self._s[564]!, self._r[564]!, [_1]) } - public var Conversation_LinkDialogCopy: String { return self._s[563]! } - public var KeyCommand_FocusOnInputField: String { return self._s[564]! } - public var Contacts_SelectAll: String { return self._s[565]! } - public var Preview_SaveToCameraRoll: String { return self._s[566]! } + public var Conversation_LinkDialogCopy: String { return self._s[565]! } + public var KeyCommand_FocusOnInputField: String { return self._s[566]! } + public var Contacts_SelectAll: String { return self._s[567]! } + public var Preview_SaveToCameraRoll: String { return self._s[568]! } public func CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[567]!, self._r[567]!, [_1, _2]) + return formatWithArgumentRanges(self._s[569]!, self._r[569]!, [_1, _2]) } - public var Wallpaper_Title: String { return self._s[568]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[569]! } - public var AccessDenied_Camera: String { return self._s[570]! } - public var Watch_Compose_CurrentLocation: String { return self._s[571]! } - public var BackgroundPreview_Still: String { return self._s[573]! } + public var Wallpaper_Title: String { return self._s[570]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[571]! } + public var AccessDenied_Camera: String { return self._s[572]! } + public var Watch_Compose_CurrentLocation: String { return self._s[573]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[574]!, self._r[574]!, [_0]) + return formatWithArgumentRanges(self._s[575]!, self._r[575]!, [_0]) } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[575]! } - public var Passport_Language_ro: String { return self._s[576]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[577]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[576]! } + public var Passport_Language_ro: String { return self._s[577]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[578]! } public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[578]!, self._r[578]!, [_0]) + return formatWithArgumentRanges(self._s[579]!, self._r[579]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[579]! } - public var State_ConnectingToProxy: String { return self._s[580]! } - public var Calls_RatingTitle: String { return self._s[581]! } - public var Generic_ErrorMoreInfo: String { return self._s[582]! } - public var Appearance_PreviewReplyText: String { return self._s[583]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[584]! } - public var SharedMedia_CategoryLinks: String { return self._s[585]! } - public var Calls_Missed: String { return self._s[586]! } - public var Cache_Photos: String { return self._s[590]! } - public var GroupPermission_NoAddMembers: String { return self._s[591]! } + public var Login_CancelPhoneVerification: String { return self._s[580]! } + public var State_ConnectingToProxy: String { return self._s[581]! } + public var Calls_RatingTitle: String { return self._s[582]! } + public var Generic_ErrorMoreInfo: String { return self._s[583]! } + public var Appearance_PreviewReplyText: String { return self._s[584]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[585]! } + public var SharedMedia_CategoryLinks: String { return self._s[586]! } + public var Calls_Missed: String { return self._s[587]! } + public var Cache_Photos: String { return self._s[591]! } + public var GroupPermission_NoAddMembers: String { return self._s[592]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[592]!, self._r[592]!, [_0]) + return formatWithArgumentRanges(self._s[593]!, self._r[593]!, [_0]) } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[593]! } - public var Settings_ProxyDisabled: String { return self._s[594]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[594]! } + public var Settings_ProxyDisabled: String { return self._s[595]! } public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[595]!, self._r[595]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[596]!, self._r[596]!, [_1, _2, _3, _4]) } public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[596]!, self._r[596]!, [_0]) + return formatWithArgumentRanges(self._s[597]!, self._r[597]!, [_0]) } - public var Appearance_Title: String { return self._s[597]! } + public var Appearance_Title: String { return self._s[598]! } public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[599]!, self._r[599]!, [_0]) + return formatWithArgumentRanges(self._s[600]!, self._r[600]!, [_0]) } public func CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[600]!, self._r[600]!, [_1]) - } - public func PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[601]!, self._r[601]!, [_1]) } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[602]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[603]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[604]! } - public var Preview_DeletePhoto: String { return self._s[605]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[606]! } + public func PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[602]!, self._r[602]!, [_1]) + } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[603]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[604]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[605]! } + public var Preview_DeletePhoto: String { return self._s[606]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[607]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[607]!, self._r[607]!, [_0]) + return formatWithArgumentRanges(self._s[608]!, self._r[608]!, [_0]) } - public var Coub_TapForSound: String { return self._s[609]! } - public var Map_LocatingError: String { return self._s[610]! } + public var Coub_TapForSound: String { return self._s[610]! } + public var Map_LocatingError: String { return self._s[611]! } public func CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[612]!, self._r[612]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[613]!, self._r[613]!, [_1, _2, _3]) } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[613]! } - public var Passport_ForgottenPassword: String { return self._s[614]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[615]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[616]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[614]! } + public var Passport_ForgottenPassword: String { return self._s[615]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[616]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[617]! } public func PINNED_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[618]!, self._r[618]!, [_1, _2]) + return formatWithArgumentRanges(self._s[619]!, self._r[619]!, [_1, _2]) } - public var Login_TermsOfServiceSignupDecline: String { return self._s[619]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[620]! } - public var Message_Location: String { return self._s[621]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[622]! } - public var Channel_Management_Title: String { return self._s[623]! } - public var DialogList_SearchSectionDialogs: String { return self._s[625]! } - public var Compose_NewChannel_Members: String { return self._s[626]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[620]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[621]! } + public var Message_Location: String { return self._s[622]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[623]! } + public var Channel_Management_Title: String { return self._s[624]! } + public var DialogList_SearchSectionDialogs: String { return self._s[626]! } + public var Compose_NewChannel_Members: String { return self._s[627]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[627]!, self._r[627]!, [_0]) + return formatWithArgumentRanges(self._s[628]!, self._r[628]!, [_0]) } - public var AutoNightTheme_ScheduledFrom: String { return self._s[628]! } - public var PhotoEditor_WarmthTool: String { return self._s[629]! } - public var Passport_Language_tr: String { return self._s[630]! } - public var Login_ResetAccountProtected_Reset: String { return self._s[632]! } - public var Watch_PhotoView_Title: String { return self._s[633]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[629]! } + public var PhotoEditor_WarmthTool: String { return self._s[630]! } + public var Passport_Language_tr: String { return self._s[631]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[633]! } + public var Watch_PhotoView_Title: String { return self._s[634]! } public func MESSAGES(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[634]!, self._r[634]!, [_1, _2]) + return formatWithArgumentRanges(self._s[635]!, self._r[635]!, [_1, _2]) } - public var Passport_Phone_Delete: String { return self._s[635]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[636]! } - public var GroupInfo_Permissions: String { return self._s[637]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[638]! } - public var Profile_ShareContactButton: String { return self._s[639]! } - public var ChatSettings_Other: String { return self._s[640]! } - public var UserInfo_NotificationsDisabled: String { return self._s[641]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[642]! } - public var LastSeen_WithinAMonth: String { return self._s[643]! } - public var Channel_AdminLog_BanSendStickers: String { return self._s[644]! } - public var Conversation_EncryptionCanceled: String { return self._s[645]! } - public var MediaPicker_GroupDescription: String { return self._s[646]! } - public var WebSearch_Images: String { return self._s[647]! } + public var Passport_Phone_Delete: String { return self._s[636]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[637]! } + public var GroupInfo_Permissions: String { return self._s[638]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[639]! } + public var Profile_ShareContactButton: String { return self._s[640]! } + public var ChatSettings_Other: String { return self._s[641]! } + public var UserInfo_NotificationsDisabled: String { return self._s[642]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[643]! } + public var LastSeen_WithinAMonth: String { return self._s[644]! } + public var Channel_AdminLog_BanSendStickers: String { return self._s[645]! } + public var Conversation_EncryptionCanceled: String { return self._s[646]! } + public var MediaPicker_GroupDescription: String { return self._s[647]! } + public var WebSearch_Images: String { return self._s[648]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[648]!, self._r[648]!, [_0]) + return formatWithArgumentRanges(self._s[649]!, self._r[649]!, [_0]) } - public var Message_Photo: String { return self._s[649]! } - public var PasscodeSettings_HelpBottom: String { return self._s[650]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[651]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[652]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[653]! } - public var NotificationsSound_Calypso: String { return self._s[654]! } - public var Map_Map: String { return self._s[655]! } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[657]! } - public var ChatSettings_TextSizeUnits: String { return self._s[658]! } - public var Common_of: String { return self._s[659]! } - public var Conversation_ForwardContacts: String { return self._s[661]! } - public var Passport_Language_hy: String { return self._s[663]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[664]! } - public var BackgroundPreview_Title: String { return self._s[665]! } + public var Message_Photo: String { return self._s[650]! } + public var PasscodeSettings_HelpBottom: String { return self._s[651]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[652]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[653]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[654]! } + public var NotificationsSound_Calypso: String { return self._s[655]! } + public var Map_Map: String { return self._s[656]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[658]! } + public var ChatSettings_TextSizeUnits: String { return self._s[659]! } + public var Common_of: String { return self._s[660]! } + public var Conversation_ForwardContacts: String { return self._s[662]! } + public var Passport_Language_hy: String { return self._s[664]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[665]! } public var AutoDownloadSettings_Reset: String { return self._s[666]! } public var Paint_ClearConfirm: String { return self._s[667]! } public var Camera_VideoMode: String { return self._s[668]! } @@ -921,631 +921,634 @@ public final class PresentationStrings { public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[671]!, self._r[671]!, [_0]) } - public var Passport_Language_el: String { return self._s[672]! } - public var PhotoEditor_Original: String { return self._s[673]! } - public var Settings_FAQ_Button: String { return self._s[675]! } - public var Channel_Setup_PublicNoLink: String { return self._s[677]! } - public var Conversation_UnsupportedMedia: String { return self._s[678]! } - public var Conversation_SlideToCancel: String { return self._s[679]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[680]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[681]! } - public var AutoNightTheme_NotAvailable: String { return self._s[682]! } - public var Common_Create: String { return self._s[683]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[684]! } - public var Localization_ChooseLanguage: String { return self._s[686]! } - public var Settings_Proxy: String { return self._s[689]! } - public var Privacy_TopPeersHelp: String { return self._s[690]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[691]! } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[692]! } + public var Conversation_ViewBackground: String { return self._s[672]! } + public var Passport_Language_el: String { return self._s[673]! } + public var PhotoEditor_Original: String { return self._s[674]! } + public var Settings_FAQ_Button: String { return self._s[676]! } + public var Channel_Setup_PublicNoLink: String { return self._s[678]! } + public var Conversation_UnsupportedMedia: String { return self._s[679]! } + public var Conversation_SlideToCancel: String { return self._s[680]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[681]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[682]! } + public var AutoNightTheme_NotAvailable: String { return self._s[683]! } + public var Common_Create: String { return self._s[684]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[685]! } + public var Localization_ChooseLanguage: String { return self._s[687]! } + public var Settings_Proxy: String { return self._s[690]! } + public var Privacy_TopPeersHelp: String { return self._s[691]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[692]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[693]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[694]!, self._r[694]!, [_0]) + return formatWithArgumentRanges(self._s[695]!, self._r[695]!, [_0]) } - public var Contacts_SortedByPresence: String { return self._s[695]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[696]! } - public var Cache_Title: String { return self._s[697]! } + public var Contacts_SortedByPresence: String { return self._s[696]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[697]! } + public var Cache_Title: String { return self._s[698]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[698]!, self._r[698]!, [_0]) + return formatWithArgumentRanges(self._s[699]!, self._r[699]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[699]! } - public var Channel_Moderator_Title: String { return self._s[700]! } - public var InstantPage_AutoNightTheme: String { return self._s[702]! } - public var Passport_Scans_Upload: String { return self._s[706]! } - public var Undo_Undo: String { return self._s[707]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[708]! } - public var TwoStepAuth_RemovePassword: String { return self._s[709]! } - public var Common_Delete: String { return self._s[710]! } - public var Conversation_ContextMenuDelete: String { return self._s[712]! } - public var SocksProxySetup_Credentials: String { return self._s[713]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[715]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[718]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[719]! } - public var Passport_Language_id: String { return self._s[721]! } - public var ChannelIntro_Title: String { return self._s[722]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[700]! } + public var Channel_Moderator_Title: String { return self._s[701]! } + public var InstantPage_AutoNightTheme: String { return self._s[703]! } + public var Passport_Scans_Upload: String { return self._s[707]! } + public var Undo_Undo: String { return self._s[708]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[709]! } + public var TwoStepAuth_RemovePassword: String { return self._s[710]! } + public var Common_Delete: String { return self._s[711]! } + public var Conversation_ContextMenuDelete: String { return self._s[713]! } + public var SocksProxySetup_Credentials: String { return self._s[714]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[716]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[719]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[720]! } + public var Passport_Language_id: String { return self._s[722]! } + public var ChannelIntro_Title: String { return self._s[723]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[723]!, self._r[723]!, [_0]) + return formatWithArgumentRanges(self._s[724]!, self._r[724]!, [_0]) } public func PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[725]!, self._r[725]!, [_1]) + return formatWithArgumentRanges(self._s[726]!, self._r[726]!, [_1]) } - public var Channel_Info_Description: String { return self._s[726]! } - public var Stickers_FavoriteStickers: String { return self._s[727]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[728]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[729]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[730]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[731]! } + public var Channel_Info_Description: String { return self._s[727]! } + public var Stickers_FavoriteStickers: String { return self._s[728]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[729]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[730]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[731]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[732]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[732]!, self._r[732]!, [_1, _2]) + return formatWithArgumentRanges(self._s[733]!, self._r[733]!, [_1, _2]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[733]!, self._r[733]!, [_0]) + return formatWithArgumentRanges(self._s[734]!, self._r[734]!, [_0]) } - public var GroupPermission_Delete: String { return self._s[734]! } - public var Passport_Language_uk: String { return self._s[735]! } - public var StickerPack_HideStickers: String { return self._s[737]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[738]! } + public var GroupPermission_Delete: String { return self._s[735]! } + public var Passport_Language_uk: String { return self._s[736]! } + public var StickerPack_HideStickers: String { return self._s[738]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[739]! } public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[739]!, self._r[739]!, [_1, _2]) + return formatWithArgumentRanges(self._s[740]!, self._r[740]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[740]! } + public var Activity_UploadingVideoMessage: String { return self._s[741]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[741]!, self._r[741]!, [_0]) + return formatWithArgumentRanges(self._s[742]!, self._r[742]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[742]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[743]! } - public var Settings_CallSettings: String { return self._s[744]! } - public var Camera_SquareMode: String { return self._s[745]! } - public var GroupInfo_SharedMediaNone: String { return self._s[746]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[747]! } - public var Bot_GenericBotStatus: String { return self._s[748]! } - public var Application_Update: String { return self._s[750]! } - public var Month_ShortJanuary: String { return self._s[751]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[752]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[753]! } - public var Passport_Address_Street2Placeholder: String { return self._s[754]! } + public var Channel_TitleInfo: String { return self._s[743]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[744]! } + public var Settings_CallSettings: String { return self._s[745]! } + public var Camera_SquareMode: String { return self._s[746]! } + public var GroupInfo_SharedMediaNone: String { return self._s[747]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[748]! } + public var Bot_GenericBotStatus: String { return self._s[749]! } + public var Application_Update: String { return self._s[751]! } + public var Month_ShortJanuary: String { return self._s[752]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[753]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[754]! } + public var Passport_Address_Street2Placeholder: String { return self._s[755]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[755]!, self._r[755]!, [_0]) + return formatWithArgumentRanges(self._s[756]!, self._r[756]!, [_0]) } - public var NetworkUsageSettings_Cellular: String { return self._s[756]! } - public var Appearance_PreviewOutgoingText: String { return self._s[757]! } - public var Notifications_PermissionsAllowInSettings: String { return self._s[758]! } - public var Map_Directions: String { return self._s[760]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[762]! } - public var Appearance_ThemeDay: String { return self._s[763]! } - public var Passport_Identity_AddPassport: String { return self._s[765]! } - public var Call_Message: String { return self._s[766]! } - public var PhotoEditor_ExposureTool: String { return self._s[767]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[769]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[771]! } + public var NetworkUsageSettings_Cellular: String { return self._s[757]! } + public var Appearance_PreviewOutgoingText: String { return self._s[758]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[759]! } + public var Map_Directions: String { return self._s[761]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[763]! } + public var Appearance_ThemeDay: String { return self._s[764]! } + public var Passport_Identity_AddPassport: String { return self._s[766]! } + public var Call_Message: String { return self._s[767]! } + public var PhotoEditor_ExposureTool: String { return self._s[768]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[770]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[772]! } public func PINNED_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[772]!, self._r[772]!, [_1]) + return formatWithArgumentRanges(self._s[773]!, self._r[773]!, [_1]) } - public var Appearance_Preview: String { return self._s[773]! } - public var Compose_ChannelMembers: String { return self._s[774]! } - public var Conversation_DeleteManyMessages: String { return self._s[775]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[776]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[777]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[778]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[781]! } - public var Conversation_UpdateTelegram: String { return self._s[782]! } + public var Appearance_Preview: String { return self._s[774]! } + public var Compose_ChannelMembers: String { return self._s[775]! } + public var Conversation_DeleteManyMessages: String { return self._s[776]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[777]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[778]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[779]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[782]! } + public var Conversation_UpdateTelegram: String { return self._s[783]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[783]!, self._r[783]!, [_0]) + return formatWithArgumentRanges(self._s[784]!, self._r[784]!, [_0]) } - public var GroupInfo_Administrators_Title: String { return self._s[784]! } + public var GroupInfo_Administrators_Title: String { return self._s[785]! } public func MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[785]!, self._r[785]!, [_1, _2]) + return formatWithArgumentRanges(self._s[786]!, self._r[786]!, [_1, _2]) } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[786]!, self._r[786]!, [_0]) + return formatWithArgumentRanges(self._s[787]!, self._r[787]!, [_0]) } - public var Tour_Title3: String { return self._s[787]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[788]! } - public var Clipboard_SendPhoto: String { return self._s[792]! } - public var MediaPicker_Videos: String { return self._s[793]! } - public var Passport_Email_Title: String { return self._s[794]! } + public var Tour_Title3: String { return self._s[788]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[789]! } + public var Clipboard_SendPhoto: String { return self._s[793]! } + public var MediaPicker_Videos: String { return self._s[794]! } + public var Passport_Email_Title: String { return self._s[795]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[795]!, self._r[795]!, [_0]) + return formatWithArgumentRanges(self._s[796]!, self._r[796]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[796]! } - public var Conversation_MessageDialogDelete: String { return self._s[797]! } - public var Privacy_Calls_CustomHelp: String { return self._s[799]! } - public var GroupInfo_SetSound: String { return self._s[800]! } - public var Core_ServiceUserStatus: String { return self._s[801]! } - public var LiveLocationUpdated_JustNow: String { return self._s[802]! } + public var StickerPacksSettings_Title: String { return self._s[797]! } + public var Conversation_MessageDialogDelete: String { return self._s[798]! } + public var Privacy_Calls_CustomHelp: String { return self._s[800]! } + public var GroupInfo_SetSound: String { return self._s[801]! } + public var Core_ServiceUserStatus: String { return self._s[802]! } + public var LiveLocationUpdated_JustNow: String { return self._s[803]! } public func CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[803]!, self._r[803]!, [_1, _2]) + return formatWithArgumentRanges(self._s[804]!, self._r[804]!, [_1, _2]) } - public var Call_StatusFailed: String { return self._s[804]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[805]! } - public var TwoStepAuth_SetPassword: String { return self._s[806]! } + public var Call_StatusFailed: String { return self._s[805]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[806]! } + public var TwoStepAuth_SetPassword: String { return self._s[807]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[808]!, self._r[808]!, [_0]) + return formatWithArgumentRanges(self._s[809]!, self._r[809]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[809]! } - public var Profile_Username: String { return self._s[810]! } - public var Bot_DescriptionTitle: String { return self._s[811]! } - public var MaskStickerSettings_Title: String { return self._s[812]! } - public var SharedMedia_CategoryOther: String { return self._s[813]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[814]! } - public var Common_NotNow: String { return self._s[815]! } - public var Map_Location: String { return self._s[816]! } - public var Invitation_JoinGroup: String { return self._s[817]! } - public var AutoDownloadSettings_Title: String { return self._s[819]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[820]! } - public var Channel_ErrorAddBlocked: String { return self._s[821]! } - public var Conversation_UnblockUser: String { return self._s[822]! } - public var Watch_Bot_Restart: String { return self._s[823]! } - public var TwoStepAuth_Title: String { return self._s[824]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[825]! } - public var Checkout_ShippingMethod: String { return self._s[826]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[827]! } + public var Calls_SubmitRating: String { return self._s[810]! } + public var Profile_Username: String { return self._s[811]! } + public var Bot_DescriptionTitle: String { return self._s[812]! } + public var MaskStickerSettings_Title: String { return self._s[813]! } + public var SharedMedia_CategoryOther: String { return self._s[814]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[815]! } + public var Common_NotNow: String { return self._s[816]! } + public var Map_Location: String { return self._s[817]! } + public var Invitation_JoinGroup: String { return self._s[818]! } + public var AutoDownloadSettings_Title: String { return self._s[820]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[821]! } + public var Channel_ErrorAddBlocked: String { return self._s[822]! } + public var Conversation_UnblockUser: String { return self._s[823]! } + public var Watch_Bot_Restart: String { return self._s[824]! } + public var TwoStepAuth_Title: String { return self._s[825]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[826]! } + public var Checkout_ShippingMethod: String { return self._s[827]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[828]! } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[829]!, self._r[829]!, [_0]) + return formatWithArgumentRanges(self._s[830]!, self._r[830]!, [_0]) } - public var AuthSessions_TerminateOtherSessions: String { return self._s[830]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[831]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[832]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[833]! } - public var Checkout_PaymentMethod_Title: String { return self._s[834]! } - public var SocksProxySetup_Connection: String { return self._s[835]! } - public var Group_MessagePhotoRemoved: String { return self._s[836]! } - public var Channel_Stickers_NotFound: String { return self._s[838]! } - public var Group_About_Help: String { return self._s[839]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[840]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[831]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[832]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[833]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[834]! } + public var Checkout_PaymentMethod_Title: String { return self._s[835]! } + public var SocksProxySetup_Connection: String { return self._s[836]! } + public var Group_MessagePhotoRemoved: String { return self._s[837]! } + public var Channel_Stickers_NotFound: String { return self._s[839]! } + public var Group_About_Help: String { return self._s[840]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[841]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[842]!, self._r[842]!, [_1]) + return formatWithArgumentRanges(self._s[843]!, self._r[843]!, [_1]) } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[844]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[845]! } - public var SocksProxySetup_Password: String { return self._s[846]! } - public var Notifications_PermissionsEnable: String { return self._s[847]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[849]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[845]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[846]! } + public var SocksProxySetup_Password: String { return self._s[847]! } + public var Notifications_PermissionsEnable: String { return self._s[848]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[850]! } public func MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[850]!, self._r[850]!, [_1, _2]) + return formatWithArgumentRanges(self._s[851]!, self._r[851]!, [_1, _2]) } public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[851]!, self._r[851]!, [_1]) + return formatWithArgumentRanges(self._s[852]!, self._r[852]!, [_1]) } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[853]!, self._r[853]!, [_0]) + return formatWithArgumentRanges(self._s[854]!, self._r[854]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[854]! } - public var ArchivedPacksAlert_Title: String { return self._s[855]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[855]! } + public var ArchivedPacksAlert_Title: String { return self._s[856]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[856]!, self._r[856]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[857]!, self._r[857]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[857]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[858]! } - public var Conversation_StatusTyping: String { return self._s[859]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[860]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[861]! } - public var UserInfo_CreateNewContact: String { return self._s[862]! } - public var Passport_Identity_FrontSide: String { return self._s[863]! } - public var Calls_CallTabTitle: String { return self._s[864]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[865]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[858]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[859]! } + public var Conversation_StatusTyping: String { return self._s[860]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[861]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[862]! } + public var UserInfo_CreateNewContact: String { return self._s[863]! } + public var Passport_Identity_FrontSide: String { return self._s[864]! } + public var Calls_CallTabTitle: String { return self._s[865]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[866]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[866]!, self._r[866]!, [_0]) + return formatWithArgumentRanges(self._s[867]!, self._r[867]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[867]! } - public var SharedMedia_EmptyMusicText: String { return self._s[868]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[869]! } - public var Paint_Stickers: String { return self._s[870]! } - public var Privacy_GroupsAndChannels: String { return self._s[871]! } - public var UserInfo_AddContact: String { return self._s[873]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[868]! } + public var SharedMedia_EmptyMusicText: String { return self._s[869]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[870]! } + public var Paint_Stickers: String { return self._s[871]! } + public var Privacy_GroupsAndChannels: String { return self._s[872]! } + public var UserInfo_AddContact: String { return self._s[874]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[874]!, self._r[874]!, [_0]) + return formatWithArgumentRanges(self._s[875]!, self._r[875]!, [_0]) } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[876]! } - public var DialogList_NoMessagesTitle: String { return self._s[878]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[879]! } - public var BlockedUsers_BlockUser: String { return self._s[880]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[881]! } - public var MediaPicker_UngroupDescription: String { return self._s[882]! } - public var Watch_NoConnection: String { return self._s[883]! } - public var Month_GenSeptember: String { return self._s[884]! } - public var Conversation_ViewGroup: String { return self._s[885]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[888]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[889]! } - public var MediaPicker_CameraRoll: String { return self._s[891]! } - public var Month_GenAugust: String { return self._s[892]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[893]! } - public var SharedMedia_EmptyText: String { return self._s[894]! } - public var Map_ShareLiveLocation: String { return self._s[895]! } - public var Calls_All: String { return self._s[896]! } - public var Appearance_ThemeNight: String { return self._s[899]! } - public var Conversation_HoldForAudio: String { return self._s[900]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[903]! } - public var SocksProxySetup_Secret: String { return self._s[904]! } - public var Channel_BanList_RestrictedTitle: String { return self._s[906]! } - public var Conversation_Location: String { return self._s[907]! } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[909]! } - public var Notifications_PermissionsText: String { return self._s[910]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[911]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[913]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[915]! } - public var Passport_DeletePassportConfirmation: String { return self._s[917]! } - public var Login_InvalidCodeError: String { return self._s[918]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[919]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[877]! } + public var DialogList_NoMessagesTitle: String { return self._s[879]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[880]! } + public var BlockedUsers_BlockUser: String { return self._s[881]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[882]! } + public var MediaPicker_UngroupDescription: String { return self._s[883]! } + public var Watch_NoConnection: String { return self._s[884]! } + public var Month_GenSeptember: String { return self._s[885]! } + public var Conversation_ViewGroup: String { return self._s[886]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[889]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[890]! } + public var MediaPicker_CameraRoll: String { return self._s[892]! } + public var Month_GenAugust: String { return self._s[893]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[894]! } + public var SharedMedia_EmptyText: String { return self._s[895]! } + public var Map_ShareLiveLocation: String { return self._s[896]! } + public var Calls_All: String { return self._s[897]! } + public var Appearance_ThemeNight: String { return self._s[900]! } + public var Conversation_HoldForAudio: String { return self._s[901]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[904]! } + public var SocksProxySetup_Secret: String { return self._s[905]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[907]! } + public var Conversation_Location: String { return self._s[908]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[910]! } + public var Notifications_PermissionsText: String { return self._s[911]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[912]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[914]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[916]! } + public var Passport_DeletePassportConfirmation: String { return self._s[918]! } + public var Login_InvalidCodeError: String { return self._s[919]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[920]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[920]!, self._r[920]!, [_0]) - } - public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[921]!, self._r[921]!, [_0]) } - public var Call_CallInProgressTitle: String { return self._s[922]! } - public var Month_ShortSeptember: String { return self._s[923]! } - public var Watch_ChannelInfo_Title: String { return self._s[924]! } - public var DialogList_PasscodeLockHelp: String { return self._s[927]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[928]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[929]! } - public var PhotoEditor_CropReset: String { return self._s[930]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[932]! } - public var Channel_Management_LabelEditor: String { return self._s[933]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[935]! } - public var PhotoEditor_HighlightsTool: String { return self._s[936]! } - public var UserInfo_Title: String { return self._s[937]! } - public var AccessDenied_Title: String { return self._s[938]! } - public var DialogList_SearchLabel: String { return self._s[939]! } - public var Group_Setup_HistoryHidden: String { return self._s[940]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[941]! } - public var State_Updating: String { return self._s[943]! } - public var Contacts_TabTitle: String { return self._s[944]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[946]! } - public var GroupInfo_GroupHistory: String { return self._s[947]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[948]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[949]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[950]! } - public var Contacts_NotRegisteredSection: String { return self._s[951]! } + public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[922]!, self._r[922]!, [_0]) + } + public var Call_CallInProgressTitle: String { return self._s[923]! } + public var Month_ShortSeptember: String { return self._s[924]! } + public var Watch_ChannelInfo_Title: String { return self._s[925]! } + public var DialogList_PasscodeLockHelp: String { return self._s[928]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[929]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[930]! } + public var PhotoEditor_CropReset: String { return self._s[931]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[933]! } + public var Channel_Management_LabelEditor: String { return self._s[934]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[936]! } + public var PhotoEditor_HighlightsTool: String { return self._s[937]! } + public var UserInfo_Title: String { return self._s[938]! } + public var AccessDenied_Title: String { return self._s[939]! } + public var DialogList_SearchLabel: String { return self._s[940]! } + public var Group_Setup_HistoryHidden: String { return self._s[941]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[942]! } + public var State_Updating: String { return self._s[944]! } + public var Contacts_TabTitle: String { return self._s[945]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[947]! } + public var GroupInfo_GroupHistory: String { return self._s[948]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[949]! } + public var Wallpaper_SetColor: String { return self._s[950]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[951]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[952]! } + public var Contacts_NotRegisteredSection: String { return self._s[953]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[954]!, self._r[954]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[953]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[954]! } - public var SocksProxySetup_Connecting: String { return self._s[955]! } - public var ExplicitContent_AlertChannel: String { return self._s[956]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[957]! } - public var Conversation_Contact: String { return self._s[958]! } - public var Login_CodeExpired: String { return self._s[959]! } - public var Passport_DiscardMessageAction: String { return self._s[960]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[961]! } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[962]! } - public var Month_ShortApril: String { return self._s[963]! } - public var AuthSessions_CurrentSession: String { return self._s[964]! } - public var BackgroundPreview_Blurred: String { return self._s[965]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[969]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[970]! } - public var Channel_Setup_TypePrivate: String { return self._s[972]! } - public var Forward_ChannelReadOnly: String { return self._s[975]! } - public var PhotoEditor_CurvesBlue: String { return self._s[976]! } - public var UserInfo_BotPrivacy: String { return self._s[977]! } - public var Notification_PassportValueEmail: String { return self._s[978]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[979]! } - public var GroupPermission_NewTitle: String { return self._s[980]! } - public var GroupInfo_Permissions_AddException: String { return self._s[981]! } - public var Channel_SignMessages_Help: String { return self._s[983]! } - public var Undo_ChatDeleted: String { return self._s[985]! } + public var Paint_Clear: String { return self._s[955]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[956]! } + public var SocksProxySetup_Connecting: String { return self._s[957]! } + public var ExplicitContent_AlertChannel: String { return self._s[958]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[959]! } + public var Conversation_Contact: String { return self._s[960]! } + public var Login_CodeExpired: String { return self._s[961]! } + public var Passport_DiscardMessageAction: String { return self._s[962]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[963]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[964]! } + public var Month_ShortApril: String { return self._s[965]! } + public var AuthSessions_CurrentSession: String { return self._s[966]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[970]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[971]! } + public var Channel_Setup_TypePrivate: String { return self._s[973]! } + public var Forward_ChannelReadOnly: String { return self._s[976]! } + public var PhotoEditor_CurvesBlue: String { return self._s[977]! } + public var UserInfo_BotPrivacy: String { return self._s[978]! } + public var Notification_PassportValueEmail: String { return self._s[979]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[980]! } + public var GroupPermission_NewTitle: String { return self._s[981]! } + public var GroupInfo_Permissions_AddException: String { return self._s[982]! } + public var Channel_SignMessages_Help: String { return self._s[984]! } + public var Undo_ChatDeleted: String { return self._s[986]! } + public var Conversation_ChatBackground: String { return self._s[987]! } public func CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[986]!, self._r[986]!, [_1, _2]) + return formatWithArgumentRanges(self._s[988]!, self._r[988]!, [_1, _2]) } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[987]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[988]! } - public var Passport_Language_pt: String { return self._s[989]! } - public var NotificationsSound_Popcorn: String { return self._s[992]! } - public var AutoNightTheme_Disabled: String { return self._s[993]! } - public var BlockedUsers_LeavePrefix: String { return self._s[994]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[995]! } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[989]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[990]! } + public var Passport_Language_pt: String { return self._s[991]! } + public var NotificationsSound_Popcorn: String { return self._s[994]! } + public var AutoNightTheme_Disabled: String { return self._s[995]! } + public var BlockedUsers_LeavePrefix: String { return self._s[996]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[997]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[996]!, self._r[996]!, [_0]) + return formatWithArgumentRanges(self._s[998]!, self._r[998]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[997]! } - public var SocksProxySetup_UseForCalls: String { return self._s[998]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1000]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[999]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1000]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1002]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1001]!, self._r[1001]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1003]!, self._r[1003]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1003]! } - public var Compose_NewEncryptedChat: String { return self._s[1004]! } - public var Login_CodeFloodError: String { return self._s[1005]! } - public var Calls_TabTitle: String { return self._s[1006]! } - public var Passport_Language_he: String { return self._s[1007]! } - public var GroupPermission_Title: String { return self._s[1008]! } + public var SocksProxySetup_Hostname: String { return self._s[1005]! } + public var Compose_NewEncryptedChat: String { return self._s[1006]! } + public var Login_CodeFloodError: String { return self._s[1007]! } + public var Calls_TabTitle: String { return self._s[1008]! } + public var Passport_Language_he: String { return self._s[1009]! } + public var GroupPermission_Title: String { return self._s[1010]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1009]!, self._r[1009]!, [_0]) + return formatWithArgumentRanges(self._s[1011]!, self._r[1011]!, [_0]) } - public var GroupPermission_NoChangeInfo: String { return self._s[1010]! } - public var Tour_Text1: String { return self._s[1011]! } - public var Month_ShortFebruary: String { return self._s[1012]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1013]! } - public var NotificationsSound_Glass: String { return self._s[1014]! } - public var Appearance_ThemeNightBlue: String { return self._s[1015]! } - public var CheckoutInfo_Pay: String { return self._s[1016]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1018]! } - public var Call_CallAgain: String { return self._s[1020]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1021]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1022]! } - public var Passport_InvalidPasswordError: String { return self._s[1023]! } - public var Watch_Message_Game: String { return self._s[1024]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1012]! } + public var Tour_Text1: String { return self._s[1013]! } + public var Month_ShortFebruary: String { return self._s[1014]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1015]! } + public var NotificationsSound_Glass: String { return self._s[1016]! } + public var Appearance_ThemeNightBlue: String { return self._s[1017]! } + public var CheckoutInfo_Pay: String { return self._s[1018]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1020]! } + public var WallpaperPreview_MessageText: String { return self._s[1021]! } + public var Call_CallAgain: String { return self._s[1023]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1024]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1025]! } + public var Passport_InvalidPasswordError: String { return self._s[1026]! } + public var Watch_Message_Game: String { return self._s[1027]! } public func PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1025]!, self._r[1025]!, [_1]) + return formatWithArgumentRanges(self._s[1028]!, self._r[1028]!, [_1]) } - public var Stickers_Install: String { return self._s[1026]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1027]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1029]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1030]! } - public var AuthSessions_OtherSessions: String { return self._s[1031]! } - public var Channel_Username_Help: String { return self._s[1032]! } - public var Camera_Title: String { return self._s[1033]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1035]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1036]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1037]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1038]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1039]! } - public var Conversation_RestrictedStickers: String { return self._s[1040]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1042]! } - public var UserInfo_TelegramCall: String { return self._s[1044]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1045]! } - public var CreatePoll_OptionsHeader: String { return self._s[1046]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1047]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1048]! } + public var Stickers_Install: String { return self._s[1029]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1030]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1032]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1033]! } + public var AuthSessions_OtherSessions: String { return self._s[1034]! } + public var Channel_Username_Help: String { return self._s[1035]! } + public var Camera_Title: String { return self._s[1036]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1038]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1039]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1040]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1041]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1042]! } + public var Conversation_RestrictedStickers: String { return self._s[1043]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1045]! } + public var UserInfo_TelegramCall: String { return self._s[1047]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1048]! } + public var CreatePoll_OptionsHeader: String { return self._s[1049]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1050]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1051]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1049]!, self._r[1049]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1052]!, self._r[1052]!, [_1, _2, _3]) } - public var Settings_SaveEditedPhotos: String { return self._s[1050]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1051]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1052]! } - public var Conversation_MessageDialogRetry: String { return self._s[1053]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1054]! } - public var Group_Setup_TypeHeader: String { return self._s[1055]! } - public var Paint_RecentStickers: String { return self._s[1056]! } - public var PhotoEditor_GrainTool: String { return self._s[1057]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1058]! } - public var EmptyGroupInfo_Line4: String { return self._s[1059]! } - public var Watch_AuthRequired: String { return self._s[1061]! } + public var Settings_SaveEditedPhotos: String { return self._s[1053]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1054]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1055]! } + public var Conversation_MessageDialogRetry: String { return self._s[1056]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1057]! } + public var Group_Setup_TypeHeader: String { return self._s[1058]! } + public var Paint_RecentStickers: String { return self._s[1059]! } + public var PhotoEditor_GrainTool: String { return self._s[1060]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1061]! } + public var EmptyGroupInfo_Line4: String { return self._s[1062]! } + public var Watch_AuthRequired: String { return self._s[1064]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1062]!, self._r[1062]!, [_0]) + return formatWithArgumentRanges(self._s[1065]!, self._r[1065]!, [_0]) } public func CHANNEL_MESSAGE_PHOTOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1063]!, self._r[1063]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1066]!, self._r[1066]!, [_1, _2]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1064]! } - public var ChannelIntro_Text: String { return self._s[1065]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1066]! } - public var GroupPermission_NoSendMedia: String { return self._s[1067]! } - public var Calls_AddTab: String { return self._s[1068]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1069]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1070]! } - public var Notification_MessageLifetime1d: String { return self._s[1071]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1072]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1073]! } - public var Passport_Identity_GenderFemale: String { return self._s[1074]! } - public var BlockedUsers_BlockTitle: String { return self._s[1075]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1067]! } + public var ChannelIntro_Text: String { return self._s[1068]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1069]! } + public var GroupPermission_NoSendMedia: String { return self._s[1070]! } + public var Calls_AddTab: String { return self._s[1071]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1072]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1073]! } + public var Notification_MessageLifetime1d: String { return self._s[1074]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1075]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1076]! } + public var Passport_Identity_GenderFemale: String { return self._s[1077]! } + public var BlockedUsers_BlockTitle: String { return self._s[1078]! } public func MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1076]!, self._r[1076]!, [_1]) + return formatWithArgumentRanges(self._s[1079]!, self._r[1079]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1077]! } - public var AutoNightTheme_Scheduled: String { return self._s[1078]! } + public var Weekday_Yesterday: String { return self._s[1080]! } + public var AutoNightTheme_Scheduled: String { return self._s[1081]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1079]!, self._r[1079]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1082]!, self._r[1082]!, [_1, _2, _3, _4, _5, _6]) } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1080]! } - public var CreatePoll_Create: String { return self._s[1081]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1082]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1083]! } + public var CreatePoll_Create: String { return self._s[1084]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1085]! } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1083]!, self._r[1083]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1086]!, self._r[1086]!, [_1, _2]) } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1084]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1086]! } - public var Preview_OpenInInstagram: String { return self._s[1087]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1088]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1087]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1089]! } + public var Preview_OpenInInstagram: String { return self._s[1090]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1091]! } public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1089]!, self._r[1089]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1092]!, self._r[1092]!, [_1, _2]) } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1090]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1091]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1092]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1094]! } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1095]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1096]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1097]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1098]! } - public var GroupInfo_ActionPromote: String { return self._s[1099]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1100]! } - public var GroupInfo_Permissions_Title: String { return self._s[1101]! } - public var Permissions_ContactsText_v0: String { return self._s[1102]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1105]! } - public var Passport_FieldEmailHelp: String { return self._s[1106]! } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1107]! } - public var Weekday_ShortSaturday: String { return self._s[1108]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1109]! } - public var Watch_Conversation_UserInfo: String { return self._s[1110]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1111]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1112]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1113]! } - public var PhotoEditor_VignetteTool: String { return self._s[1114]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1115]! } - public var Passport_Language_et: String { return self._s[1116]! } - public var Passport_Language_bg: String { return self._s[1118]! } - public var Stickers_NoStickersFound: String { return self._s[1120]! } - public var Settings_About: String { return self._s[1122]! } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1093]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1094]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1095]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1097]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1098]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1099]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1100]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1101]! } + public var GroupInfo_ActionPromote: String { return self._s[1102]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1103]! } + public var GroupInfo_Permissions_Title: String { return self._s[1104]! } + public var Permissions_ContactsText_v0: String { return self._s[1105]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1108]! } + public var Passport_FieldEmailHelp: String { return self._s[1109]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1110]! } + public var Weekday_ShortSaturday: String { return self._s[1111]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1112]! } + public var Watch_Conversation_UserInfo: String { return self._s[1113]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1114]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1115]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1116]! } + public var PhotoEditor_VignetteTool: String { return self._s[1117]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1118]! } + public var Passport_Language_et: String { return self._s[1119]! } + public var Passport_Language_bg: String { return self._s[1121]! } + public var Stickers_NoStickersFound: String { return self._s[1123]! } + public var Settings_About: String { return self._s[1125]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1123]!, self._r[1123]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1126]!, self._r[1126]!, [_0, _1, _2]) } - public var KeyCommand_NewMessage: String { return self._s[1125]! } - public var Group_ErrorAddBlocked: String { return self._s[1126]! } + public var KeyCommand_NewMessage: String { return self._s[1128]! } + public var Group_ErrorAddBlocked: String { return self._s[1129]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1127]!, self._r[1127]!, [_0]) + return formatWithArgumentRanges(self._s[1130]!, self._r[1130]!, [_0]) } - public var Map_LocationTitle: String { return self._s[1128]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1129]! } - public var Cache_ClearProgress: String { return self._s[1130]! } + public var Map_LocationTitle: String { return self._s[1131]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1132]! } + public var Cache_ClearProgress: String { return self._s[1133]! } public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1131]!, self._r[1131]!, [_0]) + return formatWithArgumentRanges(self._s[1134]!, self._r[1134]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1132]! } - public var Passport_UpdateRequiredError: String { return self._s[1133]! } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1135]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1136]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1137]! } - public var Passport_Language_ka: String { return self._s[1138]! } - public var Call_Decline: String { return self._s[1139]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1140]! } + public var GroupRemoved_AddToGroup: String { return self._s[1135]! } + public var Passport_UpdateRequiredError: String { return self._s[1136]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1138]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1139]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1140]! } + public var Passport_Language_ka: String { return self._s[1141]! } + public var Call_Decline: String { return self._s[1142]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1143]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1143]!, self._r[1143]!, [_0]) + return formatWithArgumentRanges(self._s[1146]!, self._r[1146]!, [_0]) } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1144]!, self._r[1144]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1147]!, self._r[1147]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1145]! } - public var Passport_DeletePassport: String { return self._s[1147]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1148]! } - public var Month_ShortDecember: String { return self._s[1149]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1151]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1148]! } + public var Passport_DeletePassport: String { return self._s[1150]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1151]! } + public var Month_ShortDecember: String { return self._s[1152]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1154]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1152]!, self._r[1152]!, [_0]) + return formatWithArgumentRanges(self._s[1155]!, self._r[1155]!, [_0]) } - public var Channel_Stickers_Searching: String { return self._s[1153]! } - public var Conversation_EncryptedDescription1: String { return self._s[1154]! } - public var Conversation_EncryptedDescription2: String { return self._s[1155]! } - public var Conversation_EncryptedDescription3: String { return self._s[1156]! } - public var PhotoEditor_SharpenTool: String { return self._s[1157]! } + public var Channel_Stickers_Searching: String { return self._s[1156]! } + public var Conversation_EncryptedDescription1: String { return self._s[1157]! } + public var Conversation_EncryptedDescription2: String { return self._s[1158]! } + public var Conversation_EncryptedDescription3: String { return self._s[1159]! } + public var PhotoEditor_SharpenTool: String { return self._s[1160]! } public func ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1158]!, self._r[1158]!, [_1]) + return formatWithArgumentRanges(self._s[1161]!, self._r[1161]!, [_1]) } - public var Conversation_EncryptedDescription4: String { return self._s[1160]! } - public var Channel_Members_AddMembers: String { return self._s[1161]! } - public var Wallpaper_Search: String { return self._s[1162]! } - public var Weekday_Friday: String { return self._s[1163]! } - public var Privacy_ContactsSync: String { return self._s[1164]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1165]! } + public var Conversation_EncryptedDescription4: String { return self._s[1163]! } + public var Channel_Members_AddMembers: String { return self._s[1164]! } + public var Wallpaper_Search: String { return self._s[1165]! } + public var Weekday_Friday: String { return self._s[1166]! } + public var Privacy_ContactsSync: String { return self._s[1167]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1168]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1166]!, self._r[1166]!, [_0]) - } - public var GroupInfo_Permissions_Removed: String { return self._s[1167]! } - public var Passport_Identity_GenderMale: String { return self._s[1168]! } - public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1169]!, self._r[1169]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1170]! } - public var Conversation_JumpToDate: String { return self._s[1171]! } - public var Contacts_GlobalSearch: String { return self._s[1172]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1173]! } - public var Profile_MessageLifetime1d: String { return self._s[1174]! } + public var GroupInfo_Permissions_Removed: String { return self._s[1170]! } + public var Passport_Identity_GenderMale: String { return self._s[1171]! } + public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1172]!, self._r[1172]!, [_0]) + } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1173]! } + public var Conversation_JumpToDate: String { return self._s[1174]! } + public var Contacts_GlobalSearch: String { return self._s[1175]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1176]! } + public var Profile_MessageLifetime1d: String { return self._s[1177]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1175]!, self._r[1175]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1178]!, self._r[1178]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1178]! } - public var Passport_InfoTitle: String { return self._s[1180]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1181]! } + public var StickerPack_BuiltinPackName: String { return self._s[1181]! } + public var Passport_InfoTitle: String { return self._s[1183]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1184]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1185]!, self._r[1185]!, [_0]) + return formatWithArgumentRanges(self._s[1188]!, self._r[1188]!, [_0]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1186]! } - public var Profile_BotInfo: String { return self._s[1187]! } - public var Watch_Compose_CreateMessage: String { return self._s[1188]! } - public var Month_ShortNovember: String { return self._s[1189]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1189]! } + public var Profile_BotInfo: String { return self._s[1190]! } + public var Watch_Compose_CreateMessage: String { return self._s[1191]! } + public var Month_ShortNovember: String { return self._s[1192]! } public func PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1190]!, self._r[1190]!, [_1]) + return formatWithArgumentRanges(self._s[1193]!, self._r[1193]!, [_1]) } public func ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1191]!, self._r[1191]!, [_1]) + return formatWithArgumentRanges(self._s[1194]!, self._r[1194]!, [_1]) } - public var Wallpaper_SetCustomBackground: String { return self._s[1192]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1193]! } - public var NotificationsSound_Chime: String { return self._s[1194]! } - public var Passport_Language_ko: String { return self._s[1196]! } - public var InviteText_URL: String { return self._s[1197]! } - public var TextFormat_Monospace: String { return self._s[1198]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1195]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1196]! } + public var NotificationsSound_Chime: String { return self._s[1197]! } + public var Passport_Language_ko: String { return self._s[1199]! } + public var InviteText_URL: String { return self._s[1200]! } + public var TextFormat_Monospace: String { return self._s[1201]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1199]!, self._r[1199]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1202]!, self._r[1202]!, [_1, _2, _3]) } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1200]!, self._r[1200]!, [_0]) + return formatWithArgumentRanges(self._s[1203]!, self._r[1203]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1201]!, self._r[1201]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1204]!, self._r[1204]!, [_1, _2]) } - public var Passport_InfoLearnMore: String { return self._s[1203]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1204]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1205]! } - public var Your_card_has_expired: String { return self._s[1206]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1207]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1208]! } - public var Conversation_Report: String { return self._s[1211]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1212]! } - public var Notification_MessageLifetime1m: String { return self._s[1213]! } - public var Privacy_ContactsTitle: String { return self._s[1214]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1215]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1216]! } - public var Channel_Members_Title: String { return self._s[1217]! } - public var Map_OpenInWaze: String { return self._s[1218]! } - public var Login_PhoneBannedError: String { return self._s[1219]! } + public var Passport_InfoLearnMore: String { return self._s[1206]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1207]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1208]! } + public var Your_card_has_expired: String { return self._s[1209]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1210]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1211]! } + public var Conversation_Report: String { return self._s[1214]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1215]! } + public var Notification_MessageLifetime1m: String { return self._s[1216]! } + public var Privacy_ContactsTitle: String { return self._s[1217]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1218]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1219]! } + public var Channel_Members_Title: String { return self._s[1220]! } + public var Map_OpenInWaze: String { return self._s[1221]! } + public var Login_PhoneBannedError: String { return self._s[1222]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1220]!, self._r[1220]!, [_0]) + return formatWithArgumentRanges(self._s[1223]!, self._r[1223]!, [_0]) } public func MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1221]!, self._r[1221]!, [_1]) + return formatWithArgumentRanges(self._s[1224]!, self._r[1224]!, [_1]) } - public var Group_Management_AddModeratorHelp: String { return self._s[1222]! } - public var Common_OK: String { return self._s[1223]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1224]! } - public var Cache_Music: String { return self._s[1225]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1226]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1227]! } - public var ChatList_DeleteSecretChat: String { return self._s[1228]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1225]! } + public var Common_OK: String { return self._s[1226]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1227]! } + public var Cache_Music: String { return self._s[1228]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1229]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1230]! } + public var ChatList_DeleteSecretChat: String { return self._s[1231]! } public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1229]!, self._r[1229]!, [_0]) + return formatWithArgumentRanges(self._s[1232]!, self._r[1232]!, [_0]) } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1231]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1232]! } - public var BackgroundPreview_SwipeInfo: String { return self._s[1234]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1235]! } - public var State_ConnectingToProxyInfo: String { return self._s[1236]! } - public var Message_VideoMessage: String { return self._s[1238]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1239]! } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1234]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1235]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1237]! } + public var State_ConnectingToProxyInfo: String { return self._s[1238]! } + public var Message_VideoMessage: String { return self._s[1240]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1241]! } public func CHAT_MESSAGE_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1240]!, self._r[1240]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1242]!, self._r[1242]!, [_1, _2]) } - public var ContactInfo_PhoneLabelOther: String { return self._s[1241]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1242]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1243]! } - public var Activity_RecordingAudio: String { return self._s[1244]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1245]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1243]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1244]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1245]! } + public var Activity_RecordingAudio: String { return self._s[1246]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1247]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1247]!, self._r[1247]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1249]!, self._r[1249]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1250]!, self._r[1250]!, [_0]) + return formatWithArgumentRanges(self._s[1252]!, self._r[1252]!, [_0]) } - public var Conversation_ApplyLocalization: String { return self._s[1251]! } - public var UserInfo_AddPhone: String { return self._s[1252]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1253]! } + public var Conversation_ApplyLocalization: String { return self._s[1253]! } + public var UserInfo_AddPhone: String { return self._s[1254]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1255]! } public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1254]!, self._r[1254]!, [_0]) + return formatWithArgumentRanges(self._s[1256]!, self._r[1256]!, [_0]) } - public var Passport_Scans: String { return self._s[1256]! } - public var BlockedUsers_Unblock: String { return self._s[1257]! } - public var Channel_Management_LabelCreator: String { return self._s[1258]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1259]! } + public var Passport_Scans: String { return self._s[1258]! } + public var BlockedUsers_Unblock: String { return self._s[1259]! } + public var Channel_Management_LabelCreator: String { return self._s[1260]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1261]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1260]!, self._r[1260]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1262]!, self._r[1262]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1261]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1262]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1263]! } - public var ChannelIntro_CreateChannel: String { return self._s[1264]! } - public var Conversation_UnreadMessages: String { return self._s[1265]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1266]! } - public var Notification_GroupActivated: String { return self._s[1267]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1268]! } + public var Login_PhoneNumberHelp: String { return self._s[1263]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1264]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1265]! } + public var ChannelIntro_CreateChannel: String { return self._s[1266]! } + public var Conversation_UnreadMessages: String { return self._s[1267]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1268]! } + public var Notification_GroupActivated: String { return self._s[1269]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1270]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1269]!, self._r[1269]!, [_0]) + return formatWithArgumentRanges(self._s[1271]!, self._r[1271]!, [_0]) } public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1270]!, self._r[1270]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1272]!, self._r[1272]!, [_0, _1]) } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1272]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1274]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1273]!, self._r[1273]!, [_0]) + return formatWithArgumentRanges(self._s[1275]!, self._r[1275]!, [_0]) } +<<<<<<< HEAD public var Undo_DeletedChannel: String { return self._s[1274]! } public var Document_TargetConfirmationFormat: String { return self._s[1275]! } public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { @@ -2101,6 +2104,561 @@ public final class PresentationStrings { } public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[1772]! } public var BackgroundPreview_MessageText: String { return self._s[1773]! } +======= + public var Document_TargetConfirmationFormat: String { return self._s[1276]! } + public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1277]!, self._r[1277]!, [_0]) + } + public var Contacts_SortByName: String { return self._s[1278]! } + public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1280]!, self._r[1280]!, [_1, _2, _3]) + } + public var Conversation_ClearSelfHistory: String { return self._s[1281]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1282]! } + public var Stickers_SuggestNone: String { return self._s[1283]! } + public var ChatSettings_Cache: String { return self._s[1284]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1285]! } + public var Media_ShareThisPhoto: String { return self._s[1286]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1287]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1288]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1289]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1290]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1291]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1293]! } + public var Map_OpenIn: String { return self._s[1294]! } + public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1297]!, self._r[1297]!, [_0]) + } + public var MessagePoll_LabelClosed: String { return self._s[1298]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1300]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1301]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1302]! } + public var Login_SelectCountry_Title: String { return self._s[1303]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1304]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1305]! } + public var Watch_Suggestion_BRB: String { return self._s[1306]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1307]! } + public var Contacts_PermissionsTitle: String { return self._s[1308]! } + public var Conversation_RestrictedInline: String { return self._s[1309]! } + public var StickerPack_ViewPack: String { return self._s[1311]! } + public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1312]!, self._r[1312]!, [_0]) + } + public var Compose_NewChannel: String { return self._s[1314]! } + public var Channel_Info_Stickers: String { return self._s[1318]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1319]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1320]! } + public var Passport_DeletePersonalDetails: String { return self._s[1321]! } + public var Conversation_SearchNoResults: String { return self._s[1323]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1324]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1325]! } + public var Login_Code: String { return self._s[1326]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1327]! } + public var Weekday_ShortThursday: String { return self._s[1328]! } + public var Resolve_ErrorNotFound: String { return self._s[1330]! } + public var LastSeen_Offline: String { return self._s[1331]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1332]! } + public var Channel_AdminLog_CanChangeInviteLink: String { return self._s[1333]! } + public var GroupInfo_Title: String { return self._s[1334]! } + public var NotificationsSound_Note: String { return self._s[1335]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1336]! } + public var Watch_Message_Poll: String { return self._s[1337]! } + public var Privacy_Calls: String { return self._s[1338]! } + public var Month_ShortAugust: String { return self._s[1339]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1340]! } + public var Notifications_Reset: String { return self._s[1341]! } + public var Conversation_Pin: String { return self._s[1342]! } + public var Passport_Language_lv: String { return self._s[1343]! } + public var BlockedUsers_Info: String { return self._s[1344]! } + public var Watch_Conversation_Unblock: String { return self._s[1347]! } + public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1348]!, self._r[1348]!, [_0]) + } + public var CloudStorage_Title: String { return self._s[1349]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1350]! } + public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1351]!, self._r[1351]!, [_0]) + } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1352]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1353]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1354]! } + public var Passport_Address_EditBankStatement: String { return self._s[1355]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1356]! } + public var ShareMenu_Comment: String { return self._s[1357]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1358]! } + public var Notifications_PermissionsTitle: String { return self._s[1359]! } + public var GroupPermission_NoSendLinks: String { return self._s[1360]! } + public var Settings_Support: String { return self._s[1361]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1362]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1363]! } + public var Channel_AdminLog_BanSendGifs: String { return self._s[1364]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1365]! } + public var Common_Select: String { return self._s[1367]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1368]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1370]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1371]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1372]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1373]! } + public var Widget_AuthRequired: String { return self._s[1374]! } + public var Camera_FlashOn: String { return self._s[1375]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1376]! } + public var Watch_Suggestion_OK: String { return self._s[1377]! } + public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1379]!, self._r[1379]!, [_0]) + } + public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1380]!, self._r[1380]!, [_0]) + } + public var DialogList_AdLabel: String { return self._s[1381]! } + public var WatchRemote_NotificationText: String { return self._s[1382]! } + public var Conversation_ReportSpam: String { return self._s[1383]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1385]! } + public var PhoneLabel_Title: String { return self._s[1386]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1387]! } + public var Notifications_ExceptionsTitle: String { return self._s[1388]! } + public func CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1389]!, self._r[1389]!, [_1]) + } + public var Notifications_AlertTones: String { return self._s[1390]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1391]! } + public func CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1392]!, self._r[1392]!, [_1, _2, _3]) + } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1393]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1395]! } + public var ReportPeer_ReasonOther: String { return self._s[1396]! } + public var KeyCommand_ScrollDown: String { return self._s[1398]! } + public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1399]!, self._r[1399]!, [_0]) + } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1400]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1401]! } + public var AuthSessions_LogOut: String { return self._s[1402]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1403]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1404]! } + public func CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1405]!, self._r[1405]!, [_1, _2]) + } + public var Passport_Phone_Title: String { return self._s[1406]! } + public var Settings_PhoneNumber: String { return self._s[1407]! } + public var NotificationsSound_Alert: String { return self._s[1408]! } + public var PhotoEditor_CurvesTool: String { return self._s[1410]! } + public var Checkout_PaymentMethod: String { return self._s[1412]! } + public var Contacts_AccessDeniedError: String { return self._s[1413]! } + public var Camera_PhotoMode: String { return self._s[1416]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1417]! } + public var CallSettings_OnMobile: String { return self._s[1418]! } + public var Tour_Text2: String { return self._s[1419]! } + public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1420]!, self._r[1420]!, [_1, _2]) + } + public var DialogList_EncryptionProcessing: String { return self._s[1422]! } + public var Permissions_Skip: String { return self._s[1423]! } + public var SecretImage_Title: String { return self._s[1424]! } + public var Watch_MessageView_Title: String { return self._s[1425]! } + public var AttachmentMenu_Poll: String { return self._s[1426]! } + public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1427]!, self._r[1427]!, [_0]) + } + public var Notification_CallCanceled: String { return self._s[1428]! } + public var WallpaperPreview_Title: String { return self._s[1429]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1430]! } + public func MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1431]!, self._r[1431]!, [_1]) + } + public var Settings_ProxyConnecting: String { return self._s[1432]! } + public var Profile_MessageLifetime5s: String { return self._s[1434]! } + public var Username_InvalidCharacters: String { return self._s[1435]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1436]! } + public var Notification_CreatedChannel: String { return self._s[1439]! } + public var Passcode_AppLockedAlert: String { return self._s[1441]! } + public var Contacts_TopSection: String { return self._s[1442]! } + public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1443]!, self._r[1443]!, [_0]) + } + public var ReportPeer_ReasonSpam: String { return self._s[1444]! } + public var UserInfo_TapToCall: String { return self._s[1445]! } + public var Common_Search: String { return self._s[1447]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1448]! } + public var Message_InvoiceLabel: String { return self._s[1449]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1450]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1451]! } + public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1452]!, self._r[1452]!, [_0]) + } + public func MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1453]!, self._r[1453]!, [_1]) + } + public var Conversation_Info: String { return self._s[1454]! } + public var Login_InfoDeletePhoto: String { return self._s[1455]! } + public var Passport_Language_vi: String { return self._s[1457]! } + public var Conversation_Search: String { return self._s[1458]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1459]! } + public var ReportPeer_ReasonPornography: String { return self._s[1460]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[1461]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1462]! } + public var Map_LiveLocationGroupDescription: String { return self._s[1463]! } + public var Channel_Setup_TypeHeader: String { return self._s[1464]! } + public var AuthSessions_LoggedIn: String { return self._s[1465]! } + public var Login_SmsRequestState3: String { return self._s[1466]! } + public var Passport_Address_EditUtilityBill: String { return self._s[1467]! } + public var Appearance_ReduceMotionInfo: String { return self._s[1468]! } + public var Channel_Edit_LinkItem: String { return self._s[1469]! } + public var Privacy_Calls_P2PNever: String { return self._s[1470]! } + public var Conversation_AddToReadingList: String { return self._s[1472]! } + public func MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1473]!, self._r[1473]!, [_1]) + } + public var Message_Animation: String { return self._s[1474]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[1475]! } + public var Map_Unknown: String { return self._s[1476]! } + public var Call_StatusRequesting: String { return self._s[1477]! } + public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1478]!, self._r[1478]!, [_1, _2]) + } + public var Conversation_SecretChatContextBotAlert: String { return self._s[1479]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1480]! } + public func MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1481]!, self._r[1481]!, [_1]) + } + public var Weekday_Monday: String { return self._s[1482]! } + public var Update_Skip: String { return self._s[1483]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1484]! } + public var Message_PinnedPollMessage: String { return self._s[1485]! } + public var BlockedUsers_Title: String { return self._s[1486]! } + public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1487]!, self._r[1487]!, [_0]) + } + public var Username_CheckingUsername: String { return self._s[1488]! } + public var NotificationsSound_Bell: String { return self._s[1489]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[1490]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1491]! } + public var ChatSettings_Groups: String { return self._s[1492]! } + public var Your_card_was_declined: String { return self._s[1493]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1495]! } + public var ChatList_Unmute: String { return self._s[1496]! } + public func PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1497]!, self._r[1497]!, [_1]) + } + public var PhotoEditor_CurvesAll: String { return self._s[1498]! } + public var Weekday_ShortTuesday: String { return self._s[1499]! } + public var DialogList_Read: String { return self._s[1500]! } + public func PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1501]!, self._r[1501]!, [_1, _2]) + } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1502]! } + public var Passport_Identity_Gender: String { return self._s[1503]! } + public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1504]!, self._r[1504]!, [_0]) + } + public var Target_SelectGroup: String { return self._s[1505]! } + public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1507]!, self._r[1507]!, [_0]) + } + public var Passport_Language_en: String { return self._s[1508]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1509]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[1510]! } + public func AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1511]!, self._r[1511]!, [_1, _2]) + } + public var Checkout_NewCard_PaymentCard: String { return self._s[1513]! } + public var Login_InfoHelp: String { return self._s[1514]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1515]! } + public var SocksProxySetup_AddProxy: String { return self._s[1518]! } + public var CreatePoll_Title: String { return self._s[1519]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1520]! } + public var UserInfo_GroupsInCommon: String { return self._s[1521]! } + public var Call_AudioRouteHide: String { return self._s[1522]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[1524]! } + public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1525]!, self._r[1525]!, [_0]) + } + public var TextFormat_Bold: String { return self._s[1526]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[1527]! } + public var Notifications_Title: String { return self._s[1528]! } + public var Group_Username_InvalidTooShort: String { return self._s[1529]! } + public var Channel_ErrorAddTooMuch: String { return self._s[1530]! } + public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1531]!, self._r[1531]!, ["\(_0)"]) + } + public var Stickers_SuggestAdded: String { return self._s[1533]! } + public var Login_CountryCode: String { return self._s[1534]! } + public var Map_GetDirections: String { return self._s[1535]! } + public var Login_PhoneFloodError: String { return self._s[1536]! } + public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1537]!, self._r[1537]!, [_0]) + } + public var Settings_SetUsername: String { return self._s[1539]! } + public var Notification_GroupInviterSelf: String { return self._s[1540]! } + public var InstantPage_TapToOpenLink: String { return self._s[1541]! } + public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1542]!, self._r[1542]!, [_0]) + } + public var Watch_Suggestion_TalkLater: String { return self._s[1543]! } + public var SecretChat_Title: String { return self._s[1544]! } + public var Group_UpgradeNoticeText1: String { return self._s[1545]! } + public var AuthSessions_Title: String { return self._s[1546]! } + public var PhotoEditor_CropAuto: String { return self._s[1547]! } + public var Channel_About_Title: String { return self._s[1548]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[1549]! } + public func CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1550]!, self._r[1550]!, [_1, _2]) + } + public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1551]!, self._r[1551]!, ["\(_0)"]) + } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1554]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[1555]! } + public var Undo_MessagesDeleted: String { return self._s[1556]! } + public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1558]!, self._r[1558]!, [_0]) + } + public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1559]!, self._r[1559]!, [_0]) + } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[1560]! } + public var Presence_online: String { return self._s[1562]! } + public var PasscodeSettings_Title: String { return self._s[1563]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1564]! } + public var Web_OpenExternal: String { return self._s[1565]! } + public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1567]!, self._r[1567]!, [_0]) + } + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[1568]! } + public var Map_YouAreHere: String { return self._s[1569]! } + public func MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1570]!, self._r[1570]!, [_1]) + } + public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1571]!, self._r[1571]!, [_0]) + } + public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1572]!, self._r[1572]!, [_0]) + } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[1573]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[1574]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1575]!, self._r[1575]!, [_0]) + } + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1576]!, self._r[1576]!, [_0]) + } + public var SocksProxySetup_Username: String { return self._s[1577]! } + public var Bot_Start: String { return self._s[1578]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1579]!, self._r[1579]!, [_0]) + } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1580]!, self._r[1580]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[1581]! } + public func PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1583]!, self._r[1583]!, [_1]) + } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[1584]! } + public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1585]!, self._r[1585]!, [_0]) + } + public var Passport_Email_EnterOtherEmail: String { return self._s[1586]! } + public var Login_InfoAvatarPhoto: String { return self._s[1587]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[1588]! } + public var Tour_Title4: String { return self._s[1589]! } + public var Passport_Identity_Translation: String { return self._s[1590]! } + public var Login_TermsOfServiceLabel: String { return self._s[1592]! } + public var Passport_Language_it: String { return self._s[1593]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1594]! } + public var Passport_Identity_SelfieHelp: String { return self._s[1595]! } + public var Conversation_ClearAll: String { return self._s[1597]! } + public func MESSAGE_PHOTOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1599]!, self._r[1599]!, [_1, _2]) + } + public var TwoStepAuth_FloodError: String { return self._s[1600]! } + public var Paint_Delete: String { return self._s[1601]! } + public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1602]!, self._r[1602]!, [_1, _2]) + } + public var Message_PinnedAudioMessage: String { return self._s[1603]! } + public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1604]!, self._r[1604]!, [_0]) + } + public var Notification_Mute1hMin: String { return self._s[1605]! } + public var Notifications_GroupNotificationsSound: String { return self._s[1606]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[1607]! } + public var Conversation_MessageEditedLabel: String { return self._s[1608]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[1609]! } + public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1610]!, self._r[1610]!, [_0, _1, _2]) + } + public var NetworkUsageSettings_ResetStats: String { return self._s[1611]! } + public var AccessDenied_LocationTracking: String { return self._s[1612]! } + public var Month_GenOctober: String { return self._s[1613]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[1614]! } + public var EnterPasscode_EnterPasscode: String { return self._s[1615]! } + public var MediaPicker_TimerTooltip: String { return self._s[1617]! } + public var SharedMedia_TitleAll: String { return self._s[1618]! } + public var Conversation_RestrictedMedia: String { return self._s[1620]! } + public var AccessDenied_PhotosRestricted: String { return self._s[1621]! } + public var ChangePhoneNumberCode_Called: String { return self._s[1623]! } + public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1624]!, self._r[1624]!, [_0]) + } + public var Conversation_SavedMessages: String { return self._s[1627]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[1629]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[1630]! } + public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1632]!, self._r[1632]!, [_0]) + } + public var ReportPeer_AlertSuccess: String { return self._s[1633]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[1634]! } + public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1635]!, self._r[1635]!, [_1, _2]) + } + public var Checkout_PasswordEntry_Title: String { return self._s[1636]! } + public var PhotoEditor_FadeTool: String { return self._s[1637]! } + public var Privacy_ContactsReset: String { return self._s[1638]! } + public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1640]!, self._r[1640]!, [_0]) + } + public var Message_PinnedVideoMessage: String { return self._s[1641]! } + public var ChatList_Mute: String { return self._s[1642]! } + public var Permissions_CellularDataText_v0: String { return self._s[1643]! } + public var ShareMenu_SelectChats: String { return self._s[1645]! } + public var MusicPlayer_VoiceNote: String { return self._s[1646]! } + public var Conversation_RestrictedText: String { return self._s[1647]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[1648]! } + public var Cache_Videos: String { return self._s[1649]! } + public var FeatureDisabled_Oops: String { return self._s[1651]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[1652]! } + public func CHAT_MESSAGE_VIDEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1653]!, self._r[1653]!, [_1, _2]) + } + public var Stickers_GroupStickersHelp: String { return self._s[1654]! } + public var GroupPermission_NoSendPolls: String { return self._s[1655]! } + public var Message_VideoExpired: String { return self._s[1657]! } + public var Notifications_Badge: String { return self._s[1658]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[1659]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[1660]! } + public var Username_InvalidTooShort: String { return self._s[1661]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[1662]! } + public var Channel_AdminLog_PinMessages: String { return self._s[1663]! } + public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1664]!, self._r[1664]!, [_1]) + } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[1665]! } + public var Conversation_DefaultRestrictedText: String { return self._s[1666]! } + public var SharedMedia_CategoryDocs: String { return self._s[1669]! } + public func AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1670]!, self._r[1670]!, [_1]) + } + public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1672]!, self._r[1672]!, [_1]) + } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[1673]! } + public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1674]!, self._r[1674]!, [_0]) + } + public var ChatSettings_PrivateChats: String { return self._s[1675]! } + public var Channel_UpdatePhotoItem: String { return self._s[1676]! } + public var GroupInfo_LeftStatus: String { return self._s[1677]! } + public var Watch_MessageView_Forward: String { return self._s[1679]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[1680]! } + public var Cache_ClearEmpty: String { return self._s[1682]! } + public var Localization_LanguageName: String { return self._s[1683]! } + public var WebSearch_GIFs: String { return self._s[1684]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1685]! } + public var Username_InvalidStartsWithNumber: String { return self._s[1686]! } + public var Common_Back: String { return self._s[1687]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[1688]! } + public func CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1689]!, self._r[1689]!, [_1]) + } + public func CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1690]!, self._r[1690]!, [_1]) + } + public var Passport_Email_Help: String { return self._s[1691]! } + public var Watch_Conversation_Reply: String { return self._s[1693]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[1695]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[1696]! } + public var Channel_BanUser_Unban: String { return self._s[1698]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[1699]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[1700]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[1702]! } + public var Passport_Identity_Name: String { return self._s[1703]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[1704]! } + public var Conversation_BlockUser: String { return self._s[1705]! } + public var Month_GenJanuary: String { return self._s[1706]! } + public var ChatSettings_TextSize: String { return self._s[1707]! } + public var Notification_PassportValuePhone: String { return self._s[1708]! } + public var Passport_Language_ne: String { return self._s[1709]! } + public var Notification_CallBack: String { return self._s[1710]! } + public var TwoStepAuth_EmailHelp: String { return self._s[1711]! } + public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1712]!, self._r[1712]!, [_0]) + } + public var Channel_Info_Management: String { return self._s[1713]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[1714]! } + public var Stickers_FrequentlyUsed: String { return self._s[1715]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[1716]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1718]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[1719]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[1720]! } + public var CreatePoll_TextHeader: String { return self._s[1721]! } + public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1722]!, self._r[1722]!, [_0]) + } + public var PhotoEditor_QualityMedium: String { return self._s[1723]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[1724]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[1726]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[1727]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[1728]! } + public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1729]!, self._r[1729]!, [_0]) + } + public var Conversation_LinkDialogOpen: String { return self._s[1731]! } + public var Settings_Username: String { return self._s[1732]! } + public var Wallpaper_Wallpaper: String { return self._s[1734]! } + public func PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1736]!, self._r[1736]!, [_1]) + } + public var SocksProxySetup_UseProxy: String { return self._s[1737]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[1738]! } + public var MessageTimer_Forever: String { return self._s[1739]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[1740]! } + public var PhotoEditor_DiscardChanges: String { return self._s[1741]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1742]! } + public var Passport_Language_da: String { return self._s[1743]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[1744]! } + public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1745]!, self._r[1745]!, [_0]) + } + public var Passport_Address_EditPassportRegistration: String { return self._s[1746]! } + public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1748]!, self._r[1748]!, [_0]) + } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[1750]! } + public var Conversation_SearchByName_Prefix: String { return self._s[1751]! } + public func PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1752]!, self._r[1752]!, [_1]) + } + public var Conversation_PinnedPoll: String { return self._s[1753]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[1754]! } + public var Cache_ByPeerHeader: String { return self._s[1755]! } + public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1756]!, self._r[1756]!, [_0]) + } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[1757]! } + public var Notification_PinnedMessage: String { return self._s[1760]! } + public var Contacts_SortBy: String { return self._s[1762]! } + public var Call_EncryptionKey_Title: String { return self._s[1764]! } + public var Watch_UserInfo_Service: String { return self._s[1765]! } + public var Conversation_Unpin: String { return self._s[1768]! } + public var CancelResetAccount_Title: String { return self._s[1769]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[1770]! } + public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1772]!, self._r[1772]!, [_1, _2, _3]) + } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[1773]! } +>>>>>>> c9aa4a85da7d15f2f4227e301b2f92f5dd46aae5 public var CallSettings_Title: String { return self._s[1774]! } public var PasscodeSettings_EncryptDataHelp: String { return self._s[1776]! } public var AutoDownloadSettings_Contacts: String { return self._s[1777]! } @@ -2138,6 +2696,7 @@ public final class PresentationStrings { public var Tour_Text3: String { return self._s[1813]! } public var Login_ResetAccountProtected_Title: String { return self._s[1815]! } public var GroupPermission_NoSendMessages: String { return self._s[1816]! } +<<<<<<< HEAD public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[1817]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1819]!, self._r[1819]!, [_0]) @@ -3511,6 +4070,1386 @@ public final class PresentationStrings { return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, "\(value)") } public func MuteFor_Days(_ value: Int32) -> String { +======= + public var WallpaperSearch_ColorTitle: String { return self._s[1817]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[1818]! } + public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1820]!, self._r[1820]!, [_0]) + } + public var GroupInfo_AddParticipantTitle: String { return self._s[1821]! } + public var Checkout_ShippingOption_Title: String { return self._s[1822]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[1823]! } + public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1824]!, self._r[1824]!, [_0]) + } + public func CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1825]!, self._r[1825]!, [_1, _2]) + } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[1826]! } + public var Appearance_PreviewIncomingText: String { return self._s[1828]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[1829]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[1830]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[1831]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[1832]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[1833]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[1834]! } + public var Notification_SecretChatScreenshot: String { return self._s[1835]! } + public var AccessDenied_Wallpapers: String { return self._s[1836]! } + public var Passport_Address_City: String { return self._s[1838]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[1839]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[1840]! } + public var AccessDenied_LocationDisabled: String { return self._s[1841]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[1843]! } + public var GroupInfo_Sound: String { return self._s[1844]! } + public var Stickers_RemoveFromFavorites: String { return self._s[1845]! } + public var Contacts_Title: String { return self._s[1846]! } + public var Passport_Language_fr: String { return self._s[1847]! } + public func CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1848]!, self._r[1848]!, [_1, _2]) + } + public var Notifications_ResetAllNotifications: String { return self._s[1849]! } + public var PrivacySettings_SecurityTitle: String { return self._s[1852]! } + public var Checkout_NewCard_Title: String { return self._s[1853]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[1854]! } + public var Conversation_ForwardChats: String { return self._s[1855]! } + public var Settings_FAQ: String { return self._s[1858]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[1859]! } + public var Conversation_ContextMenuForward: String { return self._s[1860]! } + public var PrivacyPolicy_Title: String { return self._s[1865]! } + public var Notifications_TextTone: String { return self._s[1866]! } + public var Profile_CreateNewContact: String { return self._s[1867]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[1869]! } + public var Channel_Username_InvalidCharacters: String { return self._s[1871]! } + public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1872]!, self._r[1872]!, [_0]) + } + public var PrivacySettings_LastSeenTitle: String { return self._s[1873]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[1874]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[1875]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[1876]! } + public var Bot_Unblock: String { return self._s[1877]! } + public var TextFormat_Italic: String { return self._s[1878]! } + public var Settings_About_Help: String { return self._s[1879]! } + public var SearchImages_Title: String { return self._s[1880]! } + public var Weekday_Wednesday: String { return self._s[1881]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[1882]! } + public var ExplicitContent_AlertTitle: String { return self._s[1883]! } + public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1884]!, self._r[1884]!, [_1, _2, _3]) + } + public var Weekday_Thursday: String { return self._s[1885]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[1886]! } + public func CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1887]!, self._r[1887]!, [_1, _2]) + } + public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1888]!, self._r[1888]!, [_0]) + } + public var Channel_Members_AddMembersHelp: String { return self._s[1889]! } + public var Passport_RequestedInformation: String { return self._s[1890]! } + public var Login_PhoneAndCountryHelp: String { return self._s[1891]! } + public func CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1892]!, self._r[1892]!, [_1, _2]) + } + public var Conversation_EncryptionProcessing: String { return self._s[1893]! } + public var PhotoEditor_EnhanceTool: String { return self._s[1896]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[1897]! } + public var Channel_Setup_Title: String { return self._s[1898]! } + public var Conversation_SearchPlaceholder: String { return self._s[1899]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[1900]! } + public var Checkout_ErrorGeneric: String { return self._s[1901]! } + public var Passport_Language_hu: String { return self._s[1902]! } + public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1904]!, self._r[1904]!, [_0]) + } + public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1907]!, self._r[1907]!, [_1]) + } + public var Conversation_CloudStorageInfo_Title: String { return self._s[1908]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[1909]! } + public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1910]!, self._r[1910]!, [_0]) + } + public var Conversation_ClearPrivateHistory: String { return self._s[1911]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[1912]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[1913]! } + public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1914]!, self._r[1914]!, [_0]) + } + public var Passport_Language_cs: String { return self._s[1915]! } + public var Message_PinnedAnimationMessage: String { return self._s[1916]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[1918]! } + public var Embed_PlayingInPIP: String { return self._s[1920]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[1921]! } + public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1922]!, self._r[1922]!, [_0]) + } + public var MediaPicker_LivePhotoDescription: String { return self._s[1923]! } + public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1924]!, self._r[1924]!, [_1]) + } + public var Notification_PaymentSent: String { return self._s[1925]! } + public var PhotoEditor_CurvesGreen: String { return self._s[1926]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[1927]! } + public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1930]!, self._r[1930]!, [_1]) + } + public func CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1931]!, self._r[1931]!, [_1, _2]) + } + public var NetworkUsageSettings_CallDataSection: String { return self._s[1932]! } + public var PasscodeSettings_HelpTop: String { return self._s[1933]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[1935]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[1936]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[1937]! } + public var Call_Accept: String { return self._s[1939]! } + public var GroupRemoved_RemoveInfo: String { return self._s[1940]! } + public var Month_GenMarch: String { return self._s[1941]! } + public var PhotoEditor_ShadowsTool: String { return self._s[1942]! } + public var LoginPassword_Title: String { return self._s[1943]! } + public var Watch_Conversation_GroupInfo: String { return self._s[1944]! } + public var CallSettings_Always: String { return self._s[1945]! } + public var TwoStepAuth_SetupHint: String { return self._s[1946]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[1947]! } + public var Login_PhoneTitle: String { return self._s[1948]! } + public var Passport_FieldPhoneHelp: String { return self._s[1949]! } + public var Weekday_ShortSunday: String { return self._s[1950]! } + public var Passport_InfoFAQ_URL: String { return self._s[1951]! } + public var ContactInfo_Job: String { return self._s[1953]! } + public var UserInfo_InviteBotToGroup: String { return self._s[1954]! } + public var WallpaperPreview_SwipeInfo: String { return self._s[1955]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[1956]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[1957]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[1959]! } + public var MediaPicker_AddCaption: String { return self._s[1960]! } + public var CallSettings_TabIconDescription: String { return self._s[1961]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[1962]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[1963]! } + public var DialogList_SearchSectionRecent: String { return self._s[1964]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[1965]! } + public var LastSeen_WithinAWeek: String { return self._s[1968]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[1969]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[1971]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[1972]! } + public var Conversation_StatusLeftGroup: String { return self._s[1973]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[1974]! } + public var GroupPermission_AddSuccess: String { return self._s[1976]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[1978]! } + public var Conversation_ContextMenuCopy: String { return self._s[1979]! } + public var AccessDenied_CallMicrophone: String { return self._s[1980]! } + public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1981]!, self._r[1981]!, [_1, _2, _3]) + } + public var Login_InvalidFirstNameError: String { return self._s[1982]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[1983]! } + public var Checkout_PaymentMethod_New: String { return self._s[1984]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[1985]! } + public var PhotoEditor_QualityTool: String { return self._s[1986]! } + public var Login_SendCodeViaSms: String { return self._s[1987]! } + public func CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1988]!, self._r[1988]!, [_1, _2]) + } + public var Login_EmailNotConfiguredError: String { return self._s[1989]! } + public var PrivacyPolicy_Accept: String { return self._s[1990]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[1991]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[1992]! } + public var AutoNightTheme_Automatic: String { return self._s[1993]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[1994]! } + public var Privacy_ContactsSyncHelp: String { return self._s[1995]! } + public var Cache_Help: String { return self._s[1996]! } + public var Passport_Language_fa: String { return self._s[1997]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[1998]! } + public var PrivacySettings_LastSeen: String { return self._s[1999]! } + public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2000]!, self._r[2000]!, [_0, _1]) + } + public var Preview_SaveGif: String { return self._s[2004]! } + public var Profile_About: String { return self._s[2005]! } + public var Channel_About_Placeholder: String { return self._s[2006]! } + public var Login_InfoTitle: String { return self._s[2007]! } + public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2008]!, self._r[2008]!, [_0]) + } + public var Watch_Suggestion_CantTalk: String { return self._s[2010]! } + public var ContactInfo_Title: String { return self._s[2011]! } + public var Media_ShareThisVideo: String { return self._s[2012]! } + public var Weekday_ShortFriday: String { return self._s[2013]! } + public var AccessDenied_Contacts: String { return self._s[2014]! } + public var Notification_CallIncomingShort: String { return self._s[2015]! } + public var Group_Setup_TypePublic: String { return self._s[2016]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2017]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2018]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2021]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2022]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2023]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2024]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2025]! } + public var DialogList_Typing: String { return self._s[2026]! } + public var Checkout_Phone: String { return self._s[2029]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2032]! } + public func PINNED_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2033]!, self._r[2033]!, [_1]) + } + public var Privacy_Calls_Integration: String { return self._s[2034]! } + public var Notifications_PermissionsAllow: String { return self._s[2036]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2039]! } + public var Settings_ChatSettings: String { return self._s[2040]! } + public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2041]!, self._r[2041]!, [_1, _2]) + } + public var GroupRemoved_DeleteUser: String { return self._s[2043]! } + public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2044]!, self._r[2044]!, [_0]) + } + public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2045]!, self._r[2045]!, [_1]) + } + public var Login_ContinueWithLocalization: String { return self._s[2046]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2047]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2049]! } + public var Conversation_Unblock: String { return self._s[2050]! } + public var PrivacySettings_DataSettings: String { return self._s[2051]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2052]! } + public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2053]!, self._r[2053]!, [_0, _1]) + } + public var PrivacySettings_Passcode: String { return self._s[2056]! } + public func ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2057]!, self._r[2057]!, [_1]) + } + public var Passport_Language_dz: String { return self._s[2058]! } + public var Passport_Language_tk: String { return self._s[2059]! } + public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2060]!, self._r[2060]!, [_0]) + } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2061]! } + public var Conversation_ContextMenuReply: String { return self._s[2062]! } + public var Tour_Title1: String { return self._s[2063]! } + public func MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2064]!, self._r[2064]!, [_1, _2]) + } + public var Conversation_ClearGroupHistory: String { return self._s[2066]! } + public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2067]!, self._r[2067]!, [_0]) + } + public var Call_RateCall: String { return self._s[2068]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2069]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2070]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2072]! } + public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2074]!, self._r[2074]!, [_0]) + } + public var Compose_Create: String { return self._s[2075]! } + public var Contacts_InviteToTelegram: String { return self._s[2076]! } + public var GroupInfo_Notifications: String { return self._s[2077]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2079]! } + public var Month_GenApril: String { return self._s[2080]! } + public var Appearance_AutoNightTheme: String { return self._s[2081]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2083]! } + public var Login_CodeSentSms: String { return self._s[2085]! } + public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2086]!, self._r[2086]!, [_0]) + } + public var EmptyGroupInfo_Line3: String { return self._s[2087]! } + public var Passport_Language_hr: String { return self._s[2088]! } + public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2089]!, self._r[2089]!, [_0]) + } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2090]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2091]! } + public var Privacy_SecretChatsTitle: String { return self._s[2092]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2094]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2095]! } + public var Preview_DeleteGif: String { return self._s[2096]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2097]! } + public var Group_ErrorNotMutualContact: String { return self._s[2098]! } + public var Notification_MessageLifetime5s: String { return self._s[2099]! } + public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2100]!, self._r[2100]!, [_0]) + } + public var Passport_Address_AddBankStatement: String { return self._s[2102]! } + public var Notification_CallIncoming: String { return self._s[2103]! } + public var Compose_NewGroupTitle: String { return self._s[2104]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2106]! } + public var Passport_Address_Postcode: String { return self._s[2108]! } + public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2109]!, self._r[2109]!, [_0]) + } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2110]! } + public var WallpaperColors_Title: String { return self._s[2111]! } + public var GroupPermission_Duration: String { return self._s[2112]! } + public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2113]!, self._r[2113]!, [_0]) + } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2114]! } + public var Username_Placeholder: String { return self._s[2115]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2116]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2117]! } + public var Passport_PasswordDescription: String { return self._s[2119]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2120]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2121]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2122]! } + public var Conversation_ContextMenuMore: String { return self._s[2123]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2124]! } + public var CallSettings_TabIcon: String { return self._s[2125]! } + public var KeyCommand_Find: String { return self._s[2126]! } + public var Message_PinnedGame: String { return self._s[2127]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2128]! } + public var Login_CallRequestState2: String { return self._s[2130]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2132]! } + public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2134]!, self._r[2134]!, [_0]) + } + public var WallpaperPreview_Blurred: String { return self._s[2135]! } + public var Conversation_InstantPagePreview: String { return self._s[2136]! } + public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2137]!, self._r[2137]!, [_0]) + } + public var SecretTimer_VideoDescription: String { return self._s[2140]! } + public var GroupPermission_NoPinMessages: String { return self._s[2141]! } + public var Passport_Language_es: String { return self._s[2142]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2144]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2145]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2146]! } + public var Watch_UserInfo_Unmute: String { return self._s[2147]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2148]! } + public var AccessDenied_CameraRestricted: String { return self._s[2150]! } + public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2151]!, self._r[2151]!, ["\(_0)"]) + } + public var ChatList_ReadAll: String { return self._s[2153]! } + public var Settings_CopyUsername: String { return self._s[2154]! } + public var Contacts_SearchLabel: String { return self._s[2155]! } + public func MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2157]!, self._r[2157]!, [_1]) + } + public var Map_OpenInYandexNavigator: String { return self._s[2158]! } + public var PasscodeSettings_EncryptData: String { return self._s[2159]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2160]! } + public var DialogList_AdNoticeAlert: String { return self._s[2161]! } + public func CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2163]!, self._r[2163]!, [_1, _2, _3]) + } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2164]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2165]! } + public var Localization_LanguageCustom: String { return self._s[2166]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2167]! } + public func CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2169]!, self._r[2169]!, [_1, _2]) + } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2171]! } + public var Conversation_InfoGroup: String { return self._s[2172]! } + public var Compose_NewMessage: String { return self._s[2173]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2174]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2175]! } + public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2176]!, self._r[2176]!, [_0]) + } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2177]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2178]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2179]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2180]! } + public var Channel_BlackList_Title: String { return self._s[2181]! } + public var UserInfo_PhoneCall: String { return self._s[2182]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2184]! } + public var State_connecting: String { return self._s[2185]! } + public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2186]!, self._r[2186]!, [_0]) + } + public var Notifications_GroupNotifications: String { return self._s[2187]! } + public var Passport_Identity_EditPassport: String { return self._s[2188]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2190]! } + public var Localization_EnglishLanguageName: String { return self._s[2191]! } + public var Share_AuthDescription: String { return self._s[2192]! } + public var Passport_Identity_Surname: String { return self._s[2193]! } + public var Compose_TokenListPlaceholder: String { return self._s[2194]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2195]! } + public var Settings_AboutEmpty: String { return self._s[2196]! } + public var Conversation_Unmute: String { return self._s[2197]! } + public var Login_CodeSentCall: String { return self._s[2200]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2201]! } + public var ChatSettings_Appearance: String { return self._s[2202]! } + public var Appearance_PickAccentColor: String { return self._s[2203]! } + public var Notification_CallMissed: String { return self._s[2204]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2205]! } + public var ChatAdmins_AdminLabel: String { return self._s[2207]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2208]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2210]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2211]! } + public var Month_GenJune: String { return self._s[2212]! } + public var Watch_Location_Current: String { return self._s[2213]! } + public var Conversation_TitleMute: String { return self._s[2214]! } + public func PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2215]!, self._r[2215]!, [_1]) + } + public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2216]!, self._r[2216]!, [_1]) + } + public var GroupInfo_DeleteAndExit: String { return self._s[2217]! } + public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_0]) + } + public var Call_ReportPlaceholder: String { return self._s[2219]! } + public var MaskStickerSettings_Info: String { return self._s[2220]! } + public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2221]!, self._r[2221]!, [_0]) + } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2222]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2224]! } + public var Contacts_ShareTelegram: String { return self._s[2225]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2226]! } + public var Channel_ErrorAccessDenied: String { return self._s[2227]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2229]! } + public var Call_ConnectionErrorTitle: String { return self._s[2230]! } + public var UserInfo_NotificationsEnable: String { return self._s[2231]! } + public var Tour_Text4: String { return self._s[2234]! } + public var WallpaperSearch_Recent: String { return self._s[2235]! } + public func CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2237]!, self._r[2237]!, [_1]) + } + public var Profile_MessageLifetime2s: String { return self._s[2238]! } + public var Notification_MessageLifetime2s: String { return self._s[2239]! } + public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2240]!, self._r[2240]!, [_1, _2, _3]) + } + public var Cache_ClearCache: String { return self._s[2241]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[2242]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2243]! } + public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2247]!, self._r[2247]!, [_0]) + } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2249]! } + public var SocksProxySetup_TypeSocks: String { return self._s[2250]! } + public var AutoNightTheme_Title: String { return self._s[2251]! } + public var InstantPage_FeedbackButton: String { return self._s[2252]! } + public var Passport_FieldAddress: String { return self._s[2253]! } + public var Month_ShortMarch: String { return self._s[2254]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2255]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2256]! } + public var Passport_FloodError: String { return self._s[2257]! } + public var SecretGif_Title: String { return self._s[2258]! } + public var Passport_Language_th: String { return self._s[2260]! } + public var Passport_Address_Address: String { return self._s[2261]! } + public var Login_InvalidLastNameError: String { return self._s[2262]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[2263]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[2264]! } + public var ShareMenu_Send: String { return self._s[2265]! } + public var Month_GenNovember: String { return self._s[2268]! } + public var Checkout_Email: String { return self._s[2270]! } + public var NotificationsSound_Tritone: String { return self._s[2271]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[2273]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[2276]! } + public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2277]!, self._r[2277]!, [_1, _1, _1, _2]) + } + public var DialogList_You: String { return self._s[2278]! } + public var MediaPicker_Send: String { return self._s[2281]! } + public var Call_AudioRouteSpeaker: String { return self._s[2282]! } + public var Watch_UserInfo_Title: String { return self._s[2283]! } + public var Appearance_AccentColor: String { return self._s[2284]! } + public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2285]!, self._r[2285]!, [_0]) + } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2286]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[2287]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[2288]! } + public var Notification_CallOutgoing: String { return self._s[2289]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2290]! } + public var Call_RecordingDisabledMessage: String { return self._s[2291]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2292]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2293]! } + public var Date_DialogDateFormat: String { return self._s[2294]! } + public var WallpaperColors_SetCustomColor: String { return self._s[2295]! } + public var Notifications_InAppNotifications: String { return self._s[2296]! } + public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2297]!, self._r[2297]!, [_0]) + } + public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2298]!, self._r[2298]!, [_1, _2]) + } + public var NewContact_Title: String { return self._s[2299]! } + public var Conversation_ViewContactDetails: String { return self._s[2300]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2302]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[2303]! } + public var PrivacySettings_Title: String { return self._s[2304]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2307]! } + public func CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2308]!, self._r[2308]!, [_1]) + } + public var GroupRemoved_UsersSectionTitle: String { return self._s[2309]! } + public var Contacts_PhoneNumber: String { return self._s[2310]! } + public var Map_ShowPlaces: String { return self._s[2312]! } + public var ChatAdmins_Title: String { return self._s[2313]! } + public var InstantPage_Reference: String { return self._s[2315]! } + public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2316]!, self._r[2316]!, [_1, _2]) + } + public var Camera_FlashOff: String { return self._s[2317]! } + public var Watch_UserInfo_Block: String { return self._s[2318]! } + public var ChatSettings_Stickers: String { return self._s[2319]! } + public var ChatSettings_DownloadInBackground: String { return self._s[2320]! } + public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2321]!, self._r[2321]!, [_0]) + } + public var Settings_ViewPhoto: String { return self._s[2322]! } + public var Login_CheckOtherSessionMessages: String { return self._s[2323]! } + public var AutoDownloadSettings_Cellular: String { return self._s[2324]! } + public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2326]!, self._r[2326]!, [_0]) + } + public var Privacy_DeleteDrafts: String { return self._s[2327]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2328]! } + public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2329]!, self._r[2329]!, [_0]) + } + public var DialogList_SavedMessagesHelp: String { return self._s[2330]! } + public var DialogList_SavedMessages: String { return self._s[2331]! } + public var GroupInfo_UpgradeButton: String { return self._s[2332]! } + public func CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2333]!, self._r[2333]!, [_1, _2, _3]) + } + public var DialogList_Pin: String { return self._s[2334]! } + public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2335]!, self._r[2335]!, [_0, _1]) + } + public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2336]!, self._r[2336]!, [_0]) + } + public var Notification_Exceptions_AlwaysOn: String { return self._s[2337]! } + public var UserInfo_NotificationsDisable: String { return self._s[2338]! } + public var Paint_Outlined: String { return self._s[2339]! } + public var Activity_PlayingGame: String { return self._s[2340]! } + public var SearchImages_NoImagesFound: String { return self._s[2341]! } + public var SocksProxySetup_ProxyType: String { return self._s[2342]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[2344]! } + public var Settings_AppLanguage: String { return self._s[2345]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[2346]! } + public var Common_ChoosePhoto: String { return self._s[2347]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[2348]! } + public var Activity_UploadingVideo: String { return self._s[2349]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2350]! } + public var NetworkUsageSettings_Wifi: String { return self._s[2351]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[2352]! } + public var Checkout_PayWithTouchId: String { return self._s[2353]! } + public var Notifications_ExceptionsNone: String { return self._s[2355]! } + public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2356]!, self._r[2356]!, [_0]) + } + public var AuthSessions_IncompleteAttempts: String { return self._s[2358]! } + public var Passport_Address_Region: String { return self._s[2361]! } + public var ChatList_DeleteChat: String { return self._s[2362]! } + public var PhotoEditor_TiltShift: String { return self._s[2363]! } + public var Settings_FAQ_URL: String { return self._s[2364]! } + public var Passport_Language_sl: String { return self._s[2365]! } + public var Settings_PrivacySettings: String { return self._s[2367]! } + public var SharedMedia_TitleLink: String { return self._s[2368]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[2369]! } + public var Settings_SetProfilePhoto: String { return self._s[2370]! } + public var Channel_About_Help: String { return self._s[2371]! } + public var Contacts_PermissionsEnable: String { return self._s[2372]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[2373]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[2375]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[2376]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[2378]! } + public var Map_OpenInYandexMaps: String { return self._s[2380]! } + public var PhotoEditor_SaturationTool: String { return self._s[2381]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2382]! } + public var Appearance_TextSize: String { return self._s[2383]! } + public var Channel_Username_InvalidTooShort: String { return self._s[2385]! } + public var Passport_PassportInformation: String { return self._s[2388]! } + public var WatchRemote_AlertTitle: String { return self._s[2389]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2390]! } + public var ConvertToSupergroup_HelpText: String { return self._s[2392]! } + public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2393]!, self._r[2393]!, [_0]) + } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2394]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2396]! } + public var AccessDenied_CameraDisabled: String { return self._s[2397]! } + public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2398]!, self._r[2398]!, [_0]) + } + public var PhotoEditor_ContrastTool: String { return self._s[2401]! } + public var DialogList_Draft: String { return self._s[2402]! } + public var Privacy_TopPeersDelete: String { return self._s[2404]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[2405]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2406]! } + public var WebSearch_RecentSectionClear: String { return self._s[2407]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[2409]! } + public var Common_Done: String { return self._s[2411]! } + public var AuthSessions_EmptyText: String { return self._s[2412]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[2413]! } + public var Tour_Title5: String { return self._s[2414]! } + public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2415]!, self._r[2415]!, [_0]) + } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2416]! } + public var Conversation_LinkDialogSave: String { return self._s[2417]! } + public var GroupInfo_ActionRestrict: String { return self._s[2418]! } + public var Checkout_Title: String { return self._s[2419]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[2422]! } + public var Notification_RenamedGroup: String { return self._s[2423]! } + public var Checkout_PayWithFaceId: String { return self._s[2424]! } + public var Channel_BanList_BlockedTitle: String { return self._s[2425]! } + public var Checkout_WebConfirmation_Title: String { return self._s[2427]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[2428]! } + public var Profile_AddToExisting: String { return self._s[2430]! } + public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2431]!, self._r[2431]!, [_0, _1]) + } + public var Cache_Files: String { return self._s[2433]! } + public var Permissions_PrivacyPolicy: String { return self._s[2434]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[2435]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2436]! } + public func MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2438]!, self._r[2438]!, [_1]) + } + public var Calls_NoCallsPlaceholder: String { return self._s[2440]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2441]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2443]! } + public var Passport_FieldAddressHelp: String { return self._s[2444]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2445]! } + public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2446]!, self._r[2446]!, [_0]) + } + public var Channel_AdminLog_EmptyTitle: String { return self._s[2447]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[2449]! } + public var Login_UnknownError: String { return self._s[2450]! } + public var Group_UpgradeNoticeText2: String { return self._s[2452]! } + public var Watch_Compose_AddContact: String { return self._s[2453]! } + public var Web_Error: String { return self._s[2454]! } + public var Profile_MessageLifetime1h: String { return self._s[2455]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2456]! } + public var Channel_Username_CheckingUsername: String { return self._s[2457]! } + public func PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2458]!, self._r[2458]!, [_1]) + } + public var Channel_AboutItem: String { return self._s[2459]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2461]! } + public var GroupInfo_SharedMedia: String { return self._s[2462]! } + public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2463]!, self._r[2463]!, [_1]) + } + public var Call_PhoneCallInProgressMessage: String { return self._s[2464]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2465]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[2466]! } + public var CreatePoll_AddOption: String { return self._s[2467]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[2468]! } + public var Group_UpgradeNoticeHeader: String { return self._s[2469]! } + public var Channel_Management_AddModerator: String { return self._s[2470]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[2471]! } + public var NotificationsSound_Hello: String { return self._s[2472]! } + public func CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2473]!, self._r[2473]!, [_1, _2]) + } + public var SocksProxySetup_SavedProxies: String { return self._s[2474]! } + public var Channel_Stickers_Placeholder: String { return self._s[2476]! } + public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2477]!, self._r[2477]!, [_0]) + } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[2478]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[2479]! } + public var ContactInfo_BirthdayLabel: String { return self._s[2480]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[2481]! } + public var AutoDownloadSettings_Channels: String { return self._s[2482]! } + public var Passport_Language_mn: String { return self._s[2483]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[2486]! } + public var Passport_Language_ja: String { return self._s[2488]! } + public var Settings_About_Title: String { return self._s[2489]! } + public var Settings_NotificationsAndSounds: String { return self._s[2490]! } + public var ChannelInfo_DeleteGroup: String { return self._s[2491]! } + public var Settings_BlockedUsers: String { return self._s[2492]! } + public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2493]!, self._r[2493]!, [_0]) + } + public var Passport_Address_AddResidentialAddress: String { return self._s[2494]! } + public var Channel_Username_Title: String { return self._s[2495]! } + public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2496]!, self._r[2496]!, [_0]) + } + public var AttachmentMenu_File: String { return self._s[2498]! } + public var AppleWatch_Title: String { return self._s[2499]! } + public var Activity_RecordingVideoMessage: String { return self._s[2500]! } + public var Weekday_Saturday: String { return self._s[2501]! } + public var Profile_CreateEncryptedChatError: String { return self._s[2502]! } + public var Common_Next: String { return self._s[2504]! } + public var Channel_Stickers_YourStickers: String { return self._s[2506]! } + public var Call_AudioRouteHeadphones: String { return self._s[2507]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[2509]! } + public var Watch_Contacts_NoResults: String { return self._s[2511]! } + public var PhotoEditor_TintTool: String { return self._s[2514]! } + public var LoginPassword_ResetAccount: String { return self._s[2516]! } + public var Settings_SavedMessages: String { return self._s[2517]! } + public var StickerPack_Add: String { return self._s[2518]! } + public var Your_cards_number_is_invalid: String { return self._s[2519]! } + public var Checkout_TotalAmount: String { return self._s[2520]! } + public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2521]!, self._r[2521]!, [_0]) + } + public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2522]!, self._r[2522]!, [_1, _2]) + } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[2523]! } + public func CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2525]!, self._r[2525]!, [_1, _2]) + } + public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2526]!, self._r[2526]!, [_0]) + } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[2527]! } + public var StickerPack_Share: String { return self._s[2528]! } + public var Passport_DeleteAddress: String { return self._s[2529]! } + public var Settings_Passport: String { return self._s[2530]! } + public var SharedMedia_EmptyFilesText: String { return self._s[2531]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[2532]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[2533]! } + public var Contacts_PermissionsText: String { return self._s[2534]! } + public var Group_Setup_HistoryVisible: String { return self._s[2535]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[2537]! } + public var SocksProxySetup_Title: String { return self._s[2538]! } + public var Notification_Mute1h: String { return self._s[2539]! } + public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2540]!, self._r[2540]!, [_0]) + } + public var FastTwoStepSetup_PasswordSection: String { return self._s[2541]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2544]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[2546]! } + public var DialogList_NoMessagesText: String { return self._s[2547]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[2548]! } + public var Privacy_Calls_P2PHelp: String { return self._s[2549]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[2551]! } + public var Common_TakePhotoOrVideo: String { return self._s[2552]! } + public var Call_StatusBusy: String { return self._s[2553]! } + public var Conversation_PinnedMessage: String { return self._s[2554]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[2555]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[2556]! } + public var AppleWatch_ReplyPresets: String { return self._s[2557]! } + public var Passport_DiscardMessageDescription: String { return self._s[2559]! } + public var Login_NetworkError: String { return self._s[2560]! } + public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2561]!, self._r[2561]!, [_0]) + } + public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2562]!, self._r[2562]!, [_0]) + } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[2563]! } + public func CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2565]!, self._r[2565]!, [_1]) + } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2566]! } + public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2568]!, self._r[2568]!, [_0]) + } + public var Call_ConnectionErrorMessage: String { return self._s[2569]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[2571]! } + public var ConversationMedia_Title: String { return self._s[2572]! } + public var EncryptionKey_Title: String { return self._s[2574]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[2575]! } + public var Notification_Exceptions_AddException: String { return self._s[2576]! } + public var Profile_MessageLifetime1m: String { return self._s[2577]! } + public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2578]!, self._r[2578]!, [_1]) + } + public var Month_GenMay: String { return self._s[2579]! } + public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2580]!, self._r[2580]!, [_0]) + } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2581]! } + public var Conversation_EmptyPlaceholder: String { return self._s[2583]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[2584]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[2585]! } + public var Camera_TapAndHoldForVideo: String { return self._s[2586]! } + public var Channel_JoinChannel: String { return self._s[2588]! } + public var Appearance_Animations: String { return self._s[2591]! } + public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2592]!, self._r[2592]!, [_1, _2]) + } + public var Stickers_GroupStickers: String { return self._s[2594]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[2596]! } + public var Passport_Address_Street: String { return self._s[2597]! } + public var Conversation_AddContact: String { return self._s[2598]! } + public var Login_PhonePlaceholder: String { return self._s[2599]! } + public var Channel_Members_InviteLink: String { return self._s[2601]! } + public var Bot_Stop: String { return self._s[2602]! } + public var Notification_PassportValueAddress: String { return self._s[2604]! } + public var Month_ShortJuly: String { return self._s[2605]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[2606]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[2607]! } + public var Passport_Identity_ReverseSide: String { return self._s[2608]! } + public var Watch_Stickers_Recents: String { return self._s[2611]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[2613]! } + public var Map_SendThisLocation: String { return self._s[2614]! } + public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2615]!, self._r[2615]!, [_0]) + } + public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2616]!, self._r[2616]!, [_0]) + } + public var ConvertToSupergroup_Note: String { return self._s[2617]! } + public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2618]!, self._r[2618]!, [_0]) + } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[2619]! } + public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2620]!, self._r[2620]!, [_0, _1]) + } + public var Login_CallRequestState3: String { return self._s[2622]! } + public func CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2624]!, self._r[2624]!, [_1]) + } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[2625]! } + public var Channel_AdminLogFilter_Title: String { return self._s[2626]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[2630]! } + public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_0]) + } + public var Passport_CorrectErrors: String { return self._s[2632]! } + public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2633]!, self._r[2633]!, [_0]) + } + public var Map_SendMyCurrentLocation: String { return self._s[2634]! } + public var SharedMedia_SearchNoResults: String { return self._s[2635]! } + public var Permissions_NotificationsText_v0: String { return self._s[2636]! } + public var LoginPassword_FloodError: String { return self._s[2637]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[2639]! } + public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2640]!, self._r[2640]!, [_0]) + } + public var Passport_Language_bn: String { return self._s[2641]! } + public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2642]!, self._r[2642]!, [_0]) + } + public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2643]!, self._r[2643]!, [_0]) + } + public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2644]!, self._r[2644]!, [_0]) + } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[2647]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[2649]! } + public var Contacts_PermissionsAllow: String { return self._s[2650]! } + public var ReportPeer_ReasonCopyright: String { return self._s[2651]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[2652]! } + public var Paint_Duplicate: String { return self._s[2653]! } + public var Passport_Address_Country: String { return self._s[2654]! } + public var Notification_RenamedChannel: String { return self._s[2656]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[2657]! } + public var Group_MessagePhotoUpdated: String { return self._s[2658]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[2659]! } + public var Conversation_ContextMenuBan: String { return self._s[2660]! } + public var TwoStepAuth_EmailSent: String { return self._s[2661]! } + public var MessagePoll_NoVotes: String { return self._s[2662]! } + public var Passport_Language_is: String { return self._s[2663]! } + public var Tour_Text5: String { return self._s[2665]! } + public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2667]!, self._r[2667]!, [_1, _2]) + } + public var Undo_SecretChatDeleted: String { return self._s[2668]! } + public var Paint_Edit: String { return self._s[2670]! } + public var LoginPassword_ForgotPassword: String { return self._s[2673]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[2674]! } + public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2675]!, self._r[2675]!, [_0, _1]) + } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[2676]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[2677]! } + public var Passport_Language_uz: String { return self._s[2678]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[2679]! } + public var Map_StopLiveLocation: String { return self._s[2681]! } + public var PasscodeSettings_Help: String { return self._s[2683]! } + public var NotificationsSound_Input: String { return self._s[2684]! } + public var Share_Title: String { return self._s[2687]! } + public var Login_TermsOfServiceAgree: String { return self._s[2688]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[2689]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[2690]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[2691]! } + public var EnterPasscode_EnterTitle: String { return self._s[2692]! } + public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2693]!, self._r[2693]!, [_0]) + } + public var Settings_CopyPhoneNumber: String { return self._s[2694]! } + public var NotificationsSound_Keys: String { return self._s[2695]! } + public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2696]!, self._r[2696]!, [_0]) + } + public var Notification_MessageLifetime1w: String { return self._s[2697]! } + public var Message_Video: String { return self._s[2698]! } + public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2699]!, self._r[2699]!, [_1]) + } + public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2702]!, self._r[2702]!, [_0]) + } + public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2703]!, self._r[2703]!, [_0]) + } + public var Passport_Language_mk: String { return self._s[2704]! } + public var CreatePoll_CancelConfirmation: String { return self._s[2705]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[2707]! } + public var PrivacyPolicy_Decline: String { return self._s[2708]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[2709]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[2710]! } + public var Permissions_SiriAllow_v0: String { return self._s[2712]! } + public func CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2713]!, self._r[2713]!, [_1, _2, _3]) + } + public func CHANNEL_MESSAGES(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2714]!, self._r[2714]!, [_1, _2]) + } + public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2715]!, self._r[2715]!, [_0]) + } + public var Paint_Regular: String { return self._s[2716]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[2717]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[2718]! } + public var GroupInfo_InviteByLink: String { return self._s[2720]! } + public var MessageTimer_Custom: String { return self._s[2721]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[2722]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[2724]! } + public var Channel_Username_InvalidTaken: String { return self._s[2725]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[2726]! } + public func CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2727]!, self._r[2727]!, [_1]) + } + public var Settings_ChatBackground: String { return self._s[2728]! } + public var Channel_Subscribers_Title: String { return self._s[2729]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[2730]! } + public var Watch_ConnectionDescription: String { return self._s[2731]! } + public var EditProfile_Title: String { return self._s[2735]! } + public var NotificationsSound_Bamboo: String { return self._s[2737]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[2739]! } + public var Login_SmsRequestState2: String { return self._s[2740]! } + public var Passport_Language_ar: String { return self._s[2741]! } + public var Conversation_MessageDialogEdit: String { return self._s[2742]! } + public var Common_Close: String { return self._s[2743]! } + public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2747]!, self._r[2747]!, [_0]) + } + public var UserInfo_About_Placeholder: String { return self._s[2748]! } + public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2749]!, self._r[2749]!, [_0]) + } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[2750]! } + public var Channel_Info_Banned: String { return self._s[2752]! } + public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2753]!, self._r[2753]!, [_0]) + } + public var Passport_Language_my: String { return self._s[2754]! } + public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2755]!, self._r[2755]!, [_1, _2, _3]) + } + public var Preview_CopyAddress: String { return self._s[2756]! } + public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2757]!, self._r[2757]!, [_0]) + } + public var KeyCommand_JumpToPreviousChat: String { return self._s[2758]! } + public var UserInfo_BotSettings: String { return self._s[2759]! } + public var LiveLocation_MenuStopAll: String { return self._s[2761]! } + public var Passport_PasswordCreate: String { return self._s[2762]! } + public var StickerSettings_MaskContextInfo: String { return self._s[2763]! } + public var Message_PinnedLocationMessage: String { return self._s[2764]! } + public var Map_Satellite: String { return self._s[2765]! } + public var Watch_Message_Unsupported: String { return self._s[2766]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[2767]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[2768]! } + public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2769]!, self._r[2769]!, [_0, _1]) + } + public var Notifications_ChannelNotificationsHelp: String { return self._s[2770]! } + public var Privacy_Calls_P2PContacts: String { return self._s[2771]! } + public var NotificationsSound_None: String { return self._s[2772]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[2774]! } + public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2775]!, self._r[2775]!, [_1]) + } + public var Cache_Indexing: String { return self._s[2776]! } + public var DialogList_RecentTitlePeople: String { return self._s[2778]! } + public var DialogList_EncryptionRejected: String { return self._s[2779]! } + public var GroupInfo_Administrators: String { return self._s[2780]! } + public var Passport_ScanPassportHelp: String { return self._s[2781]! } + public var Application_Name: String { return self._s[2782]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[2783]! } + public var Passport_Identity_TranslationHelp: String { return self._s[2785]! } + public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2786]!, self._r[2786]!, [_0]) + } + public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2787]!, self._r[2787]!, [_0]) + } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[2788]! } + public var Privacy_ChatsTitle: String { return self._s[2789]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[2790]! } + public var Watch_Suggestion_HoldOn: String { return self._s[2791]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[2792]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[2793]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[2794]! } + public var Channel_Setup_TypePublic: String { return self._s[2797]! } + public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2798]!, self._r[2798]!, [_0]) + } + public var Channel_TypeSetup_Title: String { return self._s[2800]! } + public var Map_OpenInMaps: String { return self._s[2802]! } + public var NotificationsSound_Tremolo: String { return self._s[2804]! } + public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2805]!, self._r[2805]!, [_1, _2, _3]) + } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[2806]! } + public var Passport_PasswordHelp: String { return self._s[2807]! } + public var Login_CodeExpiredError: String { return self._s[2808]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[2809]! } + public var Conversation_TitleUnmute: String { return self._s[2810]! } + public var Passport_Identity_ScansHelp: String { return self._s[2811]! } + public var Passport_Language_lo: String { return self._s[2812]! } + public var Camera_FlashAuto: String { return self._s[2813]! } + public var Common_Cancel: String { return self._s[2814]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[2815]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[2816]! } + public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2817]!, self._r[2817]!, [_1]) + } + public var Conversation_ReportSpamConfirmation: String { return self._s[2818]! } + public var ChatSettings_Title: String { return self._s[2820]! } + public var Passport_PasswordReset: String { return self._s[2821]! } + public var SocksProxySetup_TypeNone: String { return self._s[2822]! } + public var PhoneNumberHelp_Help: String { return self._s[2824]! } + public var Checkout_EnterPassword: String { return self._s[2825]! } + public var Share_AuthTitle: String { return self._s[2827]! } + public var Activity_UploadingDocument: String { return self._s[2828]! } + public var State_Connecting: String { return self._s[2829]! } + public var Profile_MessageLifetime1w: String { return self._s[2830]! } + public var Conversation_ContextMenuReport: String { return self._s[2831]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[2832]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[2833]! } + public var AuthSessions_Terminate: String { return self._s[2834]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[2835]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[2836]! } + public var PhotoEditor_Set: String { return self._s[2837]! } + public var EmptyGroupInfo_Title: String { return self._s[2838]! } + public var Login_PadPhoneHelp: String { return self._s[2839]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[2842]! } + public var NotificationsSound_Complete: String { return self._s[2843]! } + public var Group_Info_AdminLog: String { return self._s[2844]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[2845]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[2846]! } + public var Conversation_Admin: String { return self._s[2848]! } + public var Conversation_GifTooltip: String { return self._s[2849]! } + public var Passport_NotLoggedInMessage: String { return self._s[2850]! } + public var Profile_MessageLifetimeForever: String { return self._s[2851]! } + public var SharedMedia_EmptyTitle: String { return self._s[2853]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[2855]! } + public var Username_Help: String { return self._s[2856]! } + public var DialogList_LanguageTooltip: String { return self._s[2858]! } + public var Map_LoadError: String { return self._s[2859]! } + public var Channel_AdminLog_AddMembers: String { return self._s[2860]! } + public var Notification_Exceptions_NewException: String { return self._s[2861]! } + public var TwoStepAuth_EmailTitle: String { return self._s[2862]! } + public var WatchRemote_AlertText: String { return self._s[2863]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[2865]! } + public func LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2866]!, self._r[2866]!, [_1]) + } + public var Passport_Address_CountryPlaceholder: String { return self._s[2867]! } + public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2868]!, self._r[2868]!, [_0]) + } + public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2869]!, self._r[2869]!, [_1, _2, _3]) + } + public var Group_AdminLog_EmptyText: String { return self._s[2870]! } + public var AccessDenied_VideoMicrophone: String { return self._s[2872]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[2873]! } + public var Cache_ClearNone: String { return self._s[2874]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[2875]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[2876]! } + public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2877]!, self._r[2877]!, [_0]) + } + public var Passport_Identity_Country: String { return self._s[2878]! } + public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2879]!, self._r[2879]!, [_0]) + } + public var AccessDenied_Settings: String { return self._s[2880]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[2881]! } + public var Month_ShortMay: String { return self._s[2882]! } + public var Compose_NewGroup: String { return self._s[2883]! } + public var Group_Setup_TypePrivate: String { return self._s[2885]! } + public var Login_PadPhoneHelpTitle: String { return self._s[2887]! } + public var Appearance_ThemeDayClassic: String { return self._s[2888]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[2889]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[2890]! } + public var Conversation_typing: String { return self._s[2892]! } + public var Paint_Masks: String { return self._s[2893]! } + public var Username_InvalidTaken: String { return self._s[2894]! } + public func CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2895]!, self._r[2895]!, [_1, _2]) + } + public var Call_StatusNoAnswer: String { return self._s[2896]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[2897]! } + public var Passport_Identity_Selfie: String { return self._s[2898]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[2899]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[2900]! } + public var Conversation_ClearSecretHistory: String { return self._s[2901]! } + public var NetworkUsageSettings_Title: String { return self._s[2903]! } + public var Your_cards_security_code_is_invalid: String { return self._s[2905]! } + public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2907]!, self._r[2907]!, [_0]) + } + public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2908]!, self._r[2908]!, [_1, _2]) + } + public var SaveIncomingPhotosSettings_From: String { return self._s[2910]! } + public var Map_LiveLocationTitle: String { return self._s[2911]! } + public var Login_InfoAvatarAdd: String { return self._s[2912]! } + public var Passport_Identity_FilesView: String { return self._s[2913]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[2914]! } + public var Privacy_Calls_NeverAllow: String { return self._s[2915]! } + public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2916]!, self._r[2916]!, [_0]) + } + public var TwoStepAuth_ConfirmationText: String { return self._s[2917]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[2918]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[2919]! } + public var Tour_Title2: String { return self._s[2920]! } + public var Conversation_FileOpenIn: String { return self._s[2921]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[2922]! } + public var Wallpaper_Set: String { return self._s[2923]! } + public var Passport_Identity_Translations: String { return self._s[2925]! } + public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2926]!, self._r[2926]!, [_0]) + } + public var Channel_LeaveChannel: String { return self._s[2927]! } + public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2928]!, self._r[2928]!, [_1]) + } + public var PhotoEditor_HighlightsTint: String { return self._s[2929]! } + public var Passport_Email_Delete: String { return self._s[2930]! } + public var Conversation_Mute: String { return self._s[2932]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[2934]! } + public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2936]!, self._r[2936]!, [_1, _2]) + } + public var Calls_CallTabDescription: String { return self._s[2937]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[2938]! } + public var Common_No: String { return self._s[2939]! } + public var Weekday_Sunday: String { return self._s[2940]! } + public var Notification_Reply: String { return self._s[2941]! } + public var Conversation_ViewMessage: String { return self._s[2942]! } + public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2943]!, self._r[2943]!, [_0]) + } + public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2944]!, self._r[2944]!, [_0]) + } + public var Message_PinnedDocumentMessage: String { return self._s[2945]! } + public var DialogList_TabTitle: String { return self._s[2947]! } + public var Passport_FieldEmail: String { return self._s[2948]! } + public var Conversation_UnpinMessageAlert: String { return self._s[2949]! } + public var Passport_Address_TypeBankStatement: String { return self._s[2950]! } + public var Passport_Identity_ExpiryDate: String { return self._s[2951]! } + public var Privacy_Calls_P2P: String { return self._s[2952]! } + public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2954]!, self._r[2954]!, [_0]) + } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[2955]! } + public var EnterPasscode_ChangeTitle: String { return self._s[2956]! } + public var Passport_InfoText: String { return self._s[2957]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[2958]! } + public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2959]!, self._r[2959]!, [_0]) + } + public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2960]!, self._r[2960]!, [_1, _2, _3]) + } + public var Passport_Identity_EditDriversLicense: String { return self._s[2961]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[2963]! } + public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2964]!, self._r[2964]!, [_1, _2]) + } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[2966]! } + public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2968]!, self._r[2968]!, [_0]) + } + public var DialogList_Unread: String { return self._s[2969]! } + public var User_DeletedAccount: String { return self._s[2970]! } + public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2971]!, self._r[2971]!, [_0]) + } + public var UserInfo_NotificationsDefault: String { return self._s[2972]! } + public var SharedMedia_CategoryMedia: String { return self._s[2973]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[2974]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[2975]! } + public var Watch_ChatList_Compose: String { return self._s[2976]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[2977]! } + public var Watch_Microphone_Access: String { return self._s[2978]! } + public var Group_Setup_HistoryHeader: String { return self._s[2979]! } + public var Activity_UploadingPhoto: String { return self._s[2980]! } + public var Conversation_Edit: String { return self._s[2982]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[2983]! } + public var Login_TermsOfServiceDecline: String { return self._s[2984]! } + public var Message_PinnedContactMessage: String { return self._s[2985]! } + public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2986]!, self._r[2986]!, [_1, _2]) + } + public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2987]!, self._r[2987]!, [_1, _2, _3, _4, _5]) + } + public var TwoStepAuth_AdditionalPassword: String { return self._s[2989]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[2990]! } + public var Message_PinnedPhotoMessage: String { return self._s[2991]! } + public var Passport_FieldPhone: String { return self._s[2992]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[2993]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[2995]! } + public var Conversation_Call: String { return self._s[2996]! } + public var Common_TakePhoto: String { return self._s[2998]! } + public var Channel_NotificationLoading: String { return self._s[2999]! } + public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3000]!, self._r[3000]!, [_0]) + } + public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3001]!, self._r[3001]!, [_1]) + } + public var Permissions_SiriTitle_v0: String { return self._s[3002]! } + public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3003]!, self._r[3003]!, [_0]) + } + public var Channel_MessagePhotoRemoved: String { return self._s[3004]! } + public var Common_edit: String { return self._s[3005]! } + public var PrivacySettings_AuthSessions: String { return self._s[3006]! } + public var Month_ShortJune: String { return self._s[3007]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3008]! } + public var Call_ReportSend: String { return self._s[3009]! } + public var Watch_LastSeen_JustNow: String { return self._s[3010]! } + public var Notifications_MessageNotifications: String { return self._s[3011]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[3013]! } + public var Group_Status: String { return self._s[3014]! } + public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3015]!, self._r[3015]!, [_0, _1]) + } + public var ShareMenu_ShareTo: String { return self._s[3016]! } + public var Conversation_Moderate_Ban: String { return self._s[3017]! } + public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3018]!, self._r[3018]!, [_0]) + } + public var SharedMedia_ViewInChat: String { return self._s[3019]! } + public var Map_LiveLocationFor8Hours: String { return self._s[3020]! } + public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3022]!, self._r[3022]!, [_0]) + } + public var Appearance_ReduceMotion: String { return self._s[3023]! } + public var Map_OpenInHereMaps: String { return self._s[3024]! } + public var Channel_Setup_TypePublicHelp: String { return self._s[3025]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[3026]! } + public var PhotoEditor_Skip: String { return self._s[3027]! } + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notifications_Exceptions(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHAT_MESSAGES(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Call_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedContacts(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_ShortHours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func StickerPack_StickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Media_ShareItem(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedAudios(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Map_ETAMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_ShortDays(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHAT_MESSAGE_ROUNDS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Call_Seconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHANNEL_MESSAGES(_ value: Int32) -> String { +>>>>>>> c9aa4a85da7d15f2f4227e301b2f92f5dd46aae5 let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, "\(value)") } @@ -3518,6 +5457,7 @@ public final class PresentationStrings { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, "\(value)") } +<<<<<<< HEAD public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, "\(value)") @@ -3819,6 +5759,309 @@ public final class PresentationStrings { return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, "\(value)") } public func PUSH_MESSAGES(_ value: Int32) -> String { +======= + public func PUSH_MESSAGE_PHOTOS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_MESSAGES(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHAT_MESSAGE_FWDS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func StickerPack_AddMaskCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Conversation_StatusSubscribers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedFiles(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func QuickSend_Photos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedPolls(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedLocations(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHAT_MESSAGE_VIDEOS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_MESSAGE_ROUNDS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Call_ShortMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func SharedMedia_File(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func LastSeen_HoursAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Conversation_StatusMembers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MuteExpires_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func SharedMedia_Generic(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedMessages(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notification_GameScoreSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Media_ShareVideo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func StickerPack_AddStickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Conversation_StatusOnline(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func AttachmentMenu_SendGif(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Invitation_Members(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_MESSAGE_VIDEOS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func AttachmentMenu_SendItem(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MuteExpires_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func SharedMedia_Link(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_Months(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_MESSAGE_FWDS(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedGifs(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedAuthorsOthers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func SharedMedia_Video(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MuteFor_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedStickers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func UserCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Map_ETAHours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Contacts_ImportersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedPhotos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Call_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Passport_Scans(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessagePoll_VotedCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Media_SharePhoto(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_Weeks(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func ForwardedVideoMessages(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notification_GameScoreExtended(_ value: Int32) -> String { +>>>>>>> c9aa4a85da7d15f2f4227e301b2f92f5dd46aae5 let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, "\(value)") } diff --git a/TelegramUI/RadialStatusNode.swift b/TelegramUI/RadialStatusNode.swift index 6cb97a2fc1..d04a7d32d6 100644 --- a/TelegramUI/RadialStatusNode.swift +++ b/TelegramUI/RadialStatusNode.swift @@ -196,6 +196,7 @@ public final class RadialStatusNode: ASControlNode { if let contentNode = strongSelf.contentNode { strongSelf.addSubnode(contentNode) contentNode.frame = strongSelf.bounds + contentNode.prepareAnimateIn(from: fromState) if strongSelf.isNodeLoaded { contentNode.layout() } diff --git a/TelegramUI/SearchBarNode.swift b/TelegramUI/SearchBarNode.swift index 84498e22bf..9c422c408a 100644 --- a/TelegramUI/SearchBarNode.swift +++ b/TelegramUI/SearchBarNode.swift @@ -12,13 +12,15 @@ private func generateClearIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: color) } -private func generateBackground(backgroundColor: UIColor, foregroundColor: UIColor, diameter: CGFloat) -> UIImage? { +private func generateBackground(foregroundColor: UIColor, diameter: CGFloat) -> UIImage? { return generateImage(CGSize(width: diameter, height: diameter), contextGenerator: { size, context in - context.setFillColor(backgroundColor.cgColor) + context.setBlendMode(.copy) + context.setFillColor(UIColor.clear.cgColor) context.fill(CGRect(origin: CGPoint(), size: size)) + context.setBlendMode(.normal) context.setFillColor(foregroundColor.cgColor) context.fillEllipse(in: CGRect(origin: CGPoint(), size: size)) - }, opaque: true)?.stretchableImage(withLeftCapWidth: Int(diameter / 2.0), topCapHeight: Int(diameter / 2.0)) + }, opaque: false)?.stretchableImage(withLeftCapWidth: Int(diameter / 2.0), topCapHeight: Int(diameter / 2.0)) } private class SearchBarTextField: UITextField { @@ -113,7 +115,7 @@ private class SearchBarTextField: UITextField { let prefixSize = self.prefixLabel.measure(textRect.size) let prefixBounds = bounds.insetBy(dx: 4.0, dy: 4.0) - self.prefixLabel.frame = CGRect(origin: CGPoint(x: prefixBounds.minX, y: prefixBounds.minY + 1.0), size: prefixSize) + self.prefixLabel.frame = CGRect(origin: CGPoint(x: prefixBounds.minX, y: prefixBounds.minY + textOffset), size: prefixSize) } override func deleteBackward() { @@ -388,7 +390,7 @@ class SearchBarNode: ASDisplayNode, UITextFieldDelegate { if fieldStyle != .modern { self.separatorNode.backgroundColor = theme.separator } - self.textBackgroundNode.image = generateBackground(backgroundColor: theme.background, foregroundColor: theme.inputFill, diameter: self.fieldStyle.cornerDiameter) + self.textBackgroundNode.image = generateBackground(foregroundColor: theme.inputFill, diameter: self.fieldStyle.cornerDiameter) self.textField.textColor = theme.primaryText self.clearButton.setImage(generateClearIcon(color: theme.inputClear), for: []) self.iconNode.image = generateLoupeIcon(color: theme.inputIcon) @@ -418,7 +420,7 @@ class SearchBarNode: ASDisplayNode, UITextFieldDelegate { let textBackgroundHeight = self.fieldStyle.height let cancelButtonSize = self.cancelButton.measure(CGSize(width: 100.0, height: CGFloat.infinity)) - transition.updateFrame(node: self.cancelButton, frame: CGRect(origin: CGPoint(x: contentFrame.maxX - 8.0 - cancelButtonSize.width, y: verticalOffset + textBackgroundHeight + floorToScreenPixels((textBackgroundHeight - cancelButtonSize.height) / 2.0)), size: cancelButtonSize)) + transition.updateFrame(node: self.cancelButton, frame: CGRect(origin: CGPoint(x: contentFrame.maxX - 10.0 - cancelButtonSize.width, y: verticalOffset + textBackgroundHeight + floorToScreenPixels((textBackgroundHeight - cancelButtonSize.height) / 2.0)), size: cancelButtonSize)) let padding = self.fieldStyle.padding let textBackgroundFrame = CGRect(origin: CGPoint(x: contentFrame.minX + padding, y: verticalOffset + textBackgroundHeight), size: CGSize(width: contentFrame.width - padding * 2.0 - (self.hasCancelButton ? cancelButtonSize.width + 11.0 : 0.0), height: textBackgroundHeight)) diff --git a/TelegramUI/SearchBarPlaceholderNode.swift b/TelegramUI/SearchBarPlaceholderNode.swift index 790bcaaaa5..22666d7be0 100644 --- a/TelegramUI/SearchBarPlaceholderNode.swift +++ b/TelegramUI/SearchBarPlaceholderNode.swift @@ -10,15 +10,6 @@ private func generateLoupeIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: templateLoupeIcon, color: color) } -private func generateBackground(backgroundColor: UIColor, foregroundColor: UIColor, diameter: CGFloat) -> UIImage? { - return generateImage(CGSize(width: diameter, height: diameter), contextGenerator: { size, context in - context.setFillColor(backgroundColor.cgColor) - context.fill(CGRect(origin: CGPoint(), size: size)) - context.setFillColor(foregroundColor.cgColor) - context.fillEllipse(in: CGRect(origin: CGPoint(), size: size)) - }, opaque: true)?.stretchableImage(withLeftCapWidth: Int(diameter / 2.0), topCapHeight: Int(diameter / 2.0)) -} - private class SearchBarPlaceholderNodeLayer: CALayer { } @@ -67,7 +58,6 @@ class SearchBarPlaceholderNode: ASDisplayNode { self.labelNode = TextNode() self.labelNode.isOpaque = false self.labelNode.isLayerBacked = true - //self.labelNode.backgroundColor = self.foregroundColor super.init() @@ -84,7 +74,7 @@ class SearchBarPlaceholderNode: ASDisplayNode { self.backgroundNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(backgroundTap(_:)))) } - func asyncLayout() -> (_ placeholderString: NSAttributedString?, _ constrainedSize: CGSize, _ expansionProgress: CGFloat, _ iconColor: UIColor, _ foregroundColor: UIColor, _ backgroundColor: UIColor, _ transition: ContainedViewLayoutTransition) -> (() -> Void) { + func asyncLayout() -> (_ placeholderString: NSAttributedString?, _ constrainedSize: CGSize, _ expansionProgress: CGFloat, _ iconColor: UIColor, _ foregroundColor: UIColor, _ backgroundColor: UIColor, _ transition: ContainedViewLayoutTransition) -> (CGFloat, () -> Void) { let labelLayout = TextNode.asyncLayout(self.labelNode) let currentForegroundColor = self.foregroundColor let currentIconColor = self.iconColor @@ -101,7 +91,8 @@ class SearchBarPlaceholderNode: ASDisplayNode { updatedIconImage = generateLoupeIcon(color: iconColor) } - return { [weak self] in + let height = constrainedSize.height * expansionProgress + return (height, { [weak self] in if let strongSelf = self { let _ = labelApply() @@ -122,7 +113,7 @@ class SearchBarPlaceholderNode: ASDisplayNode { var iconSize = CGSize() var totalWidth = labelLayoutResult.size.width let spacing: CGFloat = 7.0 - let height = constrainedSize.height * expansionProgress + if let iconImage = strongSelf.iconNode.image { iconSize = iconImage.size @@ -153,7 +144,7 @@ class SearchBarPlaceholderNode: ASDisplayNode { transition.updateAlpha(node: strongSelf.backgroundNode, alpha: outerAlpha) transition.updateFrame(node: strongSelf.backgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: constrainedSize.width, height: height))) } - } + }) } } diff --git a/TelegramUI/SearchDisplayController.swift b/TelegramUI/SearchDisplayController.swift index a59c738f5c..7456d56e9e 100644 --- a/TelegramUI/SearchDisplayController.swift +++ b/TelegramUI/SearchDisplayController.swift @@ -19,8 +19,8 @@ final class SearchDisplayController { private var isSearchingDisposable: Disposable? - init(theme: PresentationTheme, strings: PresentationStrings, mode: SearchDisplayControllerMode = .navigation, contentNode: SearchDisplayControllerContentNode, cancel: @escaping () -> Void) { - self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings, fieldStyle: .modern) + init(presentationData: PresentationData, mode: SearchDisplayControllerMode = .navigation, contentNode: SearchDisplayControllerContentNode, cancel: @escaping () -> Void) { + self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: presentationData.theme, hasSeparator: false), strings: presentationData.strings, fieldStyle: .modern) self.mode = mode self.contentNode = contentNode @@ -38,6 +38,9 @@ final class SearchDisplayController { self.contentNode.dismissInput = { [weak self] in self?.searchBar.deactivate(clear: false) } + self.contentNode.setQuery = { [weak self] query in + self?.searchBar.text = query + } self.isSearchingDisposable = (contentNode.isSearching |> deliverOnMainQueue).start(next: { [weak self] value in @@ -45,8 +48,9 @@ final class SearchDisplayController { }) } - func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) { - self.searchBar.updateThemeAndStrings(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings) + func updatePresentationData(_ presentationData: PresentationData) { + self.searchBar.updateThemeAndStrings(theme: SearchBarNodeTheme(theme: presentationData.theme, hasSeparator: false), strings: presentationData.strings) + self.contentNode.updatePresentationData(presentationData) } func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { @@ -68,7 +72,7 @@ final class SearchDisplayController { if case .navigation = self.mode { searchBarFrame = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: 54.0) } else { - searchBarFrame = CGRect(x: 0.0, y: navigationBarFrame.height - 54.0, width: layout.size.width, height: 54.0) + searchBarFrame = navigationBarFrame //CGRect(x: 0.0, y: navigationBarFrame.height - 54.0, width: layout.size.width, height: 54.0) } transition.updateFrame(node: self.searchBar, frame: searchBarFrame) self.searchBar.updateLayout(boundingSize: searchBarFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: transition) @@ -152,7 +156,7 @@ final class SearchDisplayController { } } - func previewViewAndActionAtLocation(_ location: CGPoint) -> (UIView, Any)? { + func previewViewAndActionAtLocation(_ location: CGPoint) -> (UIView, CGRect, Any)? { return self.contentNode.previewViewAndActionAtLocation(location) } } diff --git a/TelegramUI/SearchDisplayControllerContentNode.swift b/TelegramUI/SearchDisplayControllerContentNode.swift index db743a6139..b53a8acc61 100644 --- a/TelegramUI/SearchDisplayControllerContentNode.swift +++ b/TelegramUI/SearchDisplayControllerContentNode.swift @@ -6,6 +6,7 @@ import SwiftSignalKit class SearchDisplayControllerContentNode: ASDisplayNode { final var dismissInput: (() -> Void)? final var cancel: (() -> Void)? + final var setQuery: ((String) -> Void)? var isSearching: Signal { return .single(false) @@ -15,6 +16,10 @@ class SearchDisplayControllerContentNode: ASDisplayNode { super.init() } + func updatePresentationData(_ presentationData: PresentationData) { + + } + func searchTextUpdated(text: String) { } @@ -27,7 +32,7 @@ class SearchDisplayControllerContentNode: ASDisplayNode { return .single(Void()) } - func previewViewAndActionAtLocation(_ location: CGPoint) -> (UIView, Any)? { + func previewViewAndActionAtLocation(_ location: CGPoint) -> (UIView, CGRect, Any)? { return nil } diff --git a/TelegramUI/SecureIdDocumentImageGalleryItem.swift b/TelegramUI/SecureIdDocumentImageGalleryItem.swift index fcca2f2491..a9e5c0838e 100644 --- a/TelegramUI/SecureIdDocumentImageGalleryItem.swift +++ b/TelegramUI/SecureIdDocumentImageGalleryItem.swift @@ -79,7 +79,7 @@ final class SecureIdDocumentGalleryItemNode: ZoomableContentGalleryItemNode { super.init() - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } diff --git a/TelegramUI/SettingsThemeWallpaperNode.swift b/TelegramUI/SettingsThemeWallpaperNode.swift index 7c7a91b149..6aa61a6c61 100644 --- a/TelegramUI/SettingsThemeWallpaperNode.swift +++ b/TelegramUI/SettingsThemeWallpaperNode.swift @@ -5,6 +5,24 @@ import TelegramCore import Postbox import SwiftSignalKit +private func whiteColorImage(theme: PresentationTheme) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { + return .single({ arguments in + let context = DrawingContext(size: arguments.drawingSize, clear: true) + + context.withFlippedContext { c in + c.setFillColor(UIColor.white.cgColor) + c.fill(CGRect(origin: CGPoint(), size: arguments.drawingSize)) + + let lineWidth: CGFloat = 1.0 + c.setLineWidth(lineWidth) + c.setStrokeColor(theme.list.controlSecondaryColor.cgColor) + c.stroke(CGRect(origin: CGPoint(), size: arguments.drawingSize).insetBy(dx: lineWidth / 2.0, dy: lineWidth / 2.0)) + } + + return context + }) +} + final class SettingsThemeWallpaperNode: ASDisplayNode { private var wallpaper: TelegramWallpaper? @@ -54,9 +72,17 @@ final class SettingsThemeWallpaperNode: ASDisplayNode { let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: CGSize(), boundingSize: size, intrinsicInsets: UIEdgeInsets())) apply() case let .color(color): - self.imageNode.isHidden = true - self.backgroundNode.isHidden = false - self.backgroundNode.backgroundColor = UIColor(rgb: UInt32(bitPattern: color)) + if color == 0x00ffffff { + self.imageNode.isHidden = false + self.backgroundNode.isHidden = true + self.imageNode.setSignal(whiteColorImage(theme: account.telegramApplicationContext.currentPresentationData.with { $0 }.theme)) + let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: CGSize(), boundingSize: size, intrinsicInsets: UIEdgeInsets())) + apply() + } else { + self.imageNode.isHidden = true + self.backgroundNode.isHidden = false + self.backgroundNode.backgroundColor = UIColor(rgb: UInt32(bitPattern: color)) + } case let .image(representations): self.imageNode.isHidden = false self.backgroundNode.isHidden = true diff --git a/TelegramUI/SystemVideoContent.swift b/TelegramUI/SystemVideoContent.swift index 97f4d05fac..533f2345d5 100644 --- a/TelegramUI/SystemVideoContent.swift +++ b/TelegramUI/SystemVideoContent.swift @@ -107,7 +107,7 @@ private final class SystemVideoContentNode: ASDisplayNode, UniversalVideoContent } }) - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } diff --git a/TelegramUI/TelegramController.swift b/TelegramUI/TelegramController.swift index edc122aeb0..0e68b0e99b 100644 --- a/TelegramUI/TelegramController.swift +++ b/TelegramUI/TelegramController.swift @@ -75,7 +75,6 @@ public class TelegramController: ViewController { override public var navigationHeight: CGFloat { return super.navigationHeight + self.additionalHeight - } override public var navigationInsetHeight: CGFloat { @@ -251,7 +250,10 @@ public class TelegramController: ViewController { public override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { super.containerLayoutUpdated(layout, transition: transition) - let navigationHeight = super.navigationHeight + var navigationHeight = super.navigationHeight + if !self.displayNavigationBar { + navigationHeight = 0.0 + } var additionalHeight: CGFloat = 0.0 diff --git a/TelegramUI/ThemeColorsGridController.swift b/TelegramUI/ThemeColorsGridController.swift new file mode 100644 index 0000000000..8c165c8106 --- /dev/null +++ b/TelegramUI/ThemeColorsGridController.swift @@ -0,0 +1,89 @@ +import Foundation +import Display +import AsyncDisplayKit +import Postbox +import TelegramCore +import SwiftSignalKit +import LegacyComponents + +final class ThemeColorsGridController: ViewController { + private var controllerNode: ThemeColorsGridControllerNode { + return self.displayNode as! ThemeColorsGridControllerNode + } + + private let _ready = Promise() + override var ready: Promise { + return self._ready + } + + private let account: Account + + private var presentationData: PresentationData + private var presentationDataDisposable: Disposable? + + private var validLayout: ContainerViewLayout? + + init(account: Account) { + self.account = account + self.presentationData = account.telegramApplicationContext.currentPresentationData.with { $0 } + + super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData)) + + self.title = self.presentationData.strings.WallpaperColors_Title + self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBar.style.style + + self.scrollToTop = { [weak self] in + if let strongSelf = self { + strongSelf.controllerNode.scrollToTop() + } + } + + self.presentationDataDisposable = (account.telegramApplicationContext.presentationData + |> deliverOnMainQueue).start(next: { [weak self] presentationData in + if let strongSelf = self { + let previousTheme = strongSelf.presentationData.theme + let previousStrings = strongSelf.presentationData.strings + + strongSelf.presentationData = presentationData + + if previousTheme !== presentationData.theme || previousStrings !== presentationData.strings { + strongSelf.updateThemeAndStrings() + } + } + }) + } + + required public init(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + deinit { + self.presentationDataDisposable?.dispose() + } + + private func updateThemeAndStrings() { + self.title = self.presentationData.strings.WallpaperColors_Title + self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBar.style.style + self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData)) + + if self.isNodeLoaded { + self.controllerNode.updatePresentationData(self.presentationData) + } + } + + override func loadDisplayNode() { + self.displayNode = ThemeColorsGridControllerNode(account: self.account, presentationData: self.presentationData, present: { [weak self] controller, arguments in + self?.present(controller, in: .window(.root), with: arguments, blockInteraction: true) + }) + + self._ready.set(self.controllerNode.ready.get()) + + self.displayNodeDidLoad() + } + + override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, transition: transition) + + self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition) + } +} diff --git a/TelegramUI/ThemeColorsGridControllerItem.swift b/TelegramUI/ThemeColorsGridControllerItem.swift new file mode 100644 index 0000000000..82dc1bf040 --- /dev/null +++ b/TelegramUI/ThemeColorsGridControllerItem.swift @@ -0,0 +1,84 @@ +import Foundation +import Display +import TelegramCore +import SwiftSignalKit +import AsyncDisplayKit +import Postbox + +final class ThemeColorsGridControllerItem: GridItem { + let account: Account + let wallpaper: TelegramWallpaper + let selected: Bool + let interaction: ThemeColorsGridControllerInteraction + + let section: GridSection? = nil + + init(account: Account, wallpaper: TelegramWallpaper, selected: Bool, interaction: ThemeColorsGridControllerInteraction) { + self.account = account + self.wallpaper = wallpaper + self.selected = selected + self.interaction = interaction + } + + func node(layout: GridNodeLayout, synchronousLoad: Bool) -> GridItemNode { + let node = ThemeColorsGridControllerItemNode() + node.setup(account: self.account, wallpaper: self.wallpaper, selected: self.selected, interaction: self.interaction) + return node + } + + func update(node: GridItemNode) { + guard let node = node as? ThemeColorsGridControllerItemNode else { + assertionFailure() + return + } + node.setup(account: self.account, wallpaper: self.wallpaper, selected: self.selected, interaction: self.interaction) + } +} + +final class ThemeColorsGridControllerItemNode: GridItemNode { + private let wallpaperNode: SettingsThemeWallpaperNode + private var selectionNode: GridMessageSelectionNode? + + private var currentState: (Account, TelegramWallpaper, Bool)? + private var interaction: ThemeColorsGridControllerInteraction? + + override init() { + self.wallpaperNode = SettingsThemeWallpaperNode() + super.init() + + self.addSubnode(self.wallpaperNode) + } + + override func didLoad() { + super.didLoad() + + self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:)))) + } + + func setup(account: Account, wallpaper: TelegramWallpaper, selected: Bool, interaction: ThemeColorsGridControllerInteraction) { + self.interaction = interaction + + if self.currentState == nil || self.currentState!.0 !== account || wallpaper != self.currentState!.1 || selected != self.currentState!.2 { + self.currentState = (account, wallpaper, selected) + self.setNeedsLayout() + } + } + + @objc func tapGesture(_ recognizer: UITapGestureRecognizer) { + if case .ended = recognizer.state { + if let (_, wallpaper, _) = self.currentState { + self.interaction?.openWallpaper(wallpaper) + } + } + } + + override func layout() { + super.layout() + + let bounds = self.bounds + if let (account, wallpaper, selected) = self.currentState { + self.wallpaperNode.setWallpaper(account: account, wallpaper: wallpaper, selected: selected, size: bounds.size) + self.selectionNode?.frame = CGRect(origin: CGPoint(), size: bounds.size) + } + } +} diff --git a/TelegramUI/ThemeColorsGridControllerNode.swift b/TelegramUI/ThemeColorsGridControllerNode.swift new file mode 100644 index 0000000000..ef967c6a77 --- /dev/null +++ b/TelegramUI/ThemeColorsGridControllerNode.swift @@ -0,0 +1,269 @@ +import Foundation +import Display +import AsyncDisplayKit +import Postbox +import TelegramCore +import SwiftSignalKit + +final class ThemeColorsGridControllerInteraction { + let openWallpaper: (TelegramWallpaper) -> Void + + init(openWallpaper: @escaping (TelegramWallpaper) -> Void) { + self.openWallpaper = openWallpaper + } +} + +private struct ThemeColorsGridControllerEntry: Comparable, Identifiable { + let index: Int + let wallpaper: TelegramWallpaper + let selected: Bool + + static func ==(lhs: ThemeColorsGridControllerEntry, rhs: ThemeColorsGridControllerEntry) -> Bool { + return lhs.index == rhs.index && lhs.wallpaper == rhs.wallpaper && lhs.selected == rhs.selected + } + + static func <(lhs: ThemeColorsGridControllerEntry, rhs: ThemeColorsGridControllerEntry) -> Bool { + return lhs.index < rhs.index + } + + var stableId: Int { + return self.index + } + + func item(account: Account, interaction: ThemeColorsGridControllerInteraction) -> ThemeColorsGridControllerItem { + return ThemeColorsGridControllerItem(account: account, wallpaper: self.wallpaper, selected: self.selected, interaction: interaction) + } +} + +private struct ThemeColorsGridEntryTransition { + let deletions: [Int] + let insertions: [GridNodeInsertItem] + let updates: [GridNodeUpdateItem] + let updateFirstIndexInSectionOffset: Int? + let stationaryItems: GridNodeStationaryItems + let scrollToItem: GridNodeScrollToItem? +} + +private func preparedThemeColorsGridEntryTransition(account: Account, from fromEntries: [ThemeColorsGridControllerEntry], to toEntries: [ThemeColorsGridControllerEntry], interaction: ThemeColorsGridControllerInteraction) -> ThemeColorsGridEntryTransition { + let stationaryItems: GridNodeStationaryItems = .none + let scrollToItem: GridNodeScrollToItem? = nil + + let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) + + let deletions = deleteIndices + let insertions = indicesAndItems.map { GridNodeInsertItem(index: $0.0, item: $0.1.item(account: account, interaction: interaction), previousIndex: $0.2) } + let updates = updateIndices.map { GridNodeUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, interaction: interaction)) } + + return ThemeColorsGridEntryTransition(deletions: deletions, insertions: insertions, updates: updates, updateFirstIndexInSectionOffset: nil, stationaryItems: stationaryItems, scrollToItem: scrollToItem) +} + +private func availableColors() -> [Int32] { + return [ + 0xffffff, + 0xd4dfea, + 0xb3cde1, + 0x6ab7ea, + 0x008dd0, + 0xd3e2da, + 0xc8e6c9, + 0xc5e1a5, + 0x61b06e, + 0xcdcfaf, + 0xa7a895, + 0x7c6f72, + 0xffd7ae, + 0xffb66d, + 0xde8751, + 0xefd5e0, + 0xdba1b9, + 0xffafaf, + 0xf16a60, + 0xe8bcea, + 0x9592ed, + 0xd9bc60, + 0xb17e49, + 0xd5cef7, + 0xdf506b, + 0x8bd2cc, + 0x3c847e, + 0x22612c, + 0x244d7c, + 0x3d3b85, + 0x65717d, + 0x18222d, + 0x000000 + ] +} + +final class ThemeColorsGridControllerNode: ASDisplayNode { + private let account: Account + private var presentationData: PresentationData + private var controllerInteraction: ThemeColorsGridControllerInteraction? + private let present: (ViewController, Any?) -> Void + + let ready = ValuePromise() + + private var backgroundNode: ASDisplayNode + private var separatorNode: ASDisplayNode + + private let customColorItemNode: ItemListActionItemNode + private var customColorItem: ItemListActionItem + + let gridNode: GridNode + + private var queuedTransitions: [ThemeColorsGridEntryTransition] = [] + private var validLayout: (ContainerViewLayout, CGFloat)? + + private var disposable: Disposable? + + init(account: Account, presentationData: PresentationData, present: @escaping (ViewController, Any?) -> Void) { + self.account = account + self.presentationData = presentationData + self.present = present + + self.gridNode = GridNode() + self.gridNode.showVerticalScrollIndicator = true + + self.backgroundNode = ASDisplayNode() + self.backgroundNode.backgroundColor = presentationData.theme.list.blocksBackgroundColor + + self.separatorNode = ASDisplayNode() + self.separatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor + + self.customColorItemNode = ItemListActionItemNode() + self.customColorItem = ItemListActionItem(theme: presentationData.theme, title: presentationData.strings.WallpaperColors_SetCustomColor, kind: .generic, alignment: .natural, sectionId: 0, style: .blocks, action: { + }) + + super.init() + + self.setViewBlock({ + return UITracingLayerView() + }) + + self.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor + + self.gridNode.addSubnode(self.backgroundNode) + self.gridNode.addSubnode(self.separatorNode) + self.gridNode.addSubnode(self.customColorItemNode) + self.addSubnode(self.gridNode) + + let previousEntries = Atomic<[ThemeColorsGridControllerEntry]?>(value: nil) + + let interaction = ThemeColorsGridControllerInteraction(openWallpaper: { [weak self] wallpaper in + if let strongSelf = self { + let entries = previousEntries.with { $0 } + if let entries = entries, !entries.isEmpty { + let wallpapers = entries.map { $0.wallpaper } + let controller = WallpaperListPreviewController(account: account, source: .list(wallpapers: wallpapers, central: wallpaper, mode: nil)) + strongSelf.present(controller, nil) + } + } + }) + self.controllerInteraction = interaction + + let wallpapers = availableColors().map { TelegramWallpaper.color($0) } + let transition = account.telegramApplicationContext.presentationData + |> map { presentationData -> (ThemeColorsGridEntryTransition, Bool) in + var entries: [ThemeColorsGridControllerEntry] = [] + var index = 0 + + for wallpaper in wallpapers { + let selected = presentationData.chatWallpaper == wallpaper + entries.append(ThemeColorsGridControllerEntry(index: index, wallpaper: wallpaper, selected: selected)) + index += 1 + } + + let previous = previousEntries.swap(entries) + return (preparedThemeColorsGridEntryTransition(account: account, from: previous ?? [], to: entries, interaction: interaction), previous == nil) + } + self.disposable = (transition |> deliverOnMainQueue).start(next: { [weak self] (transition, _) in + if let strongSelf = self { + strongSelf.enqueueTransition(transition) + } + }) + } + + deinit { + self.disposable?.dispose() + } + + func updatePresentationData(_ presentationData: PresentationData) { + self.presentationData = presentationData + + self.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor + + self.customColorItem = ItemListActionItem(theme: presentationData.theme, title: presentationData.strings.WallpaperColors_SetCustomColor, kind: .generic, alignment: .natural, sectionId: 0, style: .blocks, action: { [weak self] in + }) + + if let (layout, navigationBarHeight) = self.validLayout { + self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate) + } + } + + private func enqueueTransition(_ transition: ThemeColorsGridEntryTransition) { + self.queuedTransitions.append(transition) + if self.validLayout != nil { + self.dequeueTransitions() + } + } + + private func dequeueTransitions() { + while !self.queuedTransitions.isEmpty { + let transition = self.queuedTransitions.removeFirst() + self.gridNode.transaction(GridNodeTransaction(deleteItems: transition.deletions, insertItems: transition.insertions, updateItems: transition.updates, scrollToItem: transition.scrollToItem, updateLayout: nil, itemTransition: .immediate, stationaryItems: transition.stationaryItems, updateFirstIndexInSectionOffset: transition.updateFirstIndexInSectionOffset), completion: { [weak self] _ in + if let strongSelf = self { + strongSelf.ready.set(true) + } + }) + } + } + + func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + let hadValidLayout = self.validLayout != nil + + var insets = layout.insets(options: [.input]) + insets.top += navigationBarHeight + let scrollIndicatorInsets = insets + + let referenceImageSize = CGSize(width: 108.0, height: 108.0) + + let minSpacing: CGFloat = 8.0 + + let imageCount = Int((layout.size.width - minSpacing * 2.0) / (referenceImageSize.width + minSpacing)) + + let imageSize = referenceImageSize.aspectFilled(CGSize(width: floor((layout.size.width - CGFloat(imageCount + 1) * minSpacing) / CGFloat(imageCount)), height: referenceImageSize.height)) + + let spacing = floor((layout.size.width - CGFloat(imageCount) * imageSize.width) / CGFloat(imageCount + 1)) + + let makeColorLayout = self.customColorItemNode.asyncLayout() + let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: insets.left, rightInset: insets.right) + let (colorLayout, colorApply) = makeColorLayout(self.customColorItem, params, ItemListNeighbors(top: .none, bottom: .none)) + colorApply() + + let buttonTopInset: CGFloat = 32.0 + let buttonHeight: CGFloat = 44.0 + let buttonBottomInset: CGFloat = 17.0 + + let buttonInset: CGFloat = buttonTopInset + buttonHeight + buttonBottomInset + let buttonOffset = buttonInset + 10.0 + + transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset - 500.0), size: CGSize(width: layout.size.width, height: buttonInset + 500.0))) + transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonInset - UIScreenPixel), size: CGSize(width: layout.size.width, height: UIScreenPixel))) + transition.updateFrame(node: self.customColorItemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset), size: colorLayout.contentSize)) + + insets.top += spacing + buttonInset + + self.gridNode.transaction(GridNodeTransaction(deleteItems: [], insertItems: [], updateItems: [], scrollToItem: nil, updateLayout: GridNodeUpdateLayout(layout: GridNodeLayout(size: layout.size, insets: insets, scrollIndicatorInsets: scrollIndicatorInsets, preloadSize: 300.0, type: .fixed(itemSize: imageSize, fillWidth: nil, lineSpacing: spacing, itemSpacing: nil)), transition: transition), itemTransition: .immediate, stationaryItems: .none, updateFirstIndexInSectionOffset: nil), completion: { _ in }) + + self.gridNode.frame = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height) + + self.validLayout = (layout, navigationBarHeight) + if !hadValidLayout { + self.dequeueTransitions() + } + } + + func scrollToTop() { + self.gridNode.transaction(GridNodeTransaction(deleteItems: [], insertItems: [], updateItems: [], scrollToItem: GridNodeScrollToItem(index: 0, position: .top, transition: .animated(duration: 0.25, curve: .easeInOut), directionHint: .up, adjustForSection: true, adjustForTopInset: true), updateLayout: nil, itemTransition: .immediate, stationaryItems: .none, updateFirstIndexInSectionOffset: nil), completion: { _ in }) + } +} diff --git a/TelegramUI/ThemeGalleryItem.swift b/TelegramUI/ThemeGalleryItem.swift index 0c7cc49168..36920ab51b 100644 --- a/TelegramUI/ThemeGalleryItem.swift +++ b/TelegramUI/ThemeGalleryItem.swift @@ -51,7 +51,7 @@ final class ThemeGalleryItemNode: ZoomableContentGalleryItemNode { self.backgroundColor = .clear - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } diff --git a/TelegramUI/ThemeGridController.swift b/TelegramUI/ThemeGridController.swift index c2708cb57a..f7ef094483 100644 --- a/TelegramUI/ThemeGridController.swift +++ b/TelegramUI/ThemeGridController.swift @@ -6,11 +6,6 @@ import TelegramCore import SwiftSignalKit import LegacyComponents -enum ThemeGridControllerMode { - case wallpapers - case solidColors -} - final class ThemeGridController: ViewController { private var controllerNode: ThemeGridControllerNode { return self.displayNode as! ThemeGridControllerNode @@ -22,14 +17,11 @@ final class ThemeGridController: ViewController { } private let account: Account - private let mode: ThemeGridControllerMode private var presentationData: PresentationData private let presentationDataPromise = Promise() private var presentationDataDisposable: Disposable? - private let stateDisposable = MetaDisposable() - private var searchContentNode: NavigationBarSearchContentNode? private var isEmpty: Bool? @@ -37,20 +29,24 @@ final class ThemeGridController: ViewController { private var validLayout: ContainerViewLayout? - init(account: Account, mode: ThemeGridControllerMode) { + init(account: Account) { self.account = account - self.mode = mode self.presentationData = account.telegramApplicationContext.currentPresentationData.with { $0 } self.presentationDataPromise.set(.single(self.presentationData)) super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData)) self.title = self.presentationData.strings.Wallpaper_Title - + self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil) self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBar.style.style self.scrollToTop = { [weak self] in - self?.controllerNode.scrollToTop() + if let strongSelf = self { + if let searchContentNode = strongSelf.searchContentNode { + searchContentNode.updateExpansionProgress(1.0, animated: true) + } + strongSelf.controllerNode.scrollToTop() + } } self.presentationDataDisposable = (account.telegramApplicationContext.presentationData @@ -69,7 +65,7 @@ final class ThemeGridController: ViewController { }) self.searchContentNode = NavigationBarSearchContentNode(theme: self.presentationData.theme, placeholder: self.presentationData.strings.Wallpaper_Search, activate: { [weak self] in - //self?.activateSearch() + self?.activateSearch() }) self.navigationBar?.setContentNode(self.searchContentNode, animated: false) } @@ -80,11 +76,11 @@ final class ThemeGridController: ViewController { deinit { self.presentationDataDisposable?.dispose() - self.stateDisposable.dispose() } private func updateThemeAndStrings() { self.title = self.presentationData.strings.Wallpaper_Title + self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil) if let isEmpty = self.isEmpty, isEmpty { } else { @@ -105,25 +101,38 @@ final class ThemeGridController: ViewController { } override func loadDisplayNode() { - self.displayNode = ThemeGridControllerNode(account: self.account, presentationData: self.presentationData, mode: self.mode, present: { [weak self] controller, arguments in - self?.present(controller, in: .window(.root), with: arguments, blockInteraction: true) - }, selectCustomWallpaper: { [weak self] in + self.displayNode = ThemeGridControllerNode(account: self.account, presentationData: self.presentationData, presentPreviewController: { [weak self] source in + if let strongSelf = self { + let controller = WallpaperListPreviewController(account: strongSelf.account, source: source) + controller.apply = { [weak self, weak controller] wallpaper, mode, cropRect in + if let strongSelf = self { + strongSelf.uploadCustomWallpaper(wallpaper, mode: mode, cropRect: cropRect) + if case .wallpaper = wallpaper { + } else if let controller = controller { + controller.dismiss() + } + } + } + self?.present(controller, in: .window(.root), with: nil, blockInteraction: true) + } + }, presentGallery: { [weak self] in if let strongSelf = self { let _ = legacyWallpaperPicker(applicationContext: strongSelf.account.telegramApplicationContext, presentationData: strongSelf.presentationData).start(next: { generator in if let strongSelf = self { let legacyController = LegacyController(presentation: .modal(animateIn: true), theme: strongSelf.presentationData.theme, initialLayout: strongSelf.validLayout) legacyController.statusBar.statusBarStyle = strongSelf.presentationData.theme.rootController.statusBar.style.style + let controller = generator(legacyController.context) legacyController.bind(controller: controller) legacyController.deferScreenEdgeGestures = [.top] - controller.selectionBlock = { [weak self] asset, thumbnailImage in if let strongSelf = self, let asset = asset { let controller = WallpaperListPreviewController(account: strongSelf.account, source: .asset(asset.backingAsset, thumbnailImage)) - controller.apply = { [weak self, weak legacyController, weak controller] wallpaper, mode in + controller.apply = { [weak self, weak legacyController, weak controller] wallpaper, mode, cropRect in if let strongSelf = self, let legacyController = legacyController, let controller = controller { - strongSelf.applyCustomWallpaper(wallpaper, mode: mode) + strongSelf.uploadCustomWallpaper(wallpaper, mode: mode, cropRect: cropRect) + let _ = (strongSelf.navigationController as? NavigationController)?.popViewController(animated: true) legacyController.dismiss() controller.dismiss() } @@ -140,6 +149,11 @@ final class ThemeGridController: ViewController { } }) } + }, presentColors: { [weak self] in + if let strongSelf = self { + let controller = ThemeColorsGridController(account: strongSelf.account) + (strongSelf.navigationController as? NavigationController)?.pushViewController(controller) + } }, emptyStateUpdated: { [weak self] empty in if let strongSelf = self { if empty != strongSelf.isEmpty { @@ -169,23 +183,19 @@ final class ThemeGridController: ViewController { if let strongSelf = self { strongSelf.shareWallpapers(wallpapers) } + }, popViewController: { [weak self] in + if let strongSelf = self { + let _ = (strongSelf.navigationController as? NavigationController)?.popViewController(animated: true) + } }) self.controllerNode.navigationBar = self.navigationBar self.controllerNode.requestDeactivateSearch = { [weak self] in self?.deactivateSearch(animated: true) } - self.stateDisposable.set(combineLatest(queue: .mainQueue(), self.presentationDataPromise.get(), self.controllerNode.state).start(next: { [weak self] presentationData, state in - var toolbar: Toolbar? - if state.editing { - let leftAction = ToolbarAction(title: presentationData.strings.Common_Delete, isEnabled: !state.selectedIndices.isEmpty) - toolbar = Toolbar(leftAction: leftAction, rightAction: nil) - } - self?.setToolbar(toolbar, transition: .animated(duration: 0.3, curve: .easeInOut)) - })) - - self._ready.set(self.controllerNode.ready.get()) -// + self.controllerNode.gridNode.scrollingCompleted = { + + } // self.controllerNode.gridNode.scroll = { [weak self] offset in // if let strongSelf = self, let searchContentNode = strongSelf.searchContentNode { // searchContentNode.updateListVisibleContentOffset(offset) @@ -200,46 +210,108 @@ final class ThemeGridController: ViewController { // } // } + self._ready.set(self.controllerNode.ready.get()) + self.displayNodeDidLoad() } - private func applyCustomWallpaper(_ wallpaper: WallpaperEntry, mode: PresentationWallpaperMode) { - guard case let .asset(asset, _) = wallpaper else { - return + private func uploadCustomWallpaper(_ wallpaper: WallpaperEntry, mode: PresentationWallpaperMode, cropRect: CGRect?) { + let imageSignal: Signal + switch wallpaper { + case .wallpaper: + imageSignal = .complete() + case let .asset(asset, _): + imageSignal = fetchPhotoLibraryImage(localIdentifier: asset.localIdentifier) + |> filter { value in + return !(value?.1 ?? true) + } + |> mapToSignal { result -> Signal in + if let result = result { + return .single(result.0) + } else { + return .complete() + } + } + case let .contextResult(result): + var imageResource: TelegramMediaResource? + switch result { + case let .externalReference(_, _, _, _, _, _, content, _, _): + if let content = content { + imageResource = content.resource + } + case let .internalReference(_, _, _, _, _, image, _, _): + if let image = image { + if let imageRepresentation = imageRepresentationLargerThan(image.representations, size: CGSize(width: 1000.0, height: 800.0)) { + imageResource = imageRepresentation.resource + } + } + } + + if let imageResource = imageResource { + imageSignal = .single(self.account.postbox.mediaBox.completedResourcePath(imageResource)) + |> mapToSignal { path -> Signal in + if let path = path, let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: [.mappedIfSafe]), let image = UIImage(data: data) { + return .single(image) + } else { + return .complete() + } + } + } else { + imageSignal = .complete() + } } - let _ = (fetchPhotoLibraryImage(localIdentifier: asset.localIdentifier) - |> filter { value in - return !(value?.1 ?? true) - } - |> map { result -> UIImage in - let image = result?.0 - + let _ = (imageSignal + |> map { image -> UIImage in var croppedImage = UIImage() - if let image = image { + + let finalCropRect: CGRect + if let cropRect = cropRect { + finalCropRect = cropRect.insetBy(dx: -16.0, dy: 0.0) + } else { var screenSize = TGScreenSize() screenSize.width += 32.0 let fittedSize = TGScaleToFit(screenSize, image.size) - croppedImage = TGPhotoEditorCrop(image, nil, .up, 0.0, CGRect(x: (image.size.width - fittedSize.width) / 2.0, y: (image.size.height - fittedSize.height) / 2.0, width: fittedSize.width, height: fittedSize.height), false, CGSize(width: 2048.0, height: 2048.0), image.size, false) + finalCropRect = CGRect(x: (image.size.width - fittedSize.width) / 2.0, y: (image.size.height - fittedSize.height) / 2.0, width: fittedSize.width, height: fittedSize.height) + } + + croppedImage = TGPhotoEditorCrop(image, nil, .up, 0.0, finalCropRect, false, CGSize(width: 2048.0, height: 2048.0), image.size, false) + + if let data = UIImageJPEGRepresentation(croppedImage, 0.85) { + let resource = LocalFileMediaResource(fileId: arc4random64()) + self.account.postbox.mediaBox.storeResourceData(resource.id, data: data) - if let data = UIImageJPEGRepresentation(croppedImage, 0.85) { - let resource = LocalFileMediaResource(fileId: arc4random64()) - self.account.postbox.mediaBox.storeResourceData(resource.id, data: data) - - let wallpaper: TelegramWallpaper = .image([TelegramMediaImageRepresentation(dimensions: image.size, resource: resource)]) - let _ = (updatePresentationThemeSettingsInteractively(postbox: self.account.postbox, { current in + let account = self.account + let updateWallpaper: (TelegramWallpaper) -> Void = { wallpaper in + let _ = (updatePresentationThemeSettingsInteractively(postbox: account.postbox, { current in return PresentationThemeSettings(chatWallpaper: wallpaper, chatWallpaperMode: mode, theme: current.theme, themeAccentColor: current.themeAccentColor, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, disableAnimations: current.disableAnimations) - }) |> deliverOnMainQueue).start() - - let account = self.account + })).start() + } + + let completion: () -> Void = { + let wallpaper: TelegramWallpaper = .image([TelegramMediaImageRepresentation(dimensions: image.size, resource: resource)]) + updateWallpaper(wallpaper) + let _ = uploadWallpaper(account: account, resource: resource).start(next: { status in if case let .complete(wallpaper) = status { - let _ = (updatePresentationThemeSettingsInteractively(postbox: account.postbox, { current in - return PresentationThemeSettings(chatWallpaper: wallpaper, chatWallpaperMode: mode, theme: current.theme, themeAccentColor: current.themeAccentColor, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, disableAnimations: current.disableAnimations) - })).start() + if case .blurred = mode, case let .file(_, _, _, _, file, _) = wallpaper { + let _ = account.postbox.mediaBox.cachedResourceRepresentation(file.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true).start(completed: { + updateWallpaper(wallpaper) + }) + } else { + updateWallpaper(wallpaper) + } } }) } + + if case .blurred = mode { + let _ = account.postbox.mediaBox.cachedResourceRepresentation(resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true).start(completed: { + completion() + }) + } else { + completion() + } } return croppedImage @@ -249,11 +321,20 @@ final class ThemeGridController: ViewController { private func shareWallpapers(_ wallpapers: [TelegramWallpaper]) { var string: String = "" for wallpaper in wallpapers { - if case let .file(_, _, _, slug, _, _) = wallpaper { + var item: String? + switch wallpaper { + case let .file(_, _, _, slug, _, _): + item = slug + case let .color(color): + item = "\(String(UInt32(bitPattern: color), radix: 16, uppercase: false))" + default: + break + } + if let item = item { if !string.isEmpty { string.append("\n") } - string.append("https://t.me/bg/\(slug)") + string.append("https://t.me/bg/\(item)") } } let subject: ShareControllerSubject diff --git a/TelegramUI/ThemeGridControllerItem.swift b/TelegramUI/ThemeGridControllerItem.swift index faae5f19a7..e43219a64a 100644 --- a/TelegramUI/ThemeGridControllerItem.swift +++ b/TelegramUI/ThemeGridControllerItem.swift @@ -37,9 +37,6 @@ final class ThemeGridControllerItem: GridItem { } } -private let avatarFont = Font.medium(18.0) -private let textFont = Font.regular(11.0) - final class ThemeGridControllerItemNode: GridItemNode { private let wallpaperNode: SettingsThemeWallpaperNode private var selectionNode: GridMessageSelectionNode? @@ -128,7 +125,6 @@ final class ThemeGridControllerItemNode: GridItemNode { } } - override func layout() { super.layout() diff --git a/TelegramUI/ThemeGridControllerNode.swift b/TelegramUI/ThemeGridControllerNode.swift index 0b21711c48..3f5dfc89fa 100644 --- a/TelegramUI/ThemeGridControllerNode.swift +++ b/TelegramUI/ThemeGridControllerNode.swift @@ -121,21 +121,25 @@ final class ThemeGridControllerNode: ASDisplayNode { private var presentationData: PresentationData private var controllerInteraction: ThemeGridControllerInteraction? - private let present: (ViewController, Any?) -> Void - private let selectCustomWallpaper: () -> Void + private let presentPreviewController: (WallpaperListPreviewSource) -> Void + private let presentGallery: () -> Void + private let presentColors: () -> Void private let emptyStateUpdated: (Bool) -> Void var requestDeactivateSearch: (() -> Void)? let ready = ValuePromise() - private var customWallpaperBackground: ASDisplayNode - private var customWallpaperSeparator: ASDisplayNode - - private let customWallpaperButton: HighlightableButtonNode - private var customWallpaperButtonBackground: ASDisplayNode - private var customWallpaperButtonTopSeparator: ASDisplayNode - private var customWallpaperButtonBottomSeparator: ASDisplayNode - private var customWallpaperLabel: ASTextNode + private var backgroundNode: ASDisplayNode + private var separatorNode: ASDisplayNode + + private let colorItemNode: ItemListActionItemNode + private var colorItem: ItemListActionItem + + private let galleryItemNode: ItemListActionItemNode + private var galleryItem: ItemListActionItem + + private let descriptionItemNode: ItemListTextItemNode + private var descriptionItem: ItemListTextItem private var selectionPanel: ThemeGridSelectionPanelNode? private var selectionPanelSeparatorNode: ASDisplayNode? @@ -157,35 +161,33 @@ final class ThemeGridControllerNode: ASDisplayNode { private var disposable: Disposable? - init(account: Account, presentationData: PresentationData, mode: ThemeGridControllerMode, present: @escaping (ViewController, Any?) -> Void, selectCustomWallpaper: @escaping () -> Void, emptyStateUpdated: @escaping (Bool) -> Void, deleteWallpapers: @escaping ([TelegramWallpaper]) -> Void, shareWallpapers: @escaping ([TelegramWallpaper]) -> Void) { + init(account: Account, presentationData: PresentationData, presentPreviewController: @escaping (WallpaperListPreviewSource) -> Void, presentGallery: @escaping () -> Void, presentColors: @escaping () -> Void, emptyStateUpdated: @escaping (Bool) -> Void, deleteWallpapers: @escaping ([TelegramWallpaper]) -> Void, shareWallpapers: @escaping ([TelegramWallpaper]) -> Void, popViewController: @escaping () -> Void) { self.account = account self.presentationData = presentationData - self.present = present - self.selectCustomWallpaper = selectCustomWallpaper + self.presentPreviewController = presentPreviewController + self.presentGallery = presentGallery + self.presentColors = presentColors self.emptyStateUpdated = emptyStateUpdated self.gridNode = GridNode() self.gridNode.showVerticalScrollIndicator = true - self.customWallpaperButton = HighlightableButtonNode() - self.customWallpaperButton.contentHorizontalAlignment = .left + self.backgroundNode = ASDisplayNode() + self.backgroundNode.backgroundColor = presentationData.theme.list.blocksBackgroundColor - self.customWallpaperButtonBackground = ASDisplayNode() - self.customWallpaperButtonBackground.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor + self.separatorNode = ASDisplayNode() + self.separatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor - self.customWallpaperBackground = ASDisplayNode() - self.customWallpaperBackground.backgroundColor = presentationData.theme.list.blocksBackgroundColor - - self.customWallpaperSeparator = ASDisplayNode() - self.customWallpaperSeparator.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor - - self.customWallpaperButtonTopSeparator = ASDisplayNode() - self.customWallpaperButtonTopSeparator.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor - - self.customWallpaperButtonBottomSeparator = ASDisplayNode() - self.customWallpaperButtonBottomSeparator.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor - - self.customWallpaperLabel = ASTextNode() + self.colorItemNode = ItemListActionItemNode() + self.colorItem = ItemListActionItem(theme: presentationData.theme, title: presentationData.strings.Wallpaper_SetColor, kind: .generic, alignment: .natural, sectionId: 0, style: .blocks, action: { + presentColors() + }) + self.galleryItemNode = ItemListActionItemNode() + self.galleryItem = ItemListActionItem(theme: presentationData.theme, title: presentationData.strings.Wallpaper_SetCustomBackground, kind: .generic, alignment: .natural, sectionId: 0, style: .blocks, action: { + presentGallery() + }) + self.descriptionItemNode = ItemListTextItemNode() + self.descriptionItem = ItemListTextItem(theme: presentationData.theme, text: .plain(presentationData.strings.Wallpaper_SetCustomBackgroundInfo), sectionId: 0) self.currentState = ThemeGridControllerNodeState(editing: false, selectedIndices: Set()) self.statePromise = ValuePromise(self.currentState, ignoreRepeated: true) @@ -198,38 +200,19 @@ final class ThemeGridControllerNode: ASDisplayNode { self.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor - self.customWallpaperButton.setAttributedTitle(NSAttributedString(string: self.presentationData.strings.Wallpaper_SetCustomBackground, font: Font.regular(17.0), textColor: presentationData.theme.list.itemAccentColor), for: []) - self.customWallpaperButton.backgroundColor = self.presentationData.theme.list.itemBlocksBackgroundColor - self.customWallpaperButton.highligthedChanged = { [weak self] highlighted in - if let strongSelf = self { - if highlighted { - strongSelf.customWallpaperButton.backgroundColor = strongSelf.presentationData.theme.list.itemHighlightedBackgroundColor - } else { - UIView.animate(withDuration: 0.3, animations: { - strongSelf.customWallpaperButton.backgroundColor = nil - }) - } - } - } - - self.customWallpaperLabel.attributedText = NSAttributedString(string: self.presentationData.strings.Wallpaper_SetCustomBackgroundInfo, font: Font.regular(14.0), textColor: self.presentationData.theme.list.freeTextColor) - - self.gridNode.addSubnode(self.customWallpaperBackground) - self.gridNode.addSubnode(self.customWallpaperSeparator) - self.gridNode.addSubnode(self.customWallpaperButtonTopSeparator) - self.gridNode.addSubnode(self.customWallpaperButtonBottomSeparator) - self.gridNode.addSubnode(self.customWallpaperButtonBackground) - self.gridNode.addSubnode(self.customWallpaperButton) - self.gridNode.addSubnode(self.customWallpaperLabel) + self.gridNode.addSubnode(self.backgroundNode) + self.gridNode.addSubnode(self.separatorNode) + self.gridNode.addSubnode(self.colorItemNode) + self.gridNode.addSubnode(self.galleryItemNode) + self.gridNode.addSubnode(self.descriptionItemNode) self.addSubnode(self.gridNode) - let wallpapersPromise: Promise<[TelegramWallpaper]> = Promise() wallpapersPromise.set(telegramWallpapers(postbox: account.postbox, network: account.network)) let previousEntries = Atomic<[ThemeGridControllerEntry]?>(value: nil) let interaction = ThemeGridControllerInteraction(openWallpaper: { [weak self] wallpaper in - if let strongSelf = self { + if let strongSelf = self, !strongSelf.currentState.editing { let entries = previousEntries.with { $0 } if let entries = entries, !entries.isEmpty { let wallpapers = entries.map { $0.wallpaper } @@ -239,8 +222,7 @@ final class ThemeGridControllerNode: ASDisplayNode { mode = strongSelf.presentationData.chatWallpaperMode } - let controller = WallpaperListPreviewController(account: account, source: .list(wallpapers: wallpapers, central: wallpaper, mode: mode)) - strongSelf.present(controller, nil) + presentPreviewController(.list(wallpapers: wallpapers, central: wallpaper, mode: mode)) } } }, toggleWallpaperSelection: { [weak self] index, value in @@ -282,34 +264,6 @@ final class ThemeGridControllerNode: ASDisplayNode { var index = 1 var hasCurrent = false - switch presentationData.theme.name { - case let .builtin(name): - switch name { - case .dayClassic: - break - case .day: - let wallpaper = TelegramWallpaper.color(0xffffff) - let selected = presentationData.chatWallpaper == wallpaper - entries.append(ThemeGridControllerEntry(index: index, wallpaper: wallpaper, selected: selected)) - hasCurrent = hasCurrent || selected - index += 1 - case .nightGrayscale: - let wallpaper = TelegramWallpaper.color(0x000000) - let selected = presentationData.chatWallpaper == wallpaper - entries.append(ThemeGridControllerEntry(index: index, wallpaper: wallpaper, selected: selected)) - hasCurrent = hasCurrent || selected - index += 1 - case .nightAccent: - let wallpaper = TelegramWallpaper.color(0x18222d) - let selected = presentationData.chatWallpaper == wallpaper - entries.append(ThemeGridControllerEntry(index: index, wallpaper: wallpaper, selected: selected)) - hasCurrent = hasCurrent || selected - index += 1 - } - default: - break - } - for wallpaper in wallpapers { let selected = presentationData.chatWallpaper == wallpaper entries.append(ThemeGridControllerEntry(index: index, wallpaper: wallpaper, selected: selected)) @@ -329,19 +283,79 @@ final class ThemeGridControllerNode: ASDisplayNode { strongSelf.enqueueTransition(transition) } }) - - self.customWallpaperButton.addTarget(self, action: #selector(self.customWallpaperPressed), forControlEvents: .touchUpInside) } deinit { self.disposable?.dispose() } + override func didLoad() { + super.didLoad() + + let tapRecognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapAction(_:))) + tapRecognizer.delaysTouchesBegan = false + tapRecognizer.tapActionAtPoint = { _ in + return .waitForSingleTap + } + tapRecognizer.highlight = { [weak self] point in + if let strongSelf = self { + var highlightedNode: ListViewItemNode? + if let point = point { + if strongSelf.colorItemNode.frame.contains(point) { + highlightedNode = strongSelf.colorItemNode + } else if strongSelf.galleryItemNode.frame.contains(point) { + highlightedNode = strongSelf.galleryItemNode + } + } + + if let highlightedNode = highlightedNode { + highlightedNode.setHighlighted(true, at: CGPoint(), animated: false) + } else { + strongSelf.colorItemNode.setHighlighted(false, at: CGPoint(), animated: true) + strongSelf.galleryItemNode.setHighlighted(false, at: CGPoint(), animated: true) + } + } + } + self.gridNode.view.addGestureRecognizer(tapRecognizer) + } + + @objc private func tapAction(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { + switch recognizer.state { + case .ended: + if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { + switch gesture { + case .tap: + if self.colorItemNode.frame.contains(location) { + self.colorItem.action() + } else if self.galleryItemNode.frame.contains(location) { + self.galleryItem.action() + } + default: + break + } + } + default: + break + } + } + func updatePresentationData(_ presentationData: PresentationData) { self.presentationData = presentationData self.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor - self.searchDisplayController?.updateThemeAndStrings(theme: presentationData.theme, strings: presentationData.strings) + self.searchDisplayController?.updatePresentationData(self.presentationData) + + self.colorItem = ItemListActionItem(theme: presentationData.theme, title: presentationData.strings.Wallpaper_SetColor, kind: .generic, alignment: .natural, sectionId: 0, style: .blocks, action: { [weak self] in + self?.presentColors() + }) + self.galleryItem = ItemListActionItem(theme: presentationData.theme, title: presentationData.strings.Wallpaper_SetCustomBackground, kind: .generic, alignment: .natural, sectionId: 0, style: .blocks, action: { [weak self] in + self?.presentGallery() + }) + self.descriptionItem = ItemListTextItem(theme: presentationData.theme, text: .plain(presentationData.strings.Wallpaper_SetCustomBackgroundInfo), sectionId: 0) + + if let (layout, navigationBarHeight) = self.validLayout { + self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate) + } } func updateState(_ f: (ThemeGridControllerNodeState) -> ThemeGridControllerNodeState) { @@ -353,7 +367,7 @@ final class ThemeGridControllerNode: ASDisplayNode { let selectionState = (self.currentState.editing, self.currentState.selectedIndices) if let interaction = self.controllerInteraction, interaction.selectionState != selectionState { - var requestLayout = interaction.selectionState.0 != self.currentState.editing + let requestLayout = interaction.selectionState.0 != self.currentState.editing self.controllerInteraction?.selectionState = selectionState self.gridNode.forEachItemNode { itemNode in @@ -365,6 +379,7 @@ final class ThemeGridControllerNode: ASDisplayNode { if requestLayout, let (containerLayout, navigationBarHeight) = self.validLayout { self.containerLayoutUpdated(containerLayout, navigationBarHeight: navigationBarHeight, transition: .animated(duration: 0.4, curve: .spring)) } + self.selectionPanel?.selectedIndices = selectionState.1 } } @@ -389,39 +404,45 @@ final class ThemeGridControllerNode: ASDisplayNode { } func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + let hadValidLayout = self.validLayout != nil + self.validLayout = (layout, navigationBarHeight) + var insets = layout.insets(options: [.input]) insets.top += navigationBarHeight let scrollIndicatorInsets = insets - let referenceImageSize = CGSize(width: 108.0, height: 230.0) - let minSpacing: CGFloat = 8.0 - + let referenceImageSize = CGSize(width: 108.0, height: 230.0) let imageCount = Int((layout.size.width - minSpacing * 2.0) / (referenceImageSize.width + minSpacing)) - let imageSize = referenceImageSize.aspectFilled(CGSize(width: floor((layout.size.width - CGFloat(imageCount + 1) * minSpacing) / CGFloat(imageCount)), height: referenceImageSize.height)) - let spacing = floor((layout.size.width - CGFloat(imageCount) * imageSize.width) / CGFloat(imageCount + 1)) - let textInset: CGFloat = 15.0 - let textSize = self.customWallpaperLabel.measure(CGSize(width: layout.size.width - layout.safeInsets.left - layout.safeInsets.right - textInset * 2.0, height: CGFloat.greatestFiniteMagnitude)) + let makeColorLayout = self.colorItemNode.asyncLayout() + let makeGalleryLayout = self.galleryItemNode.asyncLayout() + let makeDescriptionLayout = self.descriptionItemNode.asyncLayout() + + let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: insets.left, rightInset: insets.right) + let (colorLayout, colorApply) = makeColorLayout(self.colorItem, params, ItemListNeighbors(top: .none, bottom: .sameSection(alwaysPlain: false))) + let (galleryLayout, galleryApply) = makeGalleryLayout(self.galleryItem, params, ItemListNeighbors(top: .sameSection(alwaysPlain: false), bottom: .sameSection(alwaysPlain: true))) + let (descriptionLayout, descriptionApply) = makeDescriptionLayout(self.descriptionItem, params, ItemListNeighbors(top: .none, bottom: .none)) + + colorApply() + galleryApply() + descriptionApply() let buttonTopInset: CGFloat = 32.0 let buttonHeight: CGFloat = 44.0 - let buttonBottomInset: CGFloat = textSize.height + 6.0 + 25.0 + let buttonBottomInset: CGFloat = descriptionLayout.contentSize.height + 17.0 - let buttonInset: CGFloat = buttonTopInset + buttonHeight + buttonBottomInset + let buttonInset: CGFloat = buttonTopInset + buttonHeight * 2.0 + buttonBottomInset let buttonOffset = buttonInset + 10.0 - self.customWallpaperButton.contentEdgeInsets = UIEdgeInsets(top: 0.0, left: 17.0 + layout.safeInsets.left, bottom: 0.0, right: 0.0) + transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset - 500.0), size: CGSize(width: layout.size.width, height: buttonInset + 500.0))) + transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonInset - UIScreenPixel), size: CGSize(width: layout.size.width, height: UIScreenPixel))) - transition.updateFrame(node: self.customWallpaperBackground, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset - 500.0), size: CGSize(width: layout.size.width, height: buttonTopInset + buttonHeight + buttonBottomInset + 500.0))) - transition.updateFrame(node: self.customWallpaperSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset + buttonHeight + buttonBottomInset - UIScreenPixel), size: CGSize(width: layout.size.width, height: UIScreenPixel))) - transition.updateFrame(node: self.customWallpaperButtonTopSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset - UIScreenPixel), size: CGSize(width: layout.size.width, height: UIScreenPixel))) - transition.updateFrame(node: self.customWallpaperButtonBottomSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset + buttonHeight), size: CGSize(width: layout.size.width, height: UIScreenPixel))) - transition.updateFrame(node: self.customWallpaperButtonBackground, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset), size: CGSize(width: layout.size.width, height: buttonHeight))) - transition.updateFrame(node: self.customWallpaperButton, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset), size: CGSize(width: layout.size.width, height: buttonHeight))) - transition.updateFrame(node: self.customWallpaperLabel, frame: CGRect(origin: CGPoint(x: textInset + layout.safeInsets.left, y: -buttonOffset + buttonTopInset + buttonHeight + 6.0), size: textSize)) + transition.updateFrame(node: self.colorItemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset), size: colorLayout.contentSize)) + transition.updateFrame(node: self.galleryItemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset + colorLayout.contentSize.height), size: galleryLayout.contentSize)) + transition.updateFrame(node: self.descriptionItemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -buttonOffset + buttonTopInset + colorLayout.contentSize.height + galleryLayout.contentSize.height), size: descriptionLayout.contentSize)) insets.top += spacing + buttonInset @@ -481,14 +502,11 @@ final class ThemeGridControllerNode: ASDisplayNode { } } - + self.gridNode.frame = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height) self.gridNode.transaction(GridNodeTransaction(deleteItems: [], insertItems: [], updateItems: [], scrollToItem: nil, updateLayout: GridNodeUpdateLayout(layout: GridNodeLayout(size: layout.size, insets: insets, scrollIndicatorInsets: scrollIndicatorInsets, preloadSize: 300.0, type: .fixed(itemSize: imageSize, fillWidth: nil, lineSpacing: spacing, itemSpacing: nil)), transition: transition), itemTransition: .immediate, stationaryItems: .none, updateFirstIndexInSectionOffset: nil), completion: { _ in }) - self.gridNode.frame = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height) - - let dequeue = self.validLayout == nil - self.validLayout = (layout, navigationBarHeight) - if dequeue { + + if !hadValidLayout { self.dequeueTransitions() } @@ -497,23 +515,15 @@ final class ThemeGridControllerNode: ASDisplayNode { } } - @objc func customWallpaperPressed() { - self.selectCustomWallpaper() - } - func activateSearch(placeholderNode: SearchBarPlaceholderNode) { guard let (containerLayout, navigationBarHeight) = self.validLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else { return } - self.searchDisplayController = SearchDisplayController(theme: self.presentationData.theme, strings: self.presentationData.strings, contentNode: ChatListSearchContainerNode(account: self.account, filter: [], groupId: nil, openPeer: { [weak self] peer, dismissSearch in - - }, openRecentPeerOptions: { [weak self] peer in - - }, openMessage: { [weak self] peer, messageId in - - }, addContact: { [weak self] phoneNumber in - + self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ThemeGridSearchContainerNode(account: account, openResult: { [weak self] result, results in + if let strongSelf = self { + strongSelf.presentPreviewController(.contextResults(results: results, central: result)) + } }), cancel: { [weak self] in self?.requestDeactivateSearch?() }) diff --git a/TelegramUI/ThemeGridSearchColorsItem.swift b/TelegramUI/ThemeGridSearchColorsItem.swift new file mode 100644 index 0000000000..be68e19493 --- /dev/null +++ b/TelegramUI/ThemeGridSearchColorsItem.swift @@ -0,0 +1,271 @@ +import Foundation +import UIKit +import AsyncDisplayKit +import Postbox +import Display +import SwiftSignalKit +import TelegramCore + +private func nodeColor(for color: WallpaperSearchColor) -> UIColor { + switch color { + case .blue: + return UIColor(rgb: 0x0076ff) + case .red: + return UIColor(rgb: 0xff0000) + case .orange: + return UIColor(rgb: 0xff8a00) + case .yellow: + return UIColor(rgb: 0xffca00) + case .green: + return UIColor(rgb: 0x00e432) + case .teal: + return UIColor(rgb: 0x1fa9ab) + case .purple: + return UIColor(rgb: 0x7300aa) + case .pink: + return UIColor(rgb: 0xf9bec5) + case .brown: + return UIColor(rgb: 0x734021) + case .black: + return UIColor(rgb: 0x000000) + case .gray: + return UIColor(rgb: 0x5c585f) + case .white: + return UIColor(rgb: 0xffffff) + } +} + +private class ThemeGridColorNode: HighlightableButtonNode { + let action: () -> Void + + init(color: WallpaperSearchColor, action: @escaping (WallpaperSearchColor) -> Void) { + self.action = { + action(color) + } + + super.init() + self.setImage(generateFilledCircleImage(diameter: 42.0, color: nodeColor(for: color)), for: .normal) + } + + override func didLoad() { + super.didLoad() + + self.addTarget(self, action: #selector(self.pressed), forControlEvents: .touchUpInside) + } + + @objc func pressed() { + self.action() + } +} + +private let inset: CGFloat = 15.0 +private let diameter: CGFloat = 42.0 + +final class ThemeGridSearchColorsNode: ASDisplayNode { + private var theme: PresentationTheme + private var strings: PresentationStrings + private let themeAndStringsPromise: Promise<(PresentationTheme, PresentationStrings)> + private let sectionHeaderNode: ListSectionHeaderNode + private let scrollNode: ASScrollNode + + private let colorSelected: (WallpaperSearchColor) -> Void + + init(account: Account, theme: PresentationTheme, strings: PresentationStrings, colorSelected: @escaping (WallpaperSearchColor) -> Void) { + self.theme = theme + self.strings = strings + self.themeAndStringsPromise = Promise((self.theme, self.strings)) + + self.colorSelected = colorSelected + + self.sectionHeaderNode = ListSectionHeaderNode(theme: theme) + self.sectionHeaderNode.title = strings.WallpaperSearch_ColorTitle.uppercased() + + self.scrollNode = ASScrollNode() + self.scrollNode.view.showsHorizontalScrollIndicator = false + self.scrollNode.view.showsVerticalScrollIndicator = false + self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true + + super.init() + + self.addSubnode(self.sectionHeaderNode) + self.addSubnode(self.scrollNode) + + for color in WallpaperSearchColor.allCases { + let colorNode = ThemeGridColorNode(color: color, action: colorSelected) + self.scrollNode.addSubnode(colorNode) + } + self.scrollNode.view.contentSize = CGSize(width: (inset + diameter) * CGFloat(WallpaperSearchColor.allCases.count) + inset, height: 71.0) + } + + func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) { + if self.theme !== theme || self.strings !== strings { + self.theme = theme + self.strings = strings + self.themeAndStringsPromise.set(.single((self.theme, self.strings))) + + self.sectionHeaderNode.title = strings.WallpaperSearch_ColorTitle.uppercased() + self.sectionHeaderNode.updateTheme(theme: theme) + } + } + + override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize { + return CGSize(width: constrainedSize.width, height: 100.0) + } + + func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat) { + self.sectionHeaderNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: 29.0)) + self.sectionHeaderNode.updateLayout(size: CGSize(width: size.width, height: 29.0), leftInset: leftInset, rightInset: rightInset) + + var insets = UIEdgeInsets() + insets.top += leftInset + insets.bottom += rightInset + + self.scrollNode.frame = CGRect(x: 0.0, y: 29.0, width: size.width, height: size.height - 29.0) + + var offset: CGFloat = inset + + if let subnodes = self.scrollNode.subnodes { + for node in subnodes { + node.frame = CGRect(x: offset, y: inset, width: diameter, height: diameter) + offset += diameter + inset + } + } + } +} + + +class ThemeGridSearchColorsItem: ListViewItem { + let account: Account + let theme: PresentationTheme + let strings: PresentationStrings + let colorSelected: (WallpaperSearchColor) -> Void + + let header: ListViewItemHeader? + + init(account: Account, theme: PresentationTheme, strings: PresentationStrings, colorSelected: @escaping (WallpaperSearchColor) -> Void) { + self.account = account + self.theme = theme + self.strings = strings + self.colorSelected = colorSelected + self.header = nil + } + + func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { + async { + let node = ThemeGridSearchColorsItemNode() + let makeLayout = node.asyncLayout() + let (nodeLayout, nodeApply) = makeLayout(self, params, nextItem != nil) + node.contentSize = nodeLayout.contentSize + node.insets = nodeLayout.insets + + completion(node, nodeApply) + } + } + + func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) { + Queue.mainQueue().async { + if let nodeValue = node() as? ThemeGridSearchColorsItemNode { + let layout = nodeValue.asyncLayout() + async { + let (nodeLayout, apply) = layout(self, params, nextItem != nil) + Queue.mainQueue().async { + completion(nodeLayout, { info in + apply().1(info) + }) + } + } + } + } + } +} + +class ThemeGridSearchColorsItemNode: ListViewItemNode { + private let backgroundNode: ASDisplayNode + private let separatorNode: ASDisplayNode + private var colorsNode: ThemeGridSearchColorsNode? + + private var item: ThemeGridSearchColorsItem? + + required init() { + self.backgroundNode = ASDisplayNode() + self.backgroundNode.isLayerBacked = true + + self.separatorNode = ASDisplayNode() + self.separatorNode.isLayerBacked = true + + super.init(layerBacked: false, dynamicBounce: false) + + self.addSubnode(self.backgroundNode) + self.addSubnode(self.separatorNode) + } + + override func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) { + if let item = self.item { + let makeLayout = self.asyncLayout() + let (nodeLayout, nodeApply) = makeLayout(item, params, nextItem == nil) + self.contentSize = nodeLayout.contentSize + self.insets = nodeLayout.insets + let _ = nodeApply() + } + } + + func asyncLayout() -> (_ item: ThemeGridSearchColorsItem, _ params: ListViewItemLayoutParams, _ last: Bool) -> (ListViewItemNodeLayout, () -> (Signal?, (ListViewItemApply) -> Void)) { + let currentItem = self.item + + return { [weak self] item, params, last in + let nodeLayout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: 130.0), insets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0)) + + return (nodeLayout, { [weak self] in + var updatedTheme: PresentationTheme? + if currentItem?.theme !== item.theme { + updatedTheme = item.theme + } + + return (nil, { _ in + if let strongSelf = self { + strongSelf.item = item + + if let _ = updatedTheme { + strongSelf.separatorNode.backgroundColor = item.theme.list.itemPlainSeparatorColor + strongSelf.backgroundNode.backgroundColor = item.theme.list.plainBackgroundColor + } + + let colorsNode: ThemeGridSearchColorsNode + if let currentColorsNode = strongSelf.colorsNode { + colorsNode = currentColorsNode + colorsNode.updateThemeAndStrings(theme: item.theme, strings: item.strings) + } else { + colorsNode = ThemeGridSearchColorsNode(account: item.account, theme: item.theme, strings: item.strings, colorSelected: item.colorSelected) + strongSelf.colorsNode = colorsNode + strongSelf.addSubnode(colorsNode) + } + + colorsNode.frame = CGRect(origin: CGPoint(), size: nodeLayout.contentSize) + colorsNode.updateLayout(size: nodeLayout.contentSize, leftInset: params.leftInset, rightInset: params.rightInset) + + let separatorHeight = UIScreenPixel + strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: nodeLayout.contentSize.width, height: nodeLayout.contentSize.height)) + strongSelf.separatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: nodeLayout.contentSize.height - separatorHeight), size: CGSize(width: nodeLayout.size.width, height: separatorHeight)) + strongSelf.separatorNode.isHidden = true + } + }) + }) + } + } + + override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: duration * 0.5) + } + + override func animateRemoved(_ currentTimestamp: Double, duration: Double) { + self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false) + } + + override public func header() -> ListViewItemHeader? { + if let item = self.item { + return item.header + } else { + return nil + } + } +} diff --git a/TelegramUI/ThemeGridSearchContainerNode.swift b/TelegramUI/ThemeGridSearchContainerNode.swift new file mode 100644 index 0000000000..1f0cd2badb --- /dev/null +++ b/TelegramUI/ThemeGridSearchContainerNode.swift @@ -0,0 +1,622 @@ +import Foundation +import AsyncDisplayKit +import Display +import SwiftSignalKit +import Postbox +import TelegramCore + +enum WallpaperSearchColor: CaseIterable { + case blue + case red + case orange + case yellow + case green + case teal + case purple + case pink + case brown + case black + case gray + case white + + var string: String { + switch self { + case .blue: + return "Blue" + case .red: + return "Red" + case .orange: + return "Orange" + case .yellow: + return "Yellow" + case .green: + return "Green" + case .teal: + return "Teal" + case .purple: + return "Purple" + case .pink: + return "Pink" + case .brown: + return "Brown" + case .black: + return "Black" + case .gray: + return "Gray" + case .white: + return "White" + } + } +} + +final class ThemeGridSearchInteraction { + let openResult: (ChatContextResult) -> Void + let selectColor: (WallpaperSearchColor) -> Void + let setSearchQuery: (String) -> Void + let deleteRecentQuery: (String) -> Void + + init(openResult: @escaping (ChatContextResult) -> Void, selectColor: @escaping (WallpaperSearchColor) -> Void, setSearchQuery: @escaping (String) -> Void, deleteRecentQuery: @escaping (String) -> Void) { + self.openResult = openResult + self.selectColor = selectColor + self.setSearchQuery = setSearchQuery + self.deleteRecentQuery = deleteRecentQuery + } +} + +private enum ThemeGridRecentEntryStableId: Hashable { + case colors + case query(String) + + static func ==(lhs: ThemeGridRecentEntryStableId, rhs: ThemeGridRecentEntryStableId) -> Bool { + switch lhs { + case .colors: + if case .colors = rhs { + return true + } else { + return false + } + case let .query(query): + if case .query(query) = rhs { + return true + } else { + return false + } + } + } + + var hashValue: Int { + switch self { + case .colors: + return 0 + case let .query(query): + return query.hashValue + } + } +} + +private enum ThemeGridRecentEntry: Comparable, Identifiable { + case colors(PresentationTheme, PresentationStrings) + case query(Int, String) + + var stableId: ThemeGridRecentEntryStableId { + switch self { + case .colors: + return .colors + case let .query(_, query): + return .query(query) + } + } + + static func ==(lhs: ThemeGridRecentEntry, rhs: ThemeGridRecentEntry) -> Bool { + switch lhs { + case let .colors(lhsTheme, lhsStrings): + if case let .colors(rhsTheme, rhsStrings) = rhs { + if lhsTheme !== rhsTheme { + return false + } + if lhsStrings !== rhsStrings { + return false + } + return true + } else { + return false + } + case let .query(lhsIndex, lhsQuery): + if case .query(lhsIndex, lhsQuery) = rhs { + return true + } else { + return false + } + } + } + + static func <(lhs: ThemeGridRecentEntry, rhs: ThemeGridRecentEntry) -> Bool { + switch lhs { + case .colors: + return true + case let .query(lhsIndex, _): + switch rhs { + case .colors: + return false + case let .query(rhsIndex, _): + return lhsIndex <= rhsIndex + } + } + } + + func item(account: Account, theme: PresentationTheme, strings: PresentationStrings, interaction: ThemeGridSearchInteraction, header: ListViewItemHeader) -> ListViewItem { + switch self { + case let .colors(theme, strings): + return ThemeGridSearchColorsItem(account: account, theme: theme, strings: strings, colorSelected: { color in + interaction.selectColor(color) + }) + case let .query(_, query): + return WebSearchRecentQueryItem(account: account, theme: theme, strings: strings, query: query, tapped: { query in + interaction.setSearchQuery(query) + }, deleted: { query in + interaction.deleteRecentQuery(query) + }, header: header) + } + } +} + +private struct ThemeGridSearchContainerRecentTransition { + let deletions: [ListViewDeleteItem] + let insertions: [ListViewInsertItem] + let updates: [ListViewUpdateItem] +} + +private struct ThemeGridSearchEntry: Comparable, Identifiable { + let index: Int + let result: ChatContextResult + + static func ==(lhs: ThemeGridSearchEntry, rhs: ThemeGridSearchEntry) -> Bool { + return lhs.index == rhs.index && lhs.result == rhs.result + } + + static func <(lhs: ThemeGridSearchEntry, rhs: ThemeGridSearchEntry) -> Bool { + return lhs.index < rhs.index + } + + var stableId: Int { + return self.index + } + + func item(account: Account, theme: PresentationTheme, interaction: ThemeGridSearchInteraction) -> ThemeGridSearchItem { + return ThemeGridSearchItem(account: account, theme: theme, result: self.result, interaction: interaction) + } +} + +struct ThemeGridSearchContainerTransition { + let deletions: [Int] + let insertions: [GridNodeInsertItem] + let updates: [GridNodeUpdateItem] + let displayingResults: Bool +} + +private func themeGridSearchContainerPreparedRecentTransition(from fromEntries: [ThemeGridRecentEntry], to toEntries: [ThemeGridRecentEntry], account: Account, theme: PresentationTheme, strings: PresentationStrings, interaction: ThemeGridSearchInteraction, header: ListViewItemHeader) -> ThemeGridSearchContainerRecentTransition { + let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) + + let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, theme: theme, strings: strings, interaction: interaction, header: header), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, theme: theme, strings: strings, interaction: interaction, header: header), directionHint: nil) } + + return ThemeGridSearchContainerRecentTransition(deletions: deletions, insertions: insertions, updates: updates) +} + +private func themeGridSearchContainerPreparedTransition(from fromEntries: [ThemeGridSearchEntry], to toEntries: [ThemeGridSearchEntry], displayingResults: Bool, account: Account, theme: PresentationTheme, interaction: ThemeGridSearchInteraction) -> ThemeGridSearchContainerTransition { + let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) + + let deletions = deleteIndices + let insertions = indicesAndItems.map { GridNodeInsertItem(index: $0.0, item: $0.1.item(account: account, theme: theme, interaction: interaction), previousIndex: $0.2) } + let updates = updateIndices.map { GridNodeUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, theme: theme, interaction: interaction)) } + + return ThemeGridSearchContainerTransition(deletions: deletions, insertions: insertions, updates: updates, displayingResults: displayingResults) +} + +private struct ThemeGridSearchContainerNodeState: Equatable { + let peerIdWithRevealedOptions: PeerId? + + init(peerIdWithRevealedOptions: PeerId? = nil) { + self.peerIdWithRevealedOptions = peerIdWithRevealedOptions + } + + static func ==(lhs: ThemeGridSearchContainerNodeState, rhs: ThemeGridSearchContainerNodeState) -> Bool { + if lhs.peerIdWithRevealedOptions != rhs.peerIdWithRevealedOptions { + return false + } + return true + } + + func withUpdatedPeerIdWithRevealedOptions(_ peerIdWithRevealedOptions: PeerId?) -> ThemeGridSearchContainerNodeState { + return ThemeGridSearchContainerNodeState(peerIdWithRevealedOptions: peerIdWithRevealedOptions) + } +} + +private struct ThemeGridSearchResult { + let query: String + let items: [ChatContextResult] + let nextOffset: String? +} + +private struct ThemeGridSearchContext { + let result: ThemeGridSearchResult + let loadMoreIndex: String? +} + +final class ThemeGridSearchContainerNode: SearchDisplayControllerContentNode { + private let account: Account + + private let recentListNode: ListView + private let gridNode: GridNode + private let dimNode: ASDisplayNode + private var enqueuedRecentTransitions: [(ThemeGridSearchContainerRecentTransition, Bool)] = [] + private var enqueuedTransitions: [(ThemeGridSearchContainerTransition, Bool)] = [] + private var validLayout: ContainerViewLayout? + + private let searchQuery = Promise() + private let searchDisposable = MetaDisposable() + private var recentDisposable: Disposable? + + private var presentationData: PresentationData + private var presentationDataDisposable: Disposable? + + private let presentationDataPromise: Promise + + private let _isSearching = ValuePromise(false, ignoreRepeated: true) + override var isSearching: Signal { + return self._isSearching.get() + } + + init(account: Account, openResult: @escaping (ChatContextResult, [ChatContextResult]) -> Void) { + self.account = account + self.dimNode = ASDisplayNode() + + self.presentationData = account.telegramApplicationContext.currentPresentationData.with { $0 } + self.presentationDataPromise = Promise(self.presentationData) + + self.recentListNode = ListView() + self.recentListNode.verticalScrollIndicatorColor = self.presentationData.theme.list.scrollIndicatorColor + self.gridNode = GridNode() + + super.init() + + self.dimNode.backgroundColor = self.presentationData.theme.chatList.backgroundColor + + self.backgroundColor = self.presentationData.theme.chatList.backgroundColor + + self.addSubnode(self.dimNode) + self.addSubnode(self.recentListNode) + self.addSubnode(self.gridNode) + + let searchContext = Promise(nil) + let searchContextValue = Atomic(value: nil) + let updateSearchContext: ((ThemeGridSearchContext?) -> (ThemeGridSearchContext?, Bool)) -> Void = { f in + var shouldUpdate = false + let updated = searchContextValue.modify { current in + let (u, s) = f(current) + shouldUpdate = s + if s { + return u + } else { + return current + } + } + if shouldUpdate { + searchContext.set(.single(updated)) + } + } + + self.gridNode.isHidden = true +// self.listNode.visibleBottomContentOffsetChanged = { offset in +// guard case let .known(value) = offset, value < 100.0 else { +// return +// } +// updateSearchContext { previous in +// guard let previous = previous else { +// return (nil, false) +// } +// if previous.loadMoreIndex != nil { +// return (previous, false) +// } +// guard let last = previous.result.messages.last else { +// return (previous, false) +// } +// return (ChatListSearchMessagesContext(result: previous.result, loadMoreIndex: MessageIndex(last)), true) +// } +// } + self.recentListNode.isHidden = false + + let previousSearchItems = Atomic<[ThemeGridSearchEntry]?>(value: nil) + + let interaction = ThemeGridSearchInteraction(openResult: { [weak self] result in + self?.dismissInput?() + + let previousEntries = previousSearchItems.with { $0 } + if let entries = previousEntries { + openResult(result, entries.map { $0.result }) + } + }, selectColor: { [weak self] color in + self?.setQuery?("#color\(color.string) ") + }, setSearchQuery: { [weak self] query in + self?.setQuery?(query) + }, deleteRecentQuery: { query in + let _ = removeRecentWallpaperSearchQuery(postbox: account.postbox, string: query).start() + }) + + let configuration = self.account.postbox.transaction { transaction -> SearchBotsConfiguration in + return currentSearchBotsConfiguration(transaction: transaction) + } + + let foundItems = self.searchQuery.get() + |> mapToSignal { query -> Signal<([ThemeGridSearchEntry], Bool)?, NoError> in + guard let query = query, !query.isEmpty else { + return .single(nil) + } + + let wallpaperQuery = "#wallpaper \(query)" + updateSearchContext { _ in + return (nil, true) + } + + return .single(([], true)) + |> then( + configuration + |> mapToSignal { configuration -> Signal in + guard let name = configuration.imageBotUsername else { + return .single(nil) + } + return resolvePeerByName(account: account, name: name) + |> mapToSignal { peerId -> Signal in + if let peerId = peerId { + return account.postbox.loadedPeerWithId(peerId) + |> map { peer -> Peer? in + return peer + } + |> take(1) + } else { + return .single(nil) + } + } + } + |> mapToSignal { peer -> Signal<([ThemeGridSearchEntry], Bool)?, NoError> in + if let user = peer as? TelegramUser, let botInfo = user.botInfo, let _ = botInfo.inlinePlaceholder { + return requestContextResults(account: account, botId: user.id, query: wallpaperQuery, peerId: account.peerId, limit: 16) + |> map { collection -> ([ThemeGridSearchEntry], Bool)? in + guard let collection = collection else { + return nil + } + var entries: [ThemeGridSearchEntry] = [] + var i = 0 + for result in collection.results { + entries.append(ThemeGridSearchEntry(index: i, result: result)) + i += 1 + } + + updateSearchContext { _ in + return (ThemeGridSearchContext(result: ThemeGridSearchResult(query: query, items: collection.results, nextOffset: collection.nextOffset), loadMoreIndex: nil), true) + } + return (entries, false) + } + } else { + return .single(nil) + } + } + ) + } + + let previousRecentItems = Atomic<[ThemeGridRecentEntry]?>(value: nil) + self.recentDisposable = (combineLatest(wallpaperSearchRecentQueries(postbox: self.account.postbox), self.presentationDataPromise.get()) + |> deliverOnMainQueue).start(next: { [weak self] queries, presentationData in + if let strongSelf = self { + var entries: [ThemeGridRecentEntry] = [] + + entries.append(.colors(presentationData.theme, presentationData.strings)) + for i in 0 ..< queries.count { + entries.append(.query(i, queries[i])) + } + + let header = ChatListSearchItemHeader(type: .recentPeers, theme: presentationData.theme, strings: presentationData.strings, actionTitle: presentationData.strings.WebSearch_RecentSectionClear.uppercased(), action: { + _ = clearRecentWallpaperSearchQueries(postbox: strongSelf.account.postbox).start() + }) + + let previousEntries = previousRecentItems.swap(entries) + let transition = themeGridSearchContainerPreparedRecentTransition(from: previousEntries ?? [], to: entries, account: account, theme: presentationData.theme, strings: presentationData.strings, interaction: interaction, header: header) + strongSelf.enqueueRecentTransition(transition, firstTime: previousEntries == nil) + } + }) + + self.searchDisposable.set((combineLatest(foundItems, self.presentationDataPromise.get()) + |> deliverOnMainQueue).start(next: { [weak self] entriesAndFlags, presentationData in + if let strongSelf = self { + strongSelf._isSearching.set(entriesAndFlags?.1 ?? false) + + let previousEntries = previousSearchItems.swap(entriesAndFlags?.0) + + let firstTime = previousEntries == nil + let transition = themeGridSearchContainerPreparedTransition(from: previousEntries ?? [], to: entriesAndFlags?.0 ?? [], displayingResults: entriesAndFlags?.0 != nil, account: account, theme: presentationData.theme, interaction: interaction) + strongSelf.enqueueTransition(transition, firstTime: firstTime) + } + })) + + self.presentationDataDisposable = (account.telegramApplicationContext.presentationData + |> deliverOnMainQueue).start(next: { [weak self] presentationData in + if let strongSelf = self { + let previousTheme = strongSelf.presentationData.theme + //let previousStrings = strongSelf.presentationData.strings + + strongSelf.presentationData = presentationData + strongSelf.presentationDataPromise.set(.single(presentationData)) + + if previousTheme !== presentationData.theme { + strongSelf.updateTheme(theme: presentationData.theme) + } + } + }) + + self.recentListNode.beganInteractiveDragging = { [weak self] in + self?.dismissInput?() + } + + self.gridNode.scrollingInitiated = { [weak self] in + self?.dismissInput?() + } + } + + override func didLoad() { + super.didLoad() + self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:)))) + } + + @objc func dimTapGesture(_ recognizer: UITapGestureRecognizer) { + if case .ended = recognizer.state { + self.cancel?() + } + } + + deinit { + self.searchDisposable.dispose() + self.recentDisposable?.dispose() + self.presentationDataDisposable?.dispose() + } + + private func updateTheme(theme: PresentationTheme) { + self.backgroundColor = theme.chatList.backgroundColor + self.dimNode.backgroundColor = theme.chatList.backgroundColor + self.recentListNode.verticalScrollIndicatorColor = theme.list.scrollIndicatorColor + //self.gridNode.verticalScrollIndicatorColor = theme.list.scrollIndicatorColor + } + +// private func updateState(_ f: (ChatListSearchContainerNodeState) -> ChatListSearchContainerNodeState) { +// let state = f(self.stateValue) +// if state != self.stateValue { +// self.stateValue = state +// self.statePromise.set(state) +// } +// } + + override func searchTextUpdated(text: String) { + if text.isEmpty { + self.searchQuery.set(.single(nil)) + } else { + self.searchQuery.set(.single(text)) + } + } + + private func enqueueRecentTransition(_ transition: ThemeGridSearchContainerRecentTransition, firstTime: Bool) { + self.enqueuedRecentTransitions.append((transition, firstTime)) + + if self.validLayout != nil { + while !self.enqueuedRecentTransitions.isEmpty { + self.dequeueRecentTransition() + } + } + } + + private func dequeueRecentTransition() { + if let (transition, firstTime) = self.enqueuedRecentTransitions.first { + self.enqueuedRecentTransitions.remove(at: 0) + + var options = ListViewDeleteAndInsertOptions() + if firstTime { + options.insert(.PreferSynchronousDrawing) + } else { + options.insert(.AnimateInsertion) + } + + self.recentListNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { _ in + }) + } + } + + private func enqueueTransition(_ transition: ThemeGridSearchContainerTransition, firstTime: Bool) { + self.enqueuedTransitions.append((transition, firstTime)) + + if self.validLayout != nil { + while !self.enqueuedTransitions.isEmpty { + self.dequeueTransition() + } + } + } + + private func dequeueTransition() { + if let (transition, _) = self.enqueuedTransitions.first { + self.enqueuedTransitions.remove(at: 0) + + let displayingResults = transition.displayingResults + self.gridNode.transaction(GridNodeTransaction(deleteItems: transition.deletions, insertItems: transition.insertions, updateItems: transition.updates, scrollToItem: nil, updateLayout: nil, itemTransition: .immediate, stationaryItems: .none, updateFirstIndexInSectionOffset: nil), completion: { [weak self] _ in + if let strongSelf = self { + strongSelf.gridNode.isHidden = !displayingResults + strongSelf.recentListNode.isHidden = displayingResults + strongSelf.dimNode.isHidden = displayingResults + strongSelf.backgroundColor = strongSelf.presentationData.theme.chatList.backgroundColor + } + }) + } + } + + override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition) + + let hadValidLayout = self.validLayout != nil + self.validLayout = layout + + let minSpacing: CGFloat = 8.0 + let referenceImageSize = CGSize(width: 108.0, height: 230.0) + let imageCount = Int((layout.size.width - minSpacing * 2.0) / (referenceImageSize.width + minSpacing)) + let imageSize = referenceImageSize.aspectFilled(CGSize(width: floor((layout.size.width - CGFloat(imageCount + 1) * minSpacing) / CGFloat(imageCount)), height: referenceImageSize.height)) + let spacing = floor((layout.size.width - CGFloat(imageCount) * imageSize.width) / CGFloat(imageCount + 1)) + + let topInset = navigationBarHeight + transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(x: 0.0, y: topInset), size: CGSize(width: layout.size.width, height: layout.size.height - topInset))) + + var duration: Double = 0.0 + var curve: UInt = 0 + switch transition { + case .immediate: + break + case let .animated(animationDuration, animationCurve): + duration = animationDuration + switch animationCurve { + case .easeInOut: + break + case .spring: + curve = 7 + } + } + + let listViewCurve: ListViewAnimationCurve + if curve == 7 { + listViewCurve = .Spring(duration: duration) + } else { + listViewCurve = .Default(duration: duration) + } + + self.recentListNode.frame = CGRect(origin: CGPoint(), size: layout.size) + self.recentListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: layout.size, insets: UIEdgeInsets(top: navigationBarHeight, left: layout.safeInsets.left, bottom: layout.insets(options: [.input]).bottom, right: layout.safeInsets.right), duration: duration, curve: listViewCurve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + + self.gridNode.frame = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height) + self.gridNode.transaction(GridNodeTransaction(deleteItems: [], insertItems: [], updateItems: [], scrollToItem: nil, updateLayout: GridNodeUpdateLayout(layout: GridNodeLayout(size: layout.size, insets: UIEdgeInsets(top: navigationBarHeight + spacing, left: layout.safeInsets.left, bottom: layout.insets(options: [.input]).bottom, right: layout.safeInsets.right), preloadSize: 300.0, type: .fixed(itemSize: imageSize, fillWidth: nil, lineSpacing: spacing, itemSpacing: nil)), transition: transition), itemTransition: .immediate, stationaryItems: .none, updateFirstIndexInSectionOffset: nil), completion: { _ in }) + + if !hadValidLayout { + while !self.enqueuedRecentTransitions.isEmpty { + self.dequeueRecentTransition() + } + while !self.enqueuedTransitions.isEmpty { + self.dequeueTransition() + } + } + } + + private func clearRecentSearch() { + let _ = (clearRecentlySearchedPeers(postbox: self.account.postbox) |> deliverOnMainQueue).start() + } + + override func scrollToTop() { + if !self.gridNode.isHidden { + self.gridNode.transaction(GridNodeTransaction(deleteItems: [], insertItems: [], updateItems: [], scrollToItem: GridNodeScrollToItem(index: 0, position: .top, transition: .animated(duration: 0.25, curve: .easeInOut), directionHint: .up, adjustForSection: true, adjustForTopInset: true), updateLayout: nil, itemTransition: .immediate, stationaryItems: .none, updateFirstIndexInSectionOffset: nil), completion: { _ in }) + } else { + self.recentListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + } + } +} diff --git a/TelegramUI/ThemeGridSearchItem.swift b/TelegramUI/ThemeGridSearchItem.swift new file mode 100644 index 0000000000..e0104e8d5e --- /dev/null +++ b/TelegramUI/ThemeGridSearchItem.swift @@ -0,0 +1,149 @@ +import Foundation +import Display +import TelegramCore +import SwiftSignalKit +import AsyncDisplayKit +import Postbox + +final class ThemeGridSearchItem: GridItem { + let account: Account + let theme: PresentationTheme + let result: ChatContextResult + let interaction: ThemeGridSearchInteraction + + let section: GridSection? = nil + + init(account: Account, theme: PresentationTheme, result: ChatContextResult, interaction: ThemeGridSearchInteraction) { + self.account = account + self.theme = theme + self.result = result + self.interaction = interaction + } + + func node(layout: GridNodeLayout, synchronousLoad: Bool) -> GridItemNode { + let node = ThemeGridSearchItemNode() + node.setup(item: self) + return node + } + + func update(node: GridItemNode) { + guard let node = node as? ThemeGridSearchItemNode else { + assertionFailure() + return + } + node.setup(item: self) + } +} + +final class ThemeGridSearchItemNode: GridItemNode { + private let imageNode: TransformImageNode + + private(set) var item: ThemeGridSearchItem? + private var currentDimensions: CGSize? + + override init() { + self.imageNode = TransformImageNode() + self.imageNode.contentAnimations = [.subsequentUpdates] + self.imageNode.displaysAsynchronously = false + + super.init() + + self.addSubnode(self.imageNode) + } + + override func didLoad() { + super.didLoad() + + self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:)))) + } + + func setup(item: ThemeGridSearchItem) { + if self.item !== item { + var updateImageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? + + var thumbnailDimensions: CGSize? + var thumbnailResource: TelegramMediaResource? + var imageResource: TelegramMediaResource? + var imageDimensions: CGSize? + switch item.result { + case let .externalReference(_, _, type, _, _, _, content, thumbnail, _): + if let content = content, type != "gif" { + imageResource = content.resource + } else if let thumbnail = thumbnail { + imageResource = thumbnail.resource + } + imageDimensions = content?.dimensions + case let .internalReference(_, _, _, _, _, image, file, _): + if let image = image { + if let largestRepresentation = largestImageRepresentation(image.representations) { + imageDimensions = largestRepresentation.dimensions + } + imageResource = imageRepresentationLargerThan(image.representations, size: CGSize(width: 200.0, height: 100.0))?.resource + if let file = file { + if let thumbnailRepresentation = smallestImageRepresentation(file.previewRepresentations) { + thumbnailDimensions = thumbnailRepresentation.dimensions + thumbnailResource = thumbnailRepresentation.resource + } + } else { + if let thumbnailRepresentation = smallestImageRepresentation(image.representations) { + thumbnailDimensions = thumbnailRepresentation.dimensions + thumbnailResource = thumbnailRepresentation.resource + } + } + } else if let file = file { + if let dimensions = file.dimensions { + imageDimensions = dimensions + } else if let largestRepresentation = largestImageRepresentation(file.previewRepresentations) { + imageDimensions = largestRepresentation.dimensions + } + imageResource = smallestImageRepresentation(file.previewRepresentations)?.resource + } + } + + var representations: [TelegramMediaImageRepresentation] = [] + if let thumbnailResource = thumbnailResource, let thumbnailDimensions = thumbnailDimensions { + representations.append(TelegramMediaImageRepresentation(dimensions: thumbnailDimensions, resource: thumbnailResource)) + } + if let imageResource = imageResource, let imageDimensions = imageDimensions { + representations.append(TelegramMediaImageRepresentation(dimensions: imageDimensions, resource: imageResource)) + } + if !representations.isEmpty { + let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: representations, immediateThumbnailData: nil, reference: nil, partialReference: nil) + updateImageSignal = mediaGridMessagePhoto(account: item.account, photoReference: .standalone(media: tmpImage)) + } else { + updateImageSignal = .complete() + } + + if let updateImageSignal = updateImageSignal { + self.imageNode.setSignal(updateImageSignal) + } + + self.currentDimensions = imageDimensions + if let _ = imageDimensions { + self.setNeedsLayout() + } + } + + self.item = item + } + + @objc func tapGesture(_ recognizer: UITapGestureRecognizer) { + if case .ended = recognizer.state { + if let item = self.item { + item.interaction.openResult(item.result) + } + } + } + + override func layout() { + super.layout() + + let bounds = self.bounds + self.imageNode.frame = bounds + + if let item = self.item, let dimensions = self.currentDimensions { + let imageSize = dimensions.aspectFilled(bounds.size) + self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: bounds.size, intrinsicInsets: UIEdgeInsets(), emptyColor: item.theme.list.mediaPlaceholderColor))() + } + } +} diff --git a/TelegramUI/ThemeGridSelectionPanelNode.swift b/TelegramUI/ThemeGridSelectionPanelNode.swift index c0b6c93525..2bc429e9f6 100644 --- a/TelegramUI/ThemeGridSelectionPanelNode.swift +++ b/TelegramUI/ThemeGridSelectionPanelNode.swift @@ -15,27 +15,10 @@ final class ThemeGridSelectionPanelNode: ASDisplayNode { var selectedIndices = Set() { didSet { -// if oldValue != self.selectedMessages { -// self.forwardButton.isEnabled = self.selectedMessages.count != 0 -// -// if self.selectedMessages.isEmpty { -// self.actions = nil -// if let (width, leftInset, rightInset, maxHeight, metrics) = self.validLayout, let interfaceState = self.presentationInterfaceState { -// let _ = self.updateLayout(width: width, leftInset: leftInset, rightInset: rightInset, maxHeight: maxHeight, transition: .immediate, interfaceState: interfaceState, metrics: metrics) -// } -// self.canDeleteMessagesDisposable.set(nil) -// } else if let account = self.account { -// self.canDeleteMessagesDisposable.set((chatAvailableMessageActions(postbox: account.postbox, accountPeerId: account.peerId, messageIds: self.selectedMessages) -// |> deliverOnMainQueue).start(next: { [weak self] actions in -// if let strongSelf = self { -// strongSelf.actions = actions -// if let (width, leftInset, rightInset, maxHeight, metrics) = strongSelf.validLayout, let interfaceState = strongSelf.presentationInterfaceState { -// let _ = strongSelf.updateLayout(width: width, leftInset: leftInset, rightInset: rightInset, maxHeight: maxHeight, transition: .immediate, interfaceState: interfaceState, metrics: metrics) -// } -// } -// })) -// } -// } + if oldValue != self.selectedIndices { + self.deleteButton.isEnabled = !self.selectedIndices.isEmpty + self.shareButton.isEnabled = !self.selectedIndices.isEmpty + } } } @@ -45,9 +28,9 @@ final class ThemeGridSelectionPanelNode: ASDisplayNode { self.theme = theme self.deleteButton = UIButton() - self.deleteButton.isEnabled = true + self.deleteButton.isEnabled = false self.shareButton = UIButton() - self.shareButton.isEnabled = true + self.shareButton.isEnabled = false self.deleteButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionThrash"), color: theme.chat.inputPanel.panelControlAccentColor), for: [.normal]) self.deleteButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionThrash"), color: theme.chat.inputPanel.panelControlDisabledColor), for: [.disabled]) @@ -94,33 +77,9 @@ final class ThemeGridSelectionPanelNode: ASDisplayNode { self.validLayout = (width, leftInset, rightInset, maxHeight, metrics) let panelHeight = defaultHeight(metrics: metrics) -// -// if let actions = self.actions { -// self.deleteButton.isEnabled = false -// self.reportButton.isEnabled = false -// self.forwardButton.isEnabled = actions.options.contains(.forward) -// self.shareButton.isEnabled = false -// -// self.deleteButton.isEnabled = !actions.options.intersection([.deleteLocally, .deleteGlobally]).isEmpty -// self.shareButton.isEnabled = !actions.options.intersection([.forward]).isEmpty -// self.reportButton.isEnabled = !actions.options.intersection([.report]).isEmpty -// -// self.deleteButton.isHidden = !self.deleteButton.isEnabled -// self.reportButton.isHidden = !self.reportButton.isEnabled -// } else { -// self.deleteButton.isEnabled = false -// self.deleteButton.isHidden = true -// self.reportButton.isEnabled = false -// self.reportButton.isHidden = true -// self.forwardButton.isEnabled = false -// self.shareButton.isEnabled = false -// } - - self.deleteButton.frame = CGRect(origin: CGPoint(x: leftInset, y: 0.0), size: CGSize(width: 53.0, height: panelHeight)) self.shareButton.frame = CGRect(origin: CGPoint(x: width - rightInset - 57.0, y: 0.0), size: CGSize(width: 57.0, height: panelHeight)) - return panelHeight } } diff --git a/TelegramUI/ThemeSettingsChatPreviewItem.swift b/TelegramUI/ThemeSettingsChatPreviewItem.swift index 54e7940696..da297d8eb0 100644 --- a/TelegramUI/ThemeSettingsChatPreviewItem.swift +++ b/TelegramUI/ThemeSettingsChatPreviewItem.swift @@ -13,10 +13,11 @@ class ThemeSettingsChatPreviewItem: ListViewItem, ItemListItem { let sectionId: ItemListSectionId let fontSize: PresentationFontSize let wallpaper: TelegramWallpaper + let wallpaperMode: PresentationWallpaperMode let dateTimeFormat: PresentationDateTimeFormat let nameDisplayOrder: PresentationPersonNameOrder - init(account: Account, theme: PresentationTheme, componentTheme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder) { + init(account: Account, theme: PresentationTheme, componentTheme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, wallpaper: TelegramWallpaper, wallpaperMode: PresentationWallpaperMode, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder) { self.account = account self.theme = theme self.componentTheme = componentTheme @@ -24,6 +25,7 @@ class ThemeSettingsChatPreviewItem: ListViewItem, ItemListItem { self.sectionId = sectionId self.fontSize = fontSize self.wallpaper = wallpaper + self.wallpaperMode = wallpaperMode self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder } @@ -93,7 +95,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { self.containerNode.subnodeTransform = CATransform3DMakeRotation(CGFloat.pi, 0.0, 0.0, 1.0) self.controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in - return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _ in }, navigateToMessage: { _, _ in }, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendMessage: { _ in }, sendSticker: { _, _ in }, sendGif: { _ in }, requestMessageActionCallback: { _, _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in + return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _ in }, navigateToMessage: { _, _ in }, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendMessage: { _ in }, sendSticker: { _, _ in }, sendGif: { _ in }, requestMessageActionCallback: { _, _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _ in }, openWallpaper: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in }, presentController: { _, _ in }, navigationController: { return nil }, presentGlobalOverlayController: { _, _ in }, callPeer: { _ in }, longTap: { _ in }, openCheckoutOrReceipt: { _ in }, openSearch: { }, setupReply: { _ in @@ -124,8 +126,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { return { item, params, neighbors in var updatedBackgroundImage: UIImage? - if currentItem?.wallpaper != item.wallpaper { - updatedBackgroundImage = UIImage() + if currentItem?.wallpaper != item.wallpaper || currentItem?.wallpaperMode != item.wallpaperMode { switch item.wallpaper { case .builtin: if let filePath = frameworkBundle.path(forResource: "ChatWallpaperBuiltin0", ofType: "jpg") { @@ -138,12 +139,30 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { }) case let .image(representations): if let largest = largestImageRepresentation(representations) { - if let path = item.account.postbox.mediaBox.completedResourcePath(largest.resource) { + if case .blurred = item.wallpaperMode { + var image: UIImage? + let _ = item.account.postbox.mediaBox.cachedResourceRepresentation(largest.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true, attemptSynchronously: true).start(next: { data in + if data.complete { + image = UIImage(contentsOfFile: data.path)?.precomposed() + } + }) + updatedBackgroundImage = image + } + if updatedBackgroundImage == nil, let path = item.account.postbox.mediaBox.completedResourcePath(largest.resource) { updatedBackgroundImage = UIImage(contentsOfFile: path)?.precomposed() } } case let .file(file): - if let path = item.account.postbox.mediaBox.completedResourcePath(file.file.resource) { + if case .blurred = item.wallpaperMode { + var image: UIImage? + let _ = item.account.postbox.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true, attemptSynchronously: true).start(next: { data in + if data.complete { + image = UIImage(contentsOfFile: data.path)?.precomposed() + } + }) + updatedBackgroundImage = image + } + if updatedBackgroundImage == nil, let path = item.account.postbox.mediaBox.completedResourcePath(file.file.resource) { updatedBackgroundImage = UIImage(contentsOfFile: path)?.precomposed() } } diff --git a/TelegramUI/ThemeSettingsController.swift b/TelegramUI/ThemeSettingsController.swift index a50ede3501..c4f59c9e4f 100644 --- a/TelegramUI/ThemeSettingsController.swift +++ b/TelegramUI/ThemeSettingsController.swift @@ -35,7 +35,7 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { case fontSizeHeader(PresentationTheme, String) case fontSize(PresentationTheme, PresentationFontSize) case chatPreviewHeader(PresentationTheme, String) - case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder) + case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationWallpaperMode, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder) case wallpaper(PresentationTheme, String) case accentColor(PresentationTheme, String, Int32) case autoNightTheme(PresentationTheme, String, String) @@ -95,8 +95,8 @@ private enum ThemeSettingsControllerEntry: 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, lhsWallpaperMode, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder): + if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsWallpaperMode, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsWallpaperMode == rhsWallpaperMode, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder { return true } else { return false @@ -178,8 +178,8 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { }) 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(account: arguments.account, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder) + case let .chatPreview(theme, componentTheme, wallpaper, wallpaperMode, fontSize, strings, dateTimeFormat, nameDisplayOrder): + return ThemeSettingsChatPreviewItem(account: arguments.account, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, wallpaperMode: wallpaperMode, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder) case let .wallpaper(theme, text): return ItemListDisclosureItem(theme: theme, title: text, label: "", sectionId: self.section, style: .blocks, action: { arguments.openWallpaperSettings() @@ -210,13 +210,13 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { } } -private func themeSettingsControllerEntries(presentationData: PresentationData, theme: PresentationTheme, themeAccentColor: Int32?, autoNightSettings: AutomaticThemeSwitchSetting, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, disableAnimations: Bool) -> [ThemeSettingsControllerEntry] { +private func themeSettingsControllerEntries(presentationData: PresentationData, theme: PresentationTheme, themeAccentColor: Int32?, autoNightSettings: AutomaticThemeSwitchSetting, strings: PresentationStrings, wallpaper: TelegramWallpaper, wallpaperMode: PresentationWallpaperMode, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, disableAnimations: Bool) -> [ThemeSettingsControllerEntry] { var entries: [ThemeSettingsControllerEntry] = [] entries.append(.fontSizeHeader(presentationData.theme, strings.Appearance_TextSize)) entries.append(.fontSize(presentationData.theme, fontSize)) entries.append(.chatPreviewHeader(presentationData.theme, strings.Appearance_Preview)) - entries.append(.chatPreview(presentationData.theme, theme, wallpaper, fontSize, presentationData.strings, dateTimeFormat, presentationData.nameDisplayOrder)) + entries.append(.chatPreview(presentationData.theme, theme, wallpaper, wallpaperMode, fontSize, presentationData.strings, dateTimeFormat, presentationData.nameDisplayOrder)) entries.append(.wallpaper(presentationData.theme, strings.Settings_ChatBackground)) if theme.name == .builtin(.day) { entries.append(.accentColor(presentationData.theme, strings.Appearance_AccentColor, themeAccentColor ?? defaultDayAccentColor)) @@ -277,7 +277,7 @@ public func themeSettingsController(account: Account) -> ViewController { return PresentationThemeSettings(chatWallpaper: current.chatWallpaper, chatWallpaperMode: current.chatWallpaperMode, theme: current.theme, themeAccentColor: current.themeAccentColor, fontSize: size, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, disableAnimations: current.disableAnimations) }).start() }, openWallpaperSettings: { - pushControllerImpl?(ThemeGridController(account: account, mode: .wallpapers)) + pushControllerImpl?(ThemeGridController(account: account)) }, openAccentColor: { color in presentControllerImpl?(ThemeAccentColorActionSheet(account: account, currentValue: color, applyValue: { color in let _ = updatePresentationThemeSettingsInteractively(postbox: account.postbox, { current in @@ -304,6 +304,7 @@ public func themeSettingsController(account: Account) -> ViewController { let theme: PresentationTheme let fontSize: PresentationFontSize let wallpaper: TelegramWallpaper + let wallpaperMode: PresentationWallpaperMode let strings: PresentationStrings let dateTimeFormat: PresentationDateTimeFormat let disableAnimations: Bool @@ -323,6 +324,7 @@ public func themeSettingsController(account: Account) -> ViewController { } } wallpaper = settings.chatWallpaper + wallpaperMode = settings.chatWallpaperMode fontSize = settings.fontSize if let localizationSettings = preferences.values[localizationSettingsKey] as? LocalizationSettings { @@ -335,7 +337,7 @@ public func themeSettingsController(account: Account) -> ViewController { disableAnimations = settings.disableAnimations let controllerState = ItemListControllerState(theme: presentationData.theme, title: .text(presentationData.strings.Appearance_Title), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: strings.Common_Back)) - let listState = ItemListNodeState(entries: themeSettingsControllerEntries(presentationData: presentationData, theme: theme, themeAccentColor: settings.themeAccentColor, autoNightSettings: settings.automaticThemeSwitchSetting, strings: presentationData.strings, wallpaper: wallpaper, fontSize: fontSize, dateTimeFormat: dateTimeFormat, disableAnimations: disableAnimations), style: .blocks, animateChanges: false) + let listState = ItemListNodeState(entries: themeSettingsControllerEntries(presentationData: presentationData, theme: theme, themeAccentColor: settings.themeAccentColor, autoNightSettings: settings.automaticThemeSwitchSetting, strings: presentationData.strings, wallpaper: wallpaper, wallpaperMode: wallpaperMode, fontSize: fontSize, dateTimeFormat: dateTimeFormat, disableAnimations: disableAnimations), style: .blocks, animateChanges: false) if previousTheme.swap(theme)?.name != theme.name { presentControllerImpl?(ThemeSettingsCrossfadeController()) diff --git a/TelegramUI/TransformImageNode.swift b/TelegramUI/TransformImageNode.swift index fc0b93046e..3c0ee04988 100644 --- a/TelegramUI/TransformImageNode.swift +++ b/TelegramUI/TransformImageNode.swift @@ -16,7 +16,7 @@ public struct TransformImageNodeContentAnimations: OptionSet { } public class TransformImageNode: ASDisplayNode { - public var imageUpdated: (() -> Void)? + public var imageUpdated: ((UIImage?) -> Void)? public var contentAnimations: TransformImageNodeContentAnimations = [] private var disposable = MetaDisposable() @@ -99,16 +99,18 @@ public class TransformImageNode: ASDisplayNode { }) } + var imageUpdate: UIImage? if let (transform, arguments, image) = next { strongSelf.currentTransform = transform strongSelf.currentArguments = arguments strongSelf.contents = image?.cgImage + imageUpdate = image } if let _ = strongSelf.overlayColor { strongSelf.applyOverlayColor(animated: false) } if let imageUpdated = strongSelf.imageUpdated { - imageUpdated() + imageUpdated(imageUpdate) } } } diff --git a/TelegramUI/UrlHandling.swift b/TelegramUI/UrlHandling.swift index cc44f71a92..b9a1bdae87 100644 --- a/TelegramUI/UrlHandling.swift +++ b/TelegramUI/UrlHandling.swift @@ -10,6 +10,11 @@ enum ParsedInternalPeerUrlParameter { case channelMessage(Int32) } +enum WallpaperUrlParameter { + case slug(String) + case color(UIColor) +} + enum ParsedInternalUrl { case peerName(String, ParsedInternalPeerUrlParameter?) case stickerPack(String) @@ -20,7 +25,7 @@ enum ParsedInternalUrl { case confirmationCode(Int) case cancelAccountReset(phone: String, hash: String) case share(url: String?, text: String?, to: String?) - case wallpaper(String) + case wallpaper(WallpaperUrlParameter) } private enum ParsedUrl { @@ -42,7 +47,7 @@ enum ResolvedUrl { case confirmationCode(Int) case cancelAccountReset(phone: String, hash: String) case share(url: String?, text: String?, to: String?) - case wallpaper(String) + case wallpaper(WallpaperUrlParameter) } func parseInternalUrl(query: String) -> ParsedInternalUrl? { @@ -170,7 +175,14 @@ func parseInternalUrl(query: String) -> ParsedInternalUrl? { } return nil } else if pathComponents[0] == "bg" { - return .wallpaper(pathComponents[1]) + let component = pathComponents[1] + let parameter: WallpaperUrlParameter + if component.count == 6, component.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF").inverted) == nil, let color = UIColor(hexString: component) { + parameter = .color(color) + } else { + parameter = .slug(component) + } + return .wallpaper(parameter) } else if let value = Int(pathComponents[1]) { return .peerName(peerName, .channelMessage(Int32(value))) } else { @@ -237,8 +249,8 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig return .single(.cancelAccountReset(phone: phone, hash: hash)) case let .share(url, text, to): return .single(.share(url: url, text: text, to: to)) - case let .wallpaper(slug): - return .single(.wallpaper(slug)) + case let .wallpaper(parameter): + return .single(.wallpaper(parameter)) } } diff --git a/TelegramUI/WallpaperCropNode.swift b/TelegramUI/WallpaperCropNode.swift new file mode 100644 index 0000000000..1b5269ed9d --- /dev/null +++ b/TelegramUI/WallpaperCropNode.swift @@ -0,0 +1,189 @@ +import Foundation +import Display +import AsyncDisplayKit + +class WallpaperCropNode: ASDisplayNode, UIScrollViewDelegate { + let scrollNode: ASScrollNode + + private var containerLayout: ContainerViewLayout? + + private var ignoreZoom = false + private var ignoreZoomTransition: ContainedViewLayoutTransition? + + var zoomableContent: (CGSize, ASDisplayNode)? { + didSet { + if oldValue?.1 !== self.zoomableContent?.1 { + if let node = oldValue?.1 { + node.view.removeFromSuperview() + } + if let node = self.zoomableContent?.1 { + self.scrollNode.addSubnode(node) + } + } + self.resetScrollViewContents(transition: .immediate) + self.centerScrollViewContents(transition: .immediate) + } + } + + override init() { + self.scrollNode = ASScrollNode() + if #available(iOSApplicationExtension 11.0, *) { + self.scrollNode.view.contentInsetAdjustmentBehavior = .never + } + + super.init() + + self.scrollNode.view.delegate = self + self.scrollNode.view.showsVerticalScrollIndicator = false + self.scrollNode.view.showsHorizontalScrollIndicator = false + self.scrollNode.view.clipsToBounds = false + self.scrollNode.view.scrollsToTop = false + self.scrollNode.view.delaysContentTouches = false + self.scrollNode.view.decelerationRate = UIScrollViewDecelerationRateFast + + self.addSubnode(self.scrollNode) + } + + @objc func contentTap(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { + if recognizer.state == .ended { + if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation { + switch gesture { + case .doubleTap: + if let contentView = self.zoomableContent?.1.view, self.scrollNode.view.zoomScale.isLessThanOrEqualTo(self.scrollNode.view.minimumZoomScale) { + let pointInView = self.scrollNode.view.convert(location, to: contentView) + + let newZoomScale = self.scrollNode.view.maximumZoomScale + let scrollViewSize = self.scrollNode.view.bounds.size + + let w = scrollViewSize.width / newZoomScale + let h = scrollViewSize.height / newZoomScale + let x = pointInView.x - (w / 2.0) + let y = pointInView.y - (h / 2.0) + + let rectToZoomTo = CGRect(x: x, y: y, width: w, height: h) + + self.scrollNode.view.zoom(to: rectToZoomTo, animated: true) + } else { + self.scrollNode.view.setZoomScale(self.scrollNode.view.minimumZoomScale, animated: true) + } + default: + break + } + } + } + } + + func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + var shouldResetContents = false + if let containerLayout = self.containerLayout { + shouldResetContents = !containerLayout.size.equalTo(layout.size) + } else { + shouldResetContents = true + } + self.containerLayout = layout + + if shouldResetContents { + var previousFrame: CGRect? + var previousScale: CGFloat? + if let (_, contentNode) = self.zoomableContent { + previousFrame = contentNode.view.frame + let t = contentNode.layer.transform + previousScale = sqrt((t.m11 * t.m11) + (t.m12 * t.m12) + (t.m13 * t.m13)) + } + + transition.updateFrame(node: self.scrollNode, frame: CGRect(origin: CGPoint(), size: layout.size)) + self.resetScrollViewContents(transition: .immediate) + + if let (_, contentNode) = self.zoomableContent, let previousFrame = previousFrame, let previousScale = previousScale { + transition.animatePosition(node: contentNode, from: CGPoint(x: previousFrame.midX, y: previousFrame.midY)) + switch transition { + case .immediate: + break + case let .animated(duration, curve): + let t = contentNode.layer.transform + let currentScale = sqrt((t.m11 * t.m11) + (t.m12 * t.m12) + (t.m13 * t.m13)) + + contentNode.layer.animateScale(from: previousScale, to: currentScale, duration: duration, timingFunction: curve.timingFunction) + } + } + } + } + + private func resetScrollViewContents(transition: ContainedViewLayoutTransition) { + guard let (contentSize, contentNode) = self.zoomableContent else { + return + } + + self.ignoreZoom = true + self.ignoreZoomTransition = transition + self.scrollNode.view.minimumZoomScale = 1.0 + self.scrollNode.view.maximumZoomScale = 1.0 + self.scrollNode.view.zoomScale = 1.0 + self.scrollNode.view.contentSize = contentSize + + contentNode.transform = CATransform3DIdentity + contentNode.frame = CGRect(origin: CGPoint(), size: contentSize) + + self.centerScrollViewContents(transition: transition) + self.ignoreZoom = false + + self.scrollNode.view.zoomScale = self.scrollNode.view.minimumZoomScale + self.ignoreZoomTransition = nil + } + + private func centerScrollViewContents(transition: ContainedViewLayoutTransition) { + guard let (contentSize, contentNode) = self.zoomableContent else { + return + } + + let boundsSize = self.scrollNode.view.bounds.size + if contentSize.width.isLessThanOrEqualTo(0.0) || contentSize.height.isLessThanOrEqualTo(0.0) || boundsSize.width.isLessThanOrEqualTo(0.0) || boundsSize.height.isLessThanOrEqualTo(0.0) { + return + } + + let scaleWidth = boundsSize.width / contentSize.width + let scaleHeight = boundsSize.height / contentSize.height + let minScale = max(scaleWidth, scaleHeight) + let maxScale = minScale * 3.0 + + if !self.scrollNode.view.minimumZoomScale.isEqual(to: minScale) { + self.scrollNode.view.minimumZoomScale = minScale + } + + if !self.scrollNode.view.maximumZoomScale.isEqual(to: maxScale) { + self.scrollNode.view.maximumZoomScale = maxScale + } + + var contentFrame = contentNode.view.frame + if boundsSize.width > contentFrame.size.width { + contentFrame.origin.x = (boundsSize.width - contentFrame.size.width) / 2.0 + } else { + contentFrame.origin.x = 0.0 + } + + if boundsSize.height >= contentFrame.size.height { + contentFrame.origin.y = (boundsSize.height - contentFrame.size.height) / 2.0 + } else { + contentFrame.origin.y = 0.0 + } + + if !self.ignoreZoom { + transition.updateFrame(view: contentNode.view, frame: contentFrame) + } + } + + func viewForZooming(in scrollView: UIScrollView) -> UIView? { + return self.zoomableContent?.1.view + } + + func scrollViewDidZoom(_ scrollView: UIScrollView) { + if !self.ignoreZoom { + self.centerScrollViewContents(transition: self.ignoreZoomTransition ?? .immediate) + } + } + + var cropRect: CGRect { + let scrollView = self.scrollNode.view + return scrollView.convert(scrollView.bounds, to: self.zoomableContent?.1.view) + } +} diff --git a/TelegramUI/WallpaperListPreviewController.swift b/TelegramUI/WallpaperListPreviewController.swift index c289037979..e7cb70559e 100644 --- a/TelegramUI/WallpaperListPreviewController.swift +++ b/TelegramUI/WallpaperListPreviewController.swift @@ -8,8 +8,10 @@ import Photos enum WallpaperListPreviewSource { case list(wallpapers: [TelegramWallpaper], central: TelegramWallpaper, mode: PresentationWallpaperMode?) + case slug(String, TelegramMediaFile?) case wallpaper(TelegramWallpaper) case asset(PHAsset, UIImage?) + case contextResults(results: [ChatContextResult], central: ChatContextResult) } final class WallpaperListPreviewController: ViewController { @@ -33,7 +35,7 @@ final class WallpaperListPreviewController: ViewController { private var didPlayPresentationAnimation = false - var apply: ((WallpaperEntry, PresentationWallpaperMode) -> Void)? + var apply: ((WallpaperEntry, PresentationWallpaperMode, CGRect?) -> Void)? init(account: Account, source: WallpaperListPreviewSource) { self.account = account @@ -59,7 +61,7 @@ final class WallpaperListPreviewController: ViewController { } }) - self.title = self.presentationData.strings.BackgroundPreview_Title + self.title = self.presentationData.strings.WallpaperPreview_Title self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: self.presentationData.theme.rootController.navigationBar.accentTextColor), style: .plain, target: self, action: #selector(self.sharePressed)) } @@ -73,7 +75,7 @@ final class WallpaperListPreviewController: ViewController { } private func updateThemeAndStrings() { - self.title = self.presentationData.strings.BackgroundPreview_Title + self.title = self.presentationData.strings.WallpaperPreview_Title self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil) self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBar.style.style @@ -103,29 +105,53 @@ final class WallpaperListPreviewController: ViewController { override public func loadDisplayNode() { self.displayNode = WallpaperListPreviewControllerNode(account: self.account, presentationData: self.presentationData, source: self.source, dismiss: { [weak self] in self?.dismiss() - }, apply: { [weak self] wallpaper, mode in + }, apply: { [weak self] wallpaper, mode, cropRect in guard let strongSelf = self else { return } switch wallpaper { case let .wallpaper(wallpaper): - let _ = (updatePresentationThemeSettingsInteractively(postbox: strongSelf.account.postbox, { current in - return PresentationThemeSettings(chatWallpaper: wallpaper, chatWallpaperMode: mode, theme: current.theme, themeAccentColor: current.themeAccentColor, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, disableAnimations: current.disableAnimations) - }) - |> deliverOnMainQueue).start(completed: { - self?.dismiss() - }) - - if case .wallpaper = strongSelf.source { - let _ = saveWallpaper(account: strongSelf.account, wallpaper: wallpaper).start() + let completion: () -> Void = { + let _ = (updatePresentationThemeSettingsInteractively(postbox: strongSelf.account.postbox, { current in + return PresentationThemeSettings(chatWallpaper: wallpaper, chatWallpaperMode: mode, theme: current.theme, themeAccentColor: current.themeAccentColor, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, disableAnimations: current.disableAnimations) + }) + |> deliverOnMainQueue).start(completed: { + self?.dismiss() + }) + + if case .wallpaper = strongSelf.source { + let _ = saveWallpaper(account: strongSelf.account, wallpaper: wallpaper).start() + } + let _ = installWallpaper(account: strongSelf.account, wallpaper: wallpaper).start() + } + + if case .blurred = mode { + var resource: MediaResource? + switch wallpaper { + case let .file(file): + resource = file.file.resource + case let .image(representations): + if let largestSize = largestImageRepresentation(representations) { + resource = largestSize.resource + } + default: + break + } + + if let resource = resource { + let _ = strongSelf.account.postbox.mediaBox.cachedResourceRepresentation(resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true).start(completed: { + completion() + }) + } + } else { + completion() } - let _ = installWallpaper(account: strongSelf.account, wallpaper: wallpaper).start() default: break } - strongSelf.apply?(wallpaper, mode) + strongSelf.apply?(wallpaper, mode, cropRect) }) self._ready.set(self.controllerNode.ready.get()) self.displayNodeDidLoad() @@ -135,13 +161,19 @@ final class WallpaperListPreviewController: ViewController { guard let strongSelf = self else { return } - - if case let .wallpaper(wallpaper) = entry, case .file = wallpaper { - strongSelf.wallpaper = entry - strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(image: generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: strongSelf.presentationData.theme.rootController.navigationBar.accentTextColor), style: .plain, target: self, action: #selector(strongSelf.sharePressed)) + var barButtonItem: UIBarButtonItem? + if case let .wallpaper(wallpaper) = entry { + switch wallpaper { + case .file, .color: + strongSelf.wallpaper = entry + barButtonItem = UIBarButtonItem(image: generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: strongSelf.presentationData.theme.rootController.navigationBar.accentTextColor), style: .plain, target: self, action: #selector(strongSelf.sharePressed)) + default: + strongSelf.wallpaper = nil + } } else { - strongSelf.navigationItem.rightBarButtonItem = nil + strongSelf.wallpaper = nil } + strongSelf.navigationItem.rightBarButtonItem = barButtonItem }) } @@ -152,9 +184,19 @@ final class WallpaperListPreviewController: ViewController { } @objc func sharePressed() { - if let entry = self.wallpaper, case let .wallpaper(wallpaper) = entry, case let .file(_, _, _, slug, _, _) = wallpaper { - let shareController = ShareController(account: account, subject: .url("https://t.me/bg/\(slug)")) - self.present(shareController, in: .window(.root), blockInteraction: true) + if let entry = self.wallpaper, case let .wallpaper(wallpaper) = entry { + var controller: ShareController? + switch wallpaper { + case let .file(_, _, _, slug, _, _): + controller = ShareController(account: account, subject: .url("https://t.me/bg/\(slug)")) + case let .color(color): + controller = ShareController(account: account, subject: .url("https://t.me/bg/\(String(UInt32(bitPattern: color), radix: 16, uppercase: false))")) + default: + break + } + if let controller = controller { + self.present(controller, in: .window(.root), blockInteraction: true) + } } } } diff --git a/TelegramUI/WallpaperListPreviewControllerNode.swift b/TelegramUI/WallpaperListPreviewControllerNode.swift index d3c43702ad..9782ad4b08 100644 --- a/TelegramUI/WallpaperListPreviewControllerNode.swift +++ b/TelegramUI/WallpaperListPreviewControllerNode.swift @@ -5,10 +5,12 @@ import SwiftSignalKit import Postbox import TelegramCore import Photos +import LegacyComponents enum WallpaperEntry: Equatable { case wallpaper(TelegramWallpaper) case asset(PHAsset, UIImage?) + case contextResult(ChatContextResult) public static func ==(lhs: WallpaperEntry, rhs: WallpaperEntry) -> Bool { switch lhs { @@ -24,6 +26,12 @@ enum WallpaperEntry: Equatable { } else { return false } + case let .contextResult(lhsResult): + if case let .contextResult(rhsResult) = rhs, lhsResult.id == rhsResult.id { + return true + } else { + return false + } } } } @@ -32,52 +40,60 @@ private final class WallpaperBackgroundNode: ASDisplayNode { let wallpaper: WallpaperEntry private var fetchDisposable: Disposable? private var statusDisposable: Disposable? + let wrapperNode: ASDisplayNode let imageNode: TransformImageNode - private let statusNode: RadialStatusNode + let cropNode: WallpaperCropNode + private var contentSize: CGSize? - //let blurView: DynamicBlurView + private let statusNode: RadialStatusNode + private let blurredNode: BlurredImageNode let segmentedControlColor = Promise(.white) init(account: Account, wallpaper: WallpaperEntry) { self.wallpaper = wallpaper + self.wrapperNode = ASDisplayNode() self.imageNode = TransformImageNode() self.imageNode.contentAnimations = .subsequentUpdates + self.cropNode = WallpaperCropNode() + self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(white: 0.0, alpha: 0.6)) let progressDiameter: CGFloat = 50.0 self.statusNode.frame = CGRect(x: 0.0, y: 0.0, width: progressDiameter, height: progressDiameter) self.statusNode.isUserInteractionEnabled = false - //self.blurView = DynamicBlurView() + self.blurredNode = BlurredImageNode() super.init() self.clipsToBounds = true self.backgroundColor = .black - self.addSubnode(self.imageNode) - self.addSubnode(self.statusNode) let signal: Signal<(TransformImageArguments) -> DrawingContext?, NoError> let fetchSignal: Signal let statusSignal: Signal let displaySize: CGSize + let contentSize: CGSize switch wallpaper { case let .wallpaper(wallpaper): switch wallpaper { case .builtin: displaySize = CGSize(width: 640.0, height: 1136.0) + contentSize = displaySize signal = settingsBuiltinWallpaperImage(account: account) fetchSignal = .complete() statusSignal = .single(.Local) case let .color(color): displaySize = CGSize(width: 1.0, height: 1.0) + contentSize = displaySize signal = .never() fetchSignal = .complete() statusSignal = .single(.Local) self.backgroundColor = UIColor(rgb: UInt32(bitPattern: color)) case let .file(file): let dimensions = file.file.dimensions ?? CGSize(width: 100.0, height: 100.0) + contentSize = dimensions displaySize = dimensions.dividedByScreenScale().integralFloor var convertedRepresentations: [ImageRepresentationWithReference] = [] @@ -90,6 +106,7 @@ private final class WallpaperBackgroundNode: ASDisplayNode { statusSignal = account.postbox.mediaBox.resourceStatus(file.file.resource) case let .image(representations): if let largestSize = largestImageRepresentation(representations) { + contentSize = largestSize.dimensions displaySize = largestSize.dimensions.dividedByScreenScale().integralFloor let convertedRepresentations: [ImageRepresentationWithReference] = representations.map({ ImageRepresentationWithReference(representation: $0, reference: .wallpaper(resource: $0.resource)) }) @@ -102,21 +119,97 @@ private final class WallpaperBackgroundNode: ASDisplayNode { } statusSignal = account.postbox.mediaBox.resourceStatus(largestSize.resource) } else { - displaySize = CGSize(width: 100.0, height: 100.0) + displaySize = CGSize(width: 1.0, height: 1.0) + contentSize = displaySize signal = .never() fetchSignal = .complete() statusSignal = .single(.Local) } } - case let .asset(asset, thumbnailImage): + case let .asset(asset, _): let dimensions = CGSize(width: asset.pixelWidth, height: asset.pixelHeight) + contentSize = dimensions displaySize = dimensions.dividedByScreenScale().integralFloor signal = photoWallpaper(postbox: account.postbox, photoLibraryResource: PhotoLibraryMediaResource(localIdentifier: asset.localIdentifier, uniqueId: arc4random64())) fetchSignal = .complete() statusSignal = .single(.Local) + + self.wrapperNode.addSubnode(self.cropNode) + case let .contextResult(result): + var imageDimensions: CGSize? + var imageResource: TelegramMediaResource? + var thumbnailDimensions: CGSize? + var thumbnailResource: TelegramMediaResource? + switch result { + case let .externalReference(_, _, _, _, _, _, content, thumbnail, _): + if let content = content { + imageResource = content.resource + } + if let thumbnail = thumbnail { + thumbnailResource = thumbnail.resource + thumbnailDimensions = thumbnail.dimensions + } + if let dimensions = content?.dimensions { + imageDimensions = dimensions + } + case let .internalReference(_, _, _, _, _, image, _, _): + if let image = image { + if let imageRepresentation = imageRepresentationLargerThan(image.representations, size: CGSize(width: 1000.0, height: 800.0)) { + imageDimensions = imageRepresentation.dimensions + imageResource = imageRepresentation.resource + } + if let thumbnailRepresentation = imageRepresentationLargerThan(image.representations, size: CGSize(width: 200.0, height: 100.0)) { + thumbnailDimensions = thumbnailRepresentation.dimensions + thumbnailResource = thumbnailRepresentation.resource + } + } + } + + if let imageResource = imageResource, let imageDimensions = imageDimensions { + contentSize = imageDimensions + displaySize = imageDimensions.dividedByScreenScale().integralFloor + + var representations: [TelegramMediaImageRepresentation] = [] + if let thumbnailResource = thumbnailResource, let thumbnailDimensions = thumbnailDimensions { + representations.append(TelegramMediaImageRepresentation(dimensions: thumbnailDimensions, resource: thumbnailResource)) + } + representations.append(TelegramMediaImageRepresentation(dimensions: imageDimensions, resource: imageResource)) + let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: representations, immediateThumbnailData: nil, reference: nil, partialReference: nil) + + signal = chatMessagePhoto(postbox: account.postbox, photoReference: .standalone(media: tmpImage)) + fetchSignal = fetchedMediaResource(postbox: account.postbox, reference: .media(media: .standalone(media: tmpImage), resource: imageResource)) + statusSignal = account.postbox.mediaBox.resourceStatus(imageResource) + } else { + displaySize = CGSize(width: 1.0, height: 1.0) + contentSize = displaySize + signal = .never() + fetchSignal = .complete() + statusSignal = .single(.Local) + } + self.wrapperNode.addSubnode(self.cropNode) } + self.contentSize = contentSize + + self.addSubnode(self.wrapperNode) + if self.cropNode.supernode == nil { + self.imageNode.contentMode = .scaleAspectFill + self.wrapperNode.addSubnode(self.imageNode) + } + self.wrapperNode.addSubnode(self.statusNode) + self.imageNode.setSignal(signal, dispatchOnDisplayLink: false) self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets()))() + self.imageNode.imageUpdated = { [weak self] image in + if let strongSelf = self { + var image = image + if let scaledImage = image { + if scaledImage.size.width > 2048.0 || scaledImage.size.height > 2048.0 { + image = TGScaleImageToPixelSize(image, scaledImage.size.fitted(CGSize(width: 2048.0, height: 2048.0))) + } + } + strongSelf.blurredNode.image = image + } + } self.fetchDisposable = fetchSignal.start() let statusForegroundColor = UIColor.white @@ -136,7 +229,6 @@ private final class WallpaperBackgroundNode: ASDisplayNode { strongSelf.statusNode.transitionToState(state, completion: {}) } }) - self.imageNode.contentMode = .scaleAspectFill let segmentedControlColorSignal: Signal if case let .wallpaper(wallpaper) = wallpaper { @@ -152,6 +244,15 @@ private final class WallpaperBackgroundNode: ASDisplayNode { self.statusDisposable?.dispose() } + var cropRect: CGRect? { + switch self.wallpaper { + case .asset, .contextResult: + return self.cropNode.cropRect + default: + return nil + } + } + func setParallaxEnabled(_ enabled: Bool) { if enabled { let amount = 16.0 @@ -166,50 +267,70 @@ private final class WallpaperBackgroundNode: ASDisplayNode { let group = UIMotionEffectGroup() group.motionEffects = [horizontal, vertical] - self.imageNode.view.addMotionEffect(group) + self.wrapperNode.view.addMotionEffect(group) } else { for effect in self.imageNode.view.motionEffects { - self.imageNode.view.removeMotionEffect(effect) + self.wrapperNode.view.removeMotionEffect(effect) } } } func setBlurEnabled(_ enabled: Bool, animated: Bool) { -// if enabled { -// //self.blurView.frame = self.imageNode.frame -// self.blurView.drawsAsynchronously = true -// if self.blurView.superview == nil { -// self.view.addSubview(self.blurView) -// } -// -// if animated { -// self.blurView.blurRadius = 0.0 -// UIView.animate(withDuration: 0.3) { -// self.blurView.blurRadius = 15.0 -// } -// } else { -// self.blurView.blurRadius = 15.0 -// } -// } else { -// if self.blurView.superview != nil { -// if animated { -// UIView.animate(withDuration: 0.3, animations: { -// self.blurView.blurRadius = 0.0 -// }) { finished in -// if finished { -// self.blurView.removeFromSuperview() -// } -// } -// } else { -// self.blurView.removeFromSuperview() -// } -// } -// } + let blurRadius: CGFloat = 45.0 + + if enabled { + if self.blurredNode.supernode == nil { + if self.cropNode.supernode != nil { + self.blurredNode.frame = self.imageNode.bounds + self.imageNode.addSubnode(self.blurredNode) + } else { + self.blurredNode.frame = self.imageNode.frame + self.addSubnode(self.blurredNode) + } + } + + if animated { + self.blurredNode.blurView.blurRadius = 0.0 + UIView.animate(withDuration: 0.3, delay: 0.0, options: UIViewAnimationOptions(rawValue: 7 << 16), animations: { + self.blurredNode.blurView.blurRadius = blurRadius + }, completion: nil) + } else { + self.blurredNode.blurView.blurRadius = blurRadius + } + } else { + if self.blurredNode.supernode != nil { + if animated { + UIView.animate(withDuration: 0.3, delay: 0.0, options: UIViewAnimationOptions(rawValue: 7 << 16), animations: { + self.blurredNode.blurView.blurRadius = 0.0 + }, completion: { finished in + if finished { + self.blurredNode.removeFromSupernode() + } + }) + } else { + self.blurredNode.removeFromSupernode() + } + } + } } func updateLayout(_ layout: ContainerViewLayout, navigationHeight: CGFloat, transition: ContainedViewLayoutTransition) { - self.imageNode.frame = CGRect(origin: CGPoint(), size: layout.size) - //self.blurView.frame = self.imageNode.frame + self.wrapperNode.frame = CGRect(origin: CGPoint(), size: layout.size) + if self.cropNode.supernode == nil { + self.imageNode.frame = self.wrapperNode.bounds + self.blurredNode.frame = self.imageNode.frame + } else { + self.cropNode.frame = self.wrapperNode.bounds + self.cropNode.containerLayoutUpdated(layout, transition: transition) + + if self.cropNode.supernode != nil, let contentSize = self.contentSize, self.cropNode.zoomableContent == nil { + let fittedSize = TGScaleToFit(self.cropNode.bounds.size, contentSize) + + self.cropNode.zoomableContent = (contentSize, self.imageNode) + self.cropNode.scrollNode.view.zoom(to: CGRect(x: (contentSize.width - fittedSize.width) / 2.0, y: (contentSize.height - fittedSize.height) / 2.0, width: fittedSize.width, height: fittedSize.height), animated: false) + } + self.blurredNode.frame = self.imageNode.bounds + } let progressDiameter: CGFloat = 50.0 self.statusNode.frame = CGRect(x: layout.safeInsets.left + floorToScreenPixels((layout.size.width - layout.safeInsets.left - layout.safeInsets.right - progressDiameter) / 2.0), y: floorToScreenPixels((layout.size.height - progressDiameter) / 2.0), width: progressDiameter, height: progressDiameter) @@ -220,7 +341,7 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { private let account: Account private var presentationData: PresentationData private let dismiss: () -> Void - private let apply: (WallpaperEntry, PresentationWallpaperMode) -> Void + private let apply: (WallpaperEntry, PresentationWallpaperMode, CGRect?) -> Void private var validLayout: (ContainerViewLayout, CGFloat)? @@ -251,7 +372,7 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { } private var visibleBackgroundNodesOffset: CGFloat = 0.0 - init(account: Account, presentationData: PresentationData, source: WallpaperListPreviewSource, dismiss: @escaping () -> Void, apply: @escaping (WallpaperEntry, PresentationWallpaperMode) -> Void) { + init(account: Account, presentationData: PresentationData, source: WallpaperListPreviewSource, dismiss: @escaping () -> Void, apply: @escaping (WallpaperEntry, PresentationWallpaperMode, CGRect?) -> Void) { self.account = account self.presentationData = presentationData self.dismiss = dismiss @@ -281,7 +402,7 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { self.toolbarButtonApply = HighlightTrackingButtonNode() self.toolbarButtonApply.setAttributedTitle(NSAttributedString(string: self.presentationData.strings.Wallpaper_Set, font: Font.regular(17.0), textColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor), for: []) - self.segmentedControl = UISegmentedControl(items: [self.presentationData.strings.BackgroundPreview_Still, self.presentationData.strings.BackgroundPreview_Perspective, self.presentationData.strings.BackgroundPreview_Blurred]) + self.segmentedControl = UISegmentedControl(items: [self.presentationData.strings.WallpaperPreview_Still, self.presentationData.strings.WallpaperPreview_Perspective, self.presentationData.strings.WallpaperPreview_Blurred]) self.segmentedControl.selectedSegmentIndex = 0 self.segmentedControl.tintColor = .white @@ -347,6 +468,13 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { if let mode = mode { self.segmentedControl.selectedSegmentIndex = Int(clamping: mode.rawValue) } + case let .slug(slug, file): + if let file = file { + let entry = WallpaperEntry.wallpaper(.file(id: 0, accessHash: 0, isCreator: false, slug: slug, file: file, color: nil)) + self.wallpapers = [entry] + self.centralWallpaper = entry + } + self.ready.set(true) case let .wallpaper(wallpaper): let entry = WallpaperEntry.wallpaper(wallpaper) self.wallpapers = [entry] @@ -357,6 +485,10 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { self.wallpapers = [entry] self.centralWallpaper = entry self.ready.set(true) + case let .contextResults(results, central): + self.wallpapers = results.map { .contextResult($0) } + self.centralWallpaper = WallpaperEntry.contextResult(central) + self.ready.set(true) } if let (layout, navigationHeight) = self.validLayout { self.updateVisibleBackgroundNodes(layout: layout, navigationBarHeight: navigationHeight, transition: .immediate) @@ -404,7 +536,11 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { } func animateIn() { - self.layer.animatePosition(from: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring) + self.layer.animatePosition(from: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring, completion: { [weak self] _ in + if let strongSelf = self, strongSelf.segmentedControl.selectedSegmentIndex == 2 { + strongSelf.centralNode()?.setBlurEnabled(true, animated: true) + } + }) } func animateOut(completion: @escaping () -> Void) { @@ -422,7 +558,7 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { peers[peerId] = TelegramUser(id: peerId, accessHash: nil, firstName: self.presentationData.strings.Appearance_PreviewReplyAuthor, lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) peers[otherPeerId] = TelegramUser(id: otherPeerId, accessHash: nil, firstName: self.presentationData.strings.Appearance_PreviewReplyAuthor, lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) let controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in - return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _ in }, navigateToMessage: { _, _ in }, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendMessage: { _ in }, sendSticker: { _, _ in }, sendGif: { _ in }, requestMessageActionCallback: { _, _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in + return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _ in }, navigateToMessage: { _, _ in }, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendMessage: { _ in }, sendSticker: { _, _ in }, sendGif: { _ in }, requestMessageActionCallback: { _, _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _ in }, openWallpaper: { _ in }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in }, presentController: { _, _ in }, navigationController: { return nil }, presentGlobalOverlayController: { _, _ in }, callPeer: { _ in }, longTap: { _ in }, openCheckoutOrReceipt: { _ in }, openSearch: { }, setupReply: { _ in @@ -441,9 +577,9 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { let chatPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper), fontSize: self.presentationData.fontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: false) - items.append(ChatMessageItem(presentationData: chatPresentationData, account: self.account, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: 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: peers[otherPeerId], text: presentationData.strings.BackgroundPreview_MessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, isAdmin: false), disableDate: true)) + items.append(ChatMessageItem(presentationData: chatPresentationData, account: self.account, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: 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: peers[otherPeerId], text: presentationData.strings.WallpaperPreview_MessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, isAdmin: false), disableDate: true)) - items.append(ChatMessageItem(presentationData: chatPresentationData, account: self.account, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: 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: peers[peerId], text: presentationData.strings.BackgroundPreview_SwipeInfo, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, isAdmin: false), disableDate: true)) + items.append(ChatMessageItem(presentationData: chatPresentationData, account: self.account, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: 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: peers[peerId], text: presentationData.strings.WallpaperPreview_SwipeInfo, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, isAdmin: false), disableDate: true)) let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right) if let messageNodes = self.messageNodes { @@ -489,14 +625,33 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { transition.updateFrame(node: self.toolbarButtonApply, frame: applyFrame) transition.updateFrame(node: self.toolbarButtonApplyBackground, frame: applyFrame) + var optionsAvailable = true + if let centralWallpaper = centralWallpaper { + switch centralWallpaper { + case let .wallpaper(wallpaper): + switch wallpaper { + case .color: + optionsAvailable = false + default: + break + } + default: + break + } + } + var segmentedControlSize = self.segmentedControl.sizeThatFits(layout.size) segmentedControlSize.width = max(270.0, segmentedControlSize.width) + self.segmentedControl.isUserInteractionEnabled = optionsAvailable + transition.updateAlpha(layer: self.segmentedControl.layer, alpha: optionsAvailable ? 1.0 : 0.0) transition.updateFrame(view: self.segmentedControl, frame: CGRect(origin: CGPoint(x: layout.safeInsets.left + floor((layout.size.width - layout.safeInsets.left - layout.safeInsets.right - segmentedControlSize.width) / 2.0), y: layout.size.height - bottomInset - segmentedControlSize.height - 24.0), size: segmentedControlSize)) - if let messageNodes = self.messageNodes { - var bottomOffset: CGFloat = layout.size.height - bottomInset - segmentedControlSize.height - 24.0 - 22.0 + var bottomOffset: CGFloat = layout.size.height - bottomInset - 9.0 + if optionsAvailable { + bottomOffset -= segmentedControlSize.height + 37.0 + } for itemNode in messageNodes { transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: bottomOffset - itemNode.frame.height), size: itemNode.frame.size)) bottomOffset -= itemNode.frame.height @@ -581,27 +736,32 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { return super.hitTest(point, with: event) } + private func centralNode() -> WallpaperBackgroundNode? { + for node in self.visibleBackgroundNodes { + if node.wallpaper == self.centralWallpaper { + return node + } + } + return nil + } + @objc private func indexChanged() { guard let mode = PresentationWallpaperMode(rawValue: Int32(self.segmentedControl.selectedSegmentIndex)) else { return } - for node in self.visibleBackgroundNodes { - if node.wallpaper == self.centralWallpaper { - if mode == .perspective { - node.setParallaxEnabled(true) - node.setBlurEnabled(false, animated: true) - } else if mode == .blurred { - node.setParallaxEnabled(false) - node.setBlurEnabled(true, animated: true) - } else { - node.setParallaxEnabled(false) - node.setBlurEnabled(false, animated: true) - } - break + if let node = self.centralNode() { + if mode == .perspective { + node.setParallaxEnabled(true) + node.setBlurEnabled(false, animated: true) + } else if mode == .blurred { + node.setParallaxEnabled(false) + node.setBlurEnabled(true, animated: true) + } else { + node.setParallaxEnabled(false) + node.setBlurEnabled(false, animated: true) } } - } @objc private func cancelPressed() { @@ -619,7 +779,7 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { default: mode = .still } - self.apply(wallpaper, mode) + self.apply(wallpaper, mode, self.centralNode()?.cropRect) } } } diff --git a/TelegramUI/WallpaperSearchRecentQueries.swift b/TelegramUI/WallpaperSearchRecentQueries.swift new file mode 100644 index 0000000000..3f342d4a2d --- /dev/null +++ b/TelegramUI/WallpaperSearchRecentQueries.swift @@ -0,0 +1,72 @@ +import Foundation +import Postbox +import SwiftSignalKit + +private struct WallpaperSearchRecentQueryItemId { + public let rawValue: MemoryBuffer + + var value: String { + return String(data: self.rawValue.makeData(), encoding: .utf8) ?? "" + } + + init(_ rawValue: MemoryBuffer) { + self.rawValue = rawValue + } + + init?(_ value: String) { + if let data = value.data(using: .utf8) { + self.rawValue = MemoryBuffer(data: data) + } else { + return nil + } + } +} + +final class RecentWallpaperSearchQueryItem: OrderedItemListEntryContents { + init() { + } + + public init(decoder: PostboxDecoder) { + } + + public func encode(_ encoder: PostboxEncoder) { + } +} + +func addRecentWallpaperSearchQuery(postbox: Postbox, string: String) -> Signal { + return postbox.transaction { transaction in + if let itemId = WallpaperSearchRecentQueryItemId(string) { + transaction.addOrMoveToFirstPositionOrderedItemListItem(collectionId: ApplicationSpecificOrderedItemListCollectionId.wallpaperSearchRecentQueries, item: OrderedItemListEntry(id: itemId.rawValue, contents: RecentWallpaperSearchQueryItem()), removeTailIfCountExceeds: 100) + } + } +} + +func removeRecentWallpaperSearchQuery(postbox: Postbox, string: String) -> Signal { + return postbox.transaction { transaction -> Void in + if let itemId = WallpaperSearchRecentQueryItemId(string) { + transaction.removeOrderedItemListItem(collectionId: ApplicationSpecificOrderedItemListCollectionId.wallpaperSearchRecentQueries, itemId: itemId.rawValue) + } + } +} + +func clearRecentWallpaperSearchQueries(postbox: Postbox) -> Signal { + return postbox.transaction { transaction -> Void in + transaction.replaceOrderedItemListItems(collectionId: ApplicationSpecificOrderedItemListCollectionId.wallpaperSearchRecentQueries, items: []) + } +} + +func wallpaperSearchRecentQueries(postbox: Postbox) -> Signal<[String], NoError> { + return postbox.combinedView(keys: [.orderedItemList(id: ApplicationSpecificOrderedItemListCollectionId.wallpaperSearchRecentQueries)]) + |> mapToSignal { view -> Signal<[String], NoError> in + return postbox.transaction { transaction -> [String] in + var result: [String] = [] + if let view = view.views[.orderedItemList(id: ApplicationSpecificOrderedItemListCollectionId.wallpaperSearchRecentQueries)] as? OrderedItemListView { + for item in view.items { + let value = WallpaperSearchRecentQueryItemId(item.id).value + result.append(value) + } + } + return result + } + } +} diff --git a/TelegramUI/WebEmbedVideoContent.swift b/TelegramUI/WebEmbedVideoContent.swift index ca57511539..62148ec24b 100644 --- a/TelegramUI/WebEmbedVideoContent.swift +++ b/TelegramUI/WebEmbedVideoContent.swift @@ -81,7 +81,7 @@ private final class WebEmbedVideoContentNode: ASDisplayNode, UniversalVideoConte if let image = webpageContent.image { self.imageNode.setSignal(chatMessagePhoto(postbox: postbox, photoReference: .webPage(webPage: WebpageReference(webPage), media: image))) - self.imageNode.imageUpdated = { [weak self] in + self.imageNode.imageUpdated = { [weak self] _ in self?._ready.set(.single(Void())) } } else { diff --git a/TelegramUI/WebSearchController.swift b/TelegramUI/WebSearchController.swift index 0e094ba418..7a0d7fe3bb 100644 --- a/TelegramUI/WebSearchController.swift +++ b/TelegramUI/WebSearchController.swift @@ -6,7 +6,7 @@ import AsyncDisplayKit import TelegramCore import LegacyComponents -private func requestContextResults(account: Account, botId: PeerId, query: String, peerId: PeerId, offset: String = "", existingResults: ChatContextResultCollection? = nil, limit: Int = 60) -> Signal { +func requestContextResults(account: Account, botId: PeerId, query: String, peerId: PeerId, offset: String = "", existingResults: ChatContextResultCollection? = nil, limit: Int = 60) -> Signal { return requestChatContextResults(account: account, botId: botId, peerId: peerId, query: query, offset: offset) |> mapToSignal { results -> Signal in var collection = existingResults diff --git a/TelegramUI/WebSearchControllerNode.swift b/TelegramUI/WebSearchControllerNode.swift index 71d5790c6d..4e4c94c62f 100644 --- a/TelegramUI/WebSearchControllerNode.swift +++ b/TelegramUI/WebSearchControllerNode.swift @@ -91,7 +91,11 @@ private struct WebSearchRecentQueryEntry: Comparable, Identifiable { } func item(account: Account, theme: PresentationTheme, strings: PresentationStrings, controllerInteraction: WebSearchControllerInteraction, header: ListViewItemHeader) -> ListViewItem { - return WebSearchRecentQueryItem(account: account, theme: theme, strings: strings, query: self.query, controllerInteraction: controllerInteraction, header: header) + return WebSearchRecentQueryItem(account: account, theme: theme, strings: strings, query: self.query, tapped: { query in + controllerInteraction.setSearchQuery(query) + }, deleted: { query in + controllerInteraction.deleteRecentQuery(query) + }, header: header) } } diff --git a/TelegramUI/WebSearchItem.swift b/TelegramUI/WebSearchItem.swift index 79b8763809..b196d8e2e3 100644 --- a/TelegramUI/WebSearchItem.swift +++ b/TelegramUI/WebSearchItem.swift @@ -42,10 +42,8 @@ final class WebSearchItemNode: GridItemNode { private let imageNode: TransformImageNode private var checkNode: CheckNode? - private var currentImageResource: TelegramMediaResource? - private var currentDimensions: CGSize? - private(set) var item: WebSearchItem? + private var currentDimensions: CGSize? private let fetchStatusDisposable = MetaDisposable() private let fetchDisposable = MetaDisposable() @@ -192,7 +190,6 @@ final class WebSearchItemNode: GridItemNode { self.imageNode.setSignal(imageSignal) } - self.currentImageResource = imageResource self.currentDimensions = imageDimensions if let _ = imageDimensions { self.setNeedsLayout() diff --git a/TelegramUI/WebSearchRecentQueryItem.swift b/TelegramUI/WebSearchRecentQueryItem.swift index 0ae2989487..9fc3e03fc6 100644 --- a/TelegramUI/WebSearchRecentQueryItem.swift +++ b/TelegramUI/WebSearchRecentQueryItem.swift @@ -15,16 +15,18 @@ class WebSearchRecentQueryItem: ListViewItem { let strings: PresentationStrings let account: Account let query: String - let controllerInteraction: WebSearchControllerInteraction + let tapped: (String) -> Void + let deleted: (String) -> Void let header: ListViewItemHeader? - init(account: Account, theme: PresentationTheme, strings: PresentationStrings, query: String, controllerInteraction: WebSearchControllerInteraction, header: ListViewItemHeader) { + init(account: Account, theme: PresentationTheme, strings: PresentationStrings, query: String, tapped: @escaping (String) -> Void, deleted: @escaping (String) -> Void, header: ListViewItemHeader) { self.theme = theme self.strings = strings self.account = account self.query = query - self.controllerInteraction = controllerInteraction + self.tapped = tapped + self.deleted = deleted self.header = header } @@ -62,12 +64,10 @@ class WebSearchRecentQueryItem: ListViewItem { func selected(listView: ListView) { listView.clearHighlightAnimated(true) - self.controllerInteraction.setSearchQuery(self.query) + self.tapped(self.query) } } -private let separatorHeight = 1.0 / UIScreen.main.scale - class WebSearchRecentQueryItemNode: ItemListRevealOptionsItemNode { private let backgroundNode: ASDisplayNode private let separatorNode: ASDisplayNode @@ -220,7 +220,7 @@ class WebSearchRecentQueryItemNode: ItemListRevealOptionsItemNode { if let item = self.item { switch option.key { case RevealOptionKey.delete.rawValue: - item.controllerInteraction.deleteRecentQuery(item.query) + item.deleted(item.query) default: break }