diff --git a/Images.xcassets/Components/Search Bar/Loupe.imageset/Contents.json b/Images.xcassets/Components/Search Bar/Loupe.imageset/Contents.json index 426f9681b7..cd59661c4f 100644 --- a/Images.xcassets/Components/Search Bar/Loupe.imageset/Contents.json +++ b/Images.xcassets/Components/Search Bar/Loupe.imageset/Contents.json @@ -6,12 +6,12 @@ }, { "idiom" : "universal", - "filename" : "SearchBarIconLight@2x.png", + "filename" : "IconSearch@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "SearchBarIconLight@3x.png", + "filename" : "IconSearch@3x.png", "scale" : "3x" } ], diff --git a/Images.xcassets/Components/Search Bar/Loupe.imageset/IconSearch@2x.png b/Images.xcassets/Components/Search Bar/Loupe.imageset/IconSearch@2x.png new file mode 100644 index 0000000000..7ddd1518e9 Binary files /dev/null and b/Images.xcassets/Components/Search Bar/Loupe.imageset/IconSearch@2x.png differ diff --git a/Images.xcassets/Components/Search Bar/Loupe.imageset/IconSearch@3x.png b/Images.xcassets/Components/Search Bar/Loupe.imageset/IconSearch@3x.png new file mode 100644 index 0000000000..ea988e222d Binary files /dev/null and b/Images.xcassets/Components/Search Bar/Loupe.imageset/IconSearch@3x.png differ diff --git a/Images.xcassets/Components/Search Bar/Loupe.imageset/SearchBarIconLight@2x.png b/Images.xcassets/Components/Search Bar/Loupe.imageset/SearchBarIconLight@2x.png deleted file mode 100644 index b942e56d49..0000000000 Binary files a/Images.xcassets/Components/Search Bar/Loupe.imageset/SearchBarIconLight@2x.png and /dev/null differ diff --git a/Images.xcassets/Components/Search Bar/Loupe.imageset/SearchBarIconLight@3x.png b/Images.xcassets/Components/Search Bar/Loupe.imageset/SearchBarIconLight@3x.png deleted file mode 100644 index f73365fabb..0000000000 Binary files a/Images.xcassets/Components/Search Bar/Loupe.imageset/SearchBarIconLight@3x.png and /dev/null differ diff --git a/TelegramUI.xcodeproj/project.pbxproj b/TelegramUI.xcodeproj/project.pbxproj index 4258505cef..84fdc675ef 100644 --- a/TelegramUI.xcodeproj/project.pbxproj +++ b/TelegramUI.xcodeproj/project.pbxproj @@ -57,6 +57,8 @@ 096C98C021787C6700C211FF /* TGBridgeAudioEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 096C98BC21787C6600C211FF /* TGBridgeAudioEncoder.h */; }; 096C98C121787C6700C211FF /* TGBridgeAudioDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 096C98BD21787C6700C211FF /* TGBridgeAudioDecoder.h */; }; 096C98C221787C6700C211FF /* TGBridgeAudioDecoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 096C98BE21787C6700C211FF /* TGBridgeAudioDecoder.mm */; }; + 09749BC321F0DFFD008FDDE9 /* StickersChatInputContextPanelNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09749BC221F0DFFD008FDDE9 /* StickersChatInputContextPanelNode.swift */; }; + 09749BC521F0E024008FDDE9 /* StickersChatInputPanelItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09749BC421F0E024008FDDE9 /* StickersChatInputPanelItem.swift */; }; 09797873210633CD0077D77F /* InstantPageSettingsButtonItemNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09797872210633CD0077D77F /* InstantPageSettingsButtonItemNode.swift */; }; 0979787C210642CB0077D77F /* WebEmbedPlayerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0979787B210642CB0077D77F /* WebEmbedPlayerNode.swift */; }; 0979787E210646C00077D77F /* YoutubeEmbedImplementation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0979787D210646C00077D77F /* YoutubeEmbedImplementation.swift */; }; @@ -1182,6 +1184,8 @@ 096C98BC21787C6600C211FF /* TGBridgeAudioEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGBridgeAudioEncoder.h; sourceTree = ""; }; 096C98BD21787C6700C211FF /* TGBridgeAudioDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGBridgeAudioDecoder.h; sourceTree = ""; }; 096C98BE21787C6700C211FF /* TGBridgeAudioDecoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TGBridgeAudioDecoder.mm; sourceTree = ""; }; + 09749BC221F0DFFD008FDDE9 /* StickersChatInputContextPanelNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickersChatInputContextPanelNode.swift; sourceTree = ""; }; + 09749BC421F0E024008FDDE9 /* StickersChatInputPanelItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickersChatInputPanelItem.swift; sourceTree = ""; }; 09797872210633CD0077D77F /* InstantPageSettingsButtonItemNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstantPageSettingsButtonItemNode.swift; sourceTree = ""; }; 0979787B210642CB0077D77F /* WebEmbedPlayerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebEmbedPlayerNode.swift; sourceTree = ""; }; 0979787D210646C00077D77F /* YoutubeEmbedImplementation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YoutubeEmbedImplementation.swift; sourceTree = ""; }; @@ -2912,6 +2916,8 @@ children = ( D049EAE11E447AD500A2CD3A /* HorizontalStickersChatContextPanelNode.swift */, D049EAE31E44949F00A2CD3A /* HorizontalStickerGridItem.swift */, + 09749BC221F0DFFD008FDDE9 /* StickersChatInputContextPanelNode.swift */, + 09749BC421F0E024008FDDE9 /* StickersChatInputPanelItem.swift */, ); name = Stickers; sourceTree = ""; @@ -5168,6 +5174,7 @@ 092F36902157AB46001A9F49 /* ItemListCallListItem.swift in Sources */, D0EC6CC61EB9F58800EBF1C3 /* PresenceStrings.swift in Sources */, D0EC6CC71EB9F58800EBF1C3 /* PeerNotificationSoundStrings.swift in Sources */, + 09749BC321F0DFFD008FDDE9 /* StickersChatInputContextPanelNode.swift in Sources */, D01C06C01FBF118A001561AB /* MessageUtils.swift in Sources */, D0104F281F47171F004E4881 /* InstantPageGalleryController.swift in Sources */, D0EC6CC81EB9F58800EBF1C3 /* ProgressiveImage.swift in Sources */, @@ -5724,6 +5731,7 @@ D0EEE9A12165585F001292A6 /* DocumentPreviewController.swift in Sources */, D0EC6DCE1EB9F58900EBF1C3 /* HorizontalStickersChatContextPanelNode.swift in Sources */, D0BCC3D2203F0A6C008126C2 /* StringForMessageTimestampStatus.swift in Sources */, + 09749BC521F0E024008FDDE9 /* StickersChatInputPanelItem.swift in Sources */, D0EC6DCF1EB9F58900EBF1C3 /* HorizontalStickerGridItem.swift in Sources */, D0EC6DD01EB9F58900EBF1C3 /* HashtagChatInputContextPanelNode.swift in Sources */, 09B4EE5621A8149C00847FA6 /* PermissionInfoItem.swift in Sources */, diff --git a/TelegramUI/ChatController.swift b/TelegramUI/ChatController.swift index aa4eb01e41..23282e885d 100644 --- a/TelegramUI/ChatController.swift +++ b/TelegramUI/ChatController.swift @@ -5350,6 +5350,8 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal } private func openUrl(_ url: String, concealed: Bool) { + self.commitPurposefulAction() + let openImpl: () -> Void = { [weak self] in guard let strongSelf = self else { return diff --git a/TelegramUI/ChatControllerNode.swift b/TelegramUI/ChatControllerNode.swift index 6d256462ec..142a699ca0 100644 --- a/TelegramUI/ChatControllerNode.swift +++ b/TelegramUI/ChatControllerNode.swift @@ -181,9 +181,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { self.controller = controller self.backgroundNode = ChatBackgroundNode() - //self.backgroundNode.isLayerBacked = true self.backgroundNode.displaysAsynchronously = false - //self.backgroundNode.clipsToBounds = true self.titleAccessoryPanelContainer = ChatControllerTitlePanelNodeContainer() self.titleAccessoryPanelContainer.clipsToBounds = true diff --git a/TelegramUI/ChatListController.swift b/TelegramUI/ChatListController.swift index a4620b8883..5d3f14c89a 100644 --- a/TelegramUI/ChatListController.swift +++ b/TelegramUI/ChatListController.swift @@ -996,7 +996,8 @@ public class ChatListController: TelegramController, KeyShortcutResponder, UIVie markAllChatsAsReadInteractively(transaction: transaction, viewTracker: account.viewTracker) } } - let _ = signal.start(completed: { [weak self] in + let _ = (signal + |> deliverOnMainQueue).start(completed: { [weak self] in self?.donePressed() }) } else if !peerIds.isEmpty { @@ -1034,7 +1035,8 @@ public class ChatListController: TelegramController, KeyShortcutResponder, UIVie progressDisposable.dispose() } } - let _ = signal.start(completed: { + let _ = (signal + |> deliverOnMainQueue).start(completed: { self?.donePressed() }) })) diff --git a/TelegramUI/ChatMessageInteractiveInstantVideoNode.swift b/TelegramUI/ChatMessageInteractiveInstantVideoNode.swift index 4a54a041b1..4fabdd384d 100644 --- a/TelegramUI/ChatMessageInteractiveInstantVideoNode.swift +++ b/TelegramUI/ChatMessageInteractiveInstantVideoNode.swift @@ -507,7 +507,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode { switch status { case let .fetchStatus(fetchStatus): switch fetchStatus { - case let .Fetching(isActive, progress): + case let .Fetching(_, progress): let adjustedProgress = max(progress, 0.027) state = .progress(color: bubbleTheme.mediaOverlayControlForegroundColor, lineWidth: nil, value: CGFloat(adjustedProgress), cancelEnabled: true) case .Local: diff --git a/TelegramUI/ContactListNode.swift b/TelegramUI/ContactListNode.swift index 10a44bae43..4e9f91aa09 100644 --- a/TelegramUI/ContactListNode.swift +++ b/TelegramUI/ContactListNode.swift @@ -641,6 +641,16 @@ private func preparedContactListNodeTransition(account: Account, from fromEntrie break } } + } else { + outer: for entry in toEntries { + switch entry { + case .sort: + shouldFixScroll = true + break outer + default: + break + } + } } var scrollToItem: ListViewScrollToItem? diff --git a/TelegramUI/FetchPhotoLibraryImageResource.swift b/TelegramUI/FetchPhotoLibraryImageResource.swift index c2542531cc..c02eade706 100644 --- a/TelegramUI/FetchPhotoLibraryImageResource.swift +++ b/TelegramUI/FetchPhotoLibraryImageResource.swift @@ -103,18 +103,22 @@ func fetchPhotoLibraryResource(localIdentifier: String) -> Signal Signal<(UIImage, Bool)?, NoError> { +func fetchPhotoLibraryImage(localIdentifier: String, thumbnail: Bool) -> Signal<(UIImage, Bool)?, NoError> { return Signal { subscriber in let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: [localIdentifier], options: nil) let requestId = Atomic(value: RequestId()) if fetchResult.count != 0 { let asset = fetchResult.object(at: 0) let option = PHImageRequestOptions() - option.deliveryMode = .opportunistic + option.deliveryMode = .highQualityFormat + if thumbnail { + option.resizeMode = .fast + } option.isNetworkAccessAllowed = true option.isSynchronous = false - let requestIdValue = PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize, contentMode: .aspectFill, options: option, resultHandler: { (image, info) -> Void in + let targetSize: CGSize = thumbnail ? CGSize(width: 128.0, height: 128.0) : PHImageManagerMaximumSize + let requestIdValue = PHImageManager.default().requestImage(for: asset, targetSize: targetSize, contentMode: .aspectFill, options: option, resultHandler: { (image, info) -> Void in Queue.concurrentDefaultQueue().async { requestId.with { current -> Void in if !current.invalidated { @@ -123,15 +127,8 @@ func fetchPhotoLibraryImage(localIdentifier: String) -> Signal<(UIImage, Bool)?, } } if let image = image { - var isThumbnail = true - if let info = info, let degraded = info[PHImageResultIsDegradedKey] { - isThumbnail = (degraded as AnyObject).boolValue! - } - subscriber.putNext((image, isThumbnail)) - if !isThumbnail { - subscriber.putCompletion() - } - + subscriber.putNext((image, thumbnail)) + subscriber.putCompletion() } } }) diff --git a/TelegramUI/GalleryControllerNode.swift b/TelegramUI/GalleryControllerNode.swift index 9cbd0e576b..726ebed839 100644 --- a/TelegramUI/GalleryControllerNode.swift +++ b/TelegramUI/GalleryControllerNode.swift @@ -8,7 +8,7 @@ class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecog var navigationBar: NavigationBar? let footerNode: GalleryFooterNode var currentThumbnailContainerNode: GalleryThumbnailContainerNode? - var toolbarNode: ASDisplayNode? + var overlayNode: ASDisplayNode? var transitionDataForCentralItem: (() -> ((ASDisplayNode, () -> UIView?)?, (UIView) -> Void)?)? var dismiss: (() -> Void)? @@ -255,10 +255,6 @@ class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecog self.currentThumbnailContainerNode?.alpha = 1.0 }) - if let toolbarNode = self.toolbarNode { - toolbarNode.layer.animatePosition(from: CGPoint(x: 0.0, y: self.bounds.size.height), to: CGPoint(), duration: 0.4, timingFunction: kCAMediaTimingFunctionSpring, additive: true) - } - if animateContent { self.scrollView.layer.animateBounds(from: self.scrollView.layer.bounds.offsetBy(dx: 0.0, dy: -self.scrollView.layer.bounds.size.height), to: self.scrollView.layer.bounds, duration: 0.4, timingFunction: kCAMediaTimingFunctionSpring) } @@ -292,10 +288,6 @@ class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecog intermediateCompletion() }) - if let toolbarNode = self.toolbarNode { - toolbarNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: self.bounds.size.height), duration: 0.25, timingFunction: kCAMediaTimingFunctionLinear, removeOnCompletion: false, additive: true) - } - if animateContent { contentAnimationCompleted = false self.scrollView.layer.animateBounds(from: self.scrollView.layer.bounds, to: self.scrollView.layer.bounds.offsetBy(dx: 0.0, dy: -self.scrollView.layer.bounds.size.height), duration: 0.25, timingFunction: kCAMediaTimingFunctionLinear, removeOnCompletion: false, completion: { _ in @@ -327,8 +319,8 @@ class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecog self.updateDismissTransition(transition) - if let toolbarNode = toolbarNode { - toolbarNode.alpha = transition + if let overlayNode = self.overlayNode { + overlayNode.alpha = transition } } diff --git a/TelegramUI/HorizontalStickerGridItem.swift b/TelegramUI/HorizontalStickerGridItem.swift index a219ae0c2e..5f3276f2b7 100644 --- a/TelegramUI/HorizontalStickerGridItem.swift +++ b/TelegramUI/HorizontalStickerGridItem.swift @@ -60,6 +60,7 @@ final class HorizontalStickerGridItemNode: GridItemNode { super.init() + self.imageNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0) self.addSubnode(self.imageNode) } diff --git a/TelegramUI/HorizontalStickersChatContextPanelNode.swift b/TelegramUI/HorizontalStickersChatContextPanelNode.swift index bb150f6428..79a709373f 100644 --- a/TelegramUI/HorizontalStickersChatContextPanelNode.swift +++ b/TelegramUI/HorizontalStickersChatContextPanelNode.swift @@ -8,6 +8,38 @@ import SwiftSignalKit final class HorizontalStickersChatContextPanelInteraction { var previewedStickerItem: StickerPackItem? } +private func backgroundCenterImage(_ theme: PresentationTheme) -> UIImage? { + return generateImage(CGSize(width: 30.0, height: 82.0), rotatedContext: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setStrokeColor(theme.list.itemPlainSeparatorColor.cgColor) + context.setFillColor(theme.list.plainBackgroundColor.cgColor) + let lineWidth = UIScreenPixel + context.setLineWidth(lineWidth) + + context.translateBy(x: 460.5, y: 364) + let _ = try? drawSvgPath(context, path: "M-490.476836,-365 L-394.167708,-365 L-394.167708,-291.918214 C-394.167708,-291.918214 -383.538396,-291.918214 -397.691655,-291.918214 C-402.778486,-291.918214 -424.555168,-291.918214 -434.037301,-291.918214 C-440.297129,-291.918214 -440.780682,-283.5 -445.999879,-283.5 C-450.393041,-283.5 -452.491241,-291.918214 -456.502636,-291.918214 C-465.083339,-291.918214 -476.209155,-291.918214 -483.779021,-291.918214 C-503.033963,-291.918214 -490.476836,-291.918214 -490.476836,-291.918214 L-490.476836,-365 ") + context.fillPath() + context.translateBy(x: 0.0, y: lineWidth / 2.0) + let _ = try? drawSvgPath(context, path: "M-490.476836,-365 L-394.167708,-365 L-394.167708,-291.918214 C-394.167708,-291.918214 -383.538396,-291.918214 -397.691655,-291.918214 C-402.778486,-291.918214 -424.555168,-291.918214 -434.037301,-291.918214 C-440.297129,-291.918214 -440.780682,-283.5 -445.999879,-283.5 C-450.393041,-283.5 -452.491241,-291.918214 -456.502636,-291.918214 C-465.083339,-291.918214 -476.209155,-291.918214 -483.779021,-291.918214 C-503.033963,-291.918214 -490.476836,-291.918214 -490.476836,-291.918214 L-490.476836,-365 ") + context.strokePath() + context.translateBy(x: -460.5, y: -lineWidth / 2.0 - 364.0) + context.move(to: CGPoint(x: 0.0, y: lineWidth / 2.0)) + context.addLine(to: CGPoint(x: size.width, y: lineWidth / 2.0)) + context.strokePath() + }) +} +private func backgroundLeftImage(_ theme: PresentationTheme) -> UIImage? { + return generateImage(CGSize(width: 8.0, height: 16.0), rotatedContext: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setStrokeColor(theme.list.itemPlainSeparatorColor.cgColor) + context.setFillColor(theme.list.plainBackgroundColor.cgColor) + let lineWidth = UIScreenPixel + context.setLineWidth(lineWidth) + + context.fillEllipse(in: CGRect(origin: CGPoint(), size: CGSize(width: size.height, height: size.height))) + context.strokeEllipse(in: CGRect(origin: CGPoint(x: lineWidth / 2.0, y: lineWidth / 2.0), size: CGSize(width: size.height - lineWidth, height: size.height - lineWidth))) + })?.stretchableImage(withLeftCapWidth: 8, topCapHeight: 8) +} private struct StickerEntry: Identifiable, Comparable { let index: Int @@ -55,12 +87,15 @@ private func preparedGridEntryTransition(account: Account, from fromEntries: [St final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { private var strings: PresentationStrings + private let backgroundLeftNode: ASImageNode + private let backgroundNode: ASImageNode + private let backgroundRightNode: ASImageNode + private let clippingNode: ASDisplayNode private let gridNode: GridNode - private let backgroundNode: ASDisplayNode private var validLayout: (CGSize, CGFloat, CGFloat, ChatPresentationInterfaceState)? - private var currentEntries: [StickerEntry]? - private var queuedTransitions: [(StickerEntryTransition, Bool)] = [] + private var currentEntries: [StickerEntry] = [] + private var queuedTransitions: [StickerEntryTransition] = [] public var controllerInteraction: ChatControllerInteraction? private let stickersInteraction: HorizontalStickersChatContextPanelInteraction @@ -70,22 +105,41 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { override init(account: Account, theme: PresentationTheme, strings: PresentationStrings) { self.strings = strings - self.gridNode = GridNode() - self.gridNode.view.disablesInteractiveTransitionGestureRecognizer = true - self.gridNode.scrollView.alwaysBounceVertical = true + self.backgroundNode = ASImageNode() + self.backgroundNode.displayWithoutProcessing = true + self.backgroundNode.displaysAsynchronously = false + self.backgroundNode.image = backgroundCenterImage(theme) - self.backgroundNode = ASDisplayNode() - self.backgroundNode.backgroundColor = theme.list.plainBackgroundColor + self.backgroundLeftNode = ASImageNode() + self.backgroundLeftNode.displayWithoutProcessing = true + self.backgroundLeftNode.displaysAsynchronously = false + self.backgroundLeftNode.image = backgroundLeftImage(theme) + + self.backgroundRightNode = ASImageNode() + self.backgroundRightNode.displayWithoutProcessing = true + self.backgroundRightNode.displaysAsynchronously = false + self.backgroundRightNode.image = backgroundLeftImage(theme) + self.backgroundRightNode.transform = CATransform3DMakeScale(-1.0, 1.0, 1.0) + + self.clippingNode = ASDisplayNode() + self.clippingNode.clipsToBounds = true + self.gridNode = GridNode() + self.gridNode.transform = CATransform3DMakeRotation(-CGFloat.pi / 2.0, 0.0, 0.0, 1.0) + self.gridNode.view.disablesInteractiveTransitionGestureRecognizer = true self.stickersInteraction = HorizontalStickersChatContextPanelInteraction() super.init(account: account, theme: theme, strings: strings) + self.placement = .overTextInput self.isOpaque = false - self.clipsToBounds = true - self.addSubnode(self.gridNode) - self.gridNode.addSubnode(self.backgroundNode) + self.addSubnode(self.backgroundNode) + self.addSubnode(self.backgroundLeftNode) + self.addSubnode(self.backgroundRightNode) + + self.addSubnode(self.clippingNode) + self.clippingNode.addSubnode(self.gridNode) } override func didLoad() { @@ -99,82 +153,81 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { } if let itemNode = strongSelf.gridNode.itemNodeAtPoint(strongSelf.view.convert(point, to: strongSelf.gridNode.view)) as? HorizontalStickerGridItemNode, let item = itemNode.stickerItem { - return strongSelf.account.postbox.transaction { transaction -> Bool in - return getIsStickerSaved(transaction: transaction, fileId: item.file.fileId) - } - |> deliverOnMainQueue - |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in - if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction { - var menuItems: [PeekControllerMenuItem] = [] - menuItems = [ - PeekControllerMenuItem(title: strongSelf.strings.StickerPack_Send, color: .accent, font: .bold, action: { - controllerInteraction.sendSticker(.standalone(media: item.file), true) - }), - PeekControllerMenuItem(title: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { - if let strongSelf = self { - if isStarred { - let _ = removeSavedSticker(postbox: strongSelf.account.postbox, mediaId: item.file.fileId).start() - } else { - let _ = addSavedSticker(postbox: strongSelf.account.postbox, network: strongSelf.account.network, file: item.file).start() - } + return strongSelf.account.postbox.transaction { transaction -> Bool in + return getIsStickerSaved(transaction: transaction, fileId: item.file.fileId) + } + |> deliverOnMainQueue + |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in + if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction { + var menuItems: [PeekControllerMenuItem] = [] + menuItems = [ + PeekControllerMenuItem(title: strongSelf.strings.StickerPack_Send, color: .accent, font: .bold, action: { + controllerInteraction.sendSticker(.standalone(media: item.file), true) + }), + PeekControllerMenuItem(title: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { + if let strongSelf = self { + if isStarred { + let _ = removeSavedSticker(postbox: strongSelf.account.postbox, mediaId: item.file.fileId).start() + } else { + let _ = addSavedSticker(postbox: strongSelf.account.postbox, network: strongSelf.account.network, file: item.file).start() } - }), - PeekControllerMenuItem(title: strongSelf.strings.StickerPack_ViewPack, color: .accent, action: { - if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction { - loop: for attribute in item.file.attributes { - switch attribute { - case let .Sticker(_, packReference, _): - if let packReference = packReference { - let controller = StickerPackPreviewController(account: strongSelf.account, stickerPack: packReference, parentNavigationController: controllerInteraction.navigationController()) - controller.sendSticker = { file in - if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction { - controllerInteraction.sendSticker(file, true) - } + } + }), + PeekControllerMenuItem(title: strongSelf.strings.StickerPack_ViewPack, color: .accent, action: { + if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction { + loop: for attribute in item.file.attributes { + switch attribute { + case let .Sticker(_, packReference, _): + if let packReference = packReference { + let controller = StickerPackPreviewController(account: strongSelf.account, stickerPack: packReference, parentNavigationController: controllerInteraction.navigationController()) + controller.sendSticker = { file in + if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction { + controllerInteraction.sendSticker(file, true) } - - controllerInteraction.navigationController()?.view.window?.endEditing(true) - controllerInteraction.presentController(controller, nil) } - break loop - default: - break + + controllerInteraction.navigationController()?.view.window?.endEditing(true) + controllerInteraction.presentController(controller, nil) } + break loop + default: + break } } - }), - PeekControllerMenuItem(title: strongSelf.strings.Common_Cancel, color: .accent, action: {}) - ] - return (itemNode, StickerPreviewPeekContent(account: strongSelf.account, item: .pack(item), menu: menuItems)) - } else { - return nil - } + } + }), + PeekControllerMenuItem(title: strongSelf.strings.Common_Cancel, color: .accent, action: {}) + ] + return (itemNode, StickerPreviewPeekContent(account: strongSelf.account, item: .pack(item), menu: menuItems)) + } else { + return nil } + } } } return nil - }, present: { [weak self] content, sourceNode in - if let strongSelf = self { - let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.theme), content: content, sourceNode: { - return sourceNode - }) - strongSelf.interfaceInteraction?.presentGlobalOverlayController(controller, nil) - return controller - } - return nil - }, updateContent: { [weak self] content in - if let strongSelf = self { - var item: StickerPackItem? - if let content = content as? StickerPreviewPeekContent, case let .pack(contentItem) = content.item { - item = contentItem + }, present: { [weak self] content, sourceNode in + if let strongSelf = self { + let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.theme), content: content, sourceNode: { + return sourceNode + }) + strongSelf.interfaceInteraction?.presentGlobalOverlayController(controller, nil) + return controller + } + return nil + }, updateContent: { [weak self] content in + if let strongSelf = self { + var item: StickerPackItem? + if let content = content as? StickerPreviewPeekContent, case let .pack(contentItem) = content.item { + item = contentItem + } + strongSelf.updatePreviewingItem(item: item, animated: true) } - strongSelf.updatePreviewingItem(item: item, animated: true) - } })) } func updateResults(_ results: [TelegramMediaFile]) { - let firstTime = self.currentEntries == nil - let previousEntries = self.currentEntries ?? [] + let previousEntries = self.currentEntries var entries: [StickerEntry] = [] for i in 0 ..< results.count { entries.append(StickerEntry(index: i, file: results[i])) @@ -186,11 +239,11 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { } let transition = preparedGridEntryTransition(account: self.account, from: previousEntries, to: entries, stickersInteraction: self.stickersInteraction, interfaceInteraction: self.interfaceInteraction!) - self.enqueueTransition(transition, firstTime: firstTime) + self.enqueueTransition(transition) } - private func enqueueTransition(_ transition: StickerEntryTransition, firstTime: Bool) { - self.queuedTransitions.append((transition, firstTime)) + private func enqueueTransition(_ transition: StickerEntryTransition) { + self.queuedTransitions.append(transition) if self.validLayout != nil { self.dequeueTransitions() } @@ -198,71 +251,71 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode { private func dequeueTransitions() { while !self.queuedTransitions.isEmpty { - 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 }) - } - } - }) + 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: { _ in }) } } - private func topInsetForLayout(size: CGSize) -> CGFloat { - let minimumItemHeights: CGFloat = floor(66.0 * 1.5) - - return max(size.height - minimumItemHeights, 0.0) - } - override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { - let hadValidLayout = self.validLayout != nil + let sideInsets: CGFloat = 10.0 + leftInset + let contentWidth = min(size.width - sideInsets - sideInsets, max(24.0, CGFloat(self.currentEntries.count) * 66.0 + 6.0)) + + var contentLeftInset: CGFloat = 40.0 + var leftOffset: CGFloat = 0.0 + if sideInsets + floor(contentWidth / 2.0) < sideInsets + contentLeftInset + 15.0 { + let updatedLeftInset = sideInsets + floor(contentWidth / 2.0) - 15.0 - sideInsets + leftOffset = contentLeftInset - updatedLeftInset + contentLeftInset = updatedLeftInset + } + + let backgroundFrame = CGRect(origin: CGPoint(x: sideInsets + leftOffset, y: size.height - 82.0 + 4.0), size: CGSize(width: contentWidth, height: 82.0)) + let backgroundLeftFrame = CGRect(origin: backgroundFrame.origin, size: CGSize(width: contentLeftInset, height: backgroundFrame.size.height - 10.0 + UIScreenPixel)) + let backgroundCenterFrame = CGRect(origin: CGPoint(x: backgroundLeftFrame.maxX, y: backgroundFrame.minY), size: CGSize(width: 30.0, height: 82.0)) + let backgroundRightFrame = CGRect(origin: CGPoint(x: backgroundCenterFrame.maxX, y: backgroundFrame.minY), size: CGSize(width: max(0.0, backgroundFrame.minX + backgroundFrame.size.width - backgroundCenterFrame.maxX), height: backgroundFrame.size.height - 10.0 + UIScreenPixel)) + transition.updateFrame(node: self.backgroundLeftNode, frame: backgroundLeftFrame) + transition.updateFrame(node: self.backgroundNode, frame: backgroundCenterFrame) + transition.updateFrame(node: self.backgroundRightNode, frame: backgroundRightFrame) + + let gridFrame = CGRect(origin: CGPoint(x: backgroundFrame.minX, y: backgroundFrame.minY + 4.0), size: CGSize(width: backgroundFrame.size.width, height: 66.0)) + transition.updateFrame(node: self.clippingNode, frame: gridFrame) + self.gridNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: gridFrame.size.height, height: gridFrame.size.width)) + + let gridBounds = self.gridNode.bounds + self.gridNode.bounds = CGRect(x: gridBounds.minX, y: gridBounds.minY, width: gridFrame.size.height, height: gridFrame.size.width) + self.gridNode.position = CGPoint(x: gridFrame.size.width / 2.0, y: gridFrame.size.height / 2.0) + + self.gridNode.transaction(GridNodeTransaction(deleteItems: [], insertItems: [], updateItems: [], scrollToItem: nil, updateLayout: GridNodeUpdateLayout(layout: GridNodeLayout(size: CGSize(width: gridFrame.size.height, height: gridFrame.size.width), insets: UIEdgeInsets(top: 3.0, left: 0.0, bottom: 3.0, right: 0.0), preloadSize: 100.0, type: .fixed(itemSize: CGSize(width: 66.0, height: 66.0), fillWidth: nil, lineSpacing: 0.0, itemSpacing: nil)), transition: .immediate), itemTransition: .immediate, stationaryItems: .all, updateFirstIndexInSectionOffset: nil), completion: { _ in }) + + let dequeue = self.validLayout == nil self.validLayout = (size, leftInset, rightInset, interfaceState) - var insets = UIEdgeInsets() - insets.top = self.topInsetForLayout(size: size) - insets.left = leftInset - insets.right = rightInset - - transition.updateFrame(node: self.gridNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height)) - - let updateSizeAndInsets = GridNodeUpdateLayout(layout: GridNodeLayout(size: size, insets: insets, preloadSize: 100.0, type: .fixed(itemSize: CGSize(width: 66.0, height: 66.0), fillWidth: nil, lineSpacing: 0.0, itemSpacing: nil)), transition: transition) - - self.gridNode.transaction(GridNodeTransaction(deleteItems: [], insertItems: [], updateItems: [], scrollToItem: nil, updateLayout: updateSizeAndInsets, itemTransition: .immediate, stationaryItems: .all, updateFirstIndexInSectionOffset: nil), completion: { [weak self] _ in - if let strongSelf = self { - strongSelf.backgroundNode.frame = CGRect(x: 0.0, y: 0.0, width: size.width, height: strongSelf.gridNode.scrollView.contentSize.height + 500.0) - } - }) - - if !hadValidLayout { + if dequeue { + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) self.dequeueTransitions() } if self.theme !== interfaceState.theme { self.theme = interfaceState.theme + self.backgroundNode.image = backgroundCenterImage(theme) + self.backgroundLeftNode.image = backgroundLeftImage(theme) + self.backgroundRightNode.image = backgroundLeftImage(theme) + // if let currentEntries = self.currentEntries { + // self.updateToEntries(entries: currentEntries, forceUpdate: true) + // } } } override func animateOut(completion: @escaping () -> Void) { - 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 + self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { _ in completion() }) } override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { - let convertedPoint = self.convert(point, to: self.gridNode) - if convertedPoint.y > 0.0 { - return super.hitTest(point, with: event) - } else { + if !self.clippingNode.frame.contains(point) { return nil } + return super.hitTest(point, with: event) } private func updatePreviewingItem(item: StickerPackItem?, animated: Bool) { diff --git a/TelegramUI/PhotoResources.swift b/TelegramUI/PhotoResources.swift index 7548419401..98a7c9763e 100644 --- a/TelegramUI/PhotoResources.swift +++ b/TelegramUI/PhotoResources.swift @@ -2196,7 +2196,7 @@ func instantPageImageFile(account: Account, fileReference: FileMediaReference, f } } -private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], autoFetchFullSize: Bool = false) -> Signal<(Data?, Data?, Bool), NoError> { +private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], alwaysShowThumbnailFirst: Bool = false, autoFetchFullSize: Bool = false) -> Signal<(Data?, Data?, Bool), NoError> { if let smallestRepresentation = smallestImageRepresentation(representations.map({ $0.representation })), let largestRepresentation = largestImageRepresentation(representations.map({ $0.representation })), let smallestIndex = representations.index(where: { $0.representation == smallestRepresentation }), let largestIndex = representations.index(where: { $0.representation == largestRepresentation }) { let maybeFullSize = account.postbox.mediaBox.resourceData(largestRepresentation.resource) let decodedThumbnailData = fileReference?.media.immediateThumbnailData.flatMap(decodeTinyThumbnail) @@ -2206,7 +2206,12 @@ private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaR |> mapToSignal { maybeData -> Signal<(Data?, Data?, Bool), NoError> in if maybeData.complete { let loadedData: Data? = try? Data(contentsOf: URL(fileURLWithPath: maybeData.path), options: []) - return .single((nil, loadedData, true)) + if alwaysShowThumbnailFirst, let decodedThumbnailData = decodedThumbnailData { + return .single((decodedThumbnailData, nil, false)) + |> then(.single((nil, loadedData, true))) + } else { + return .single((nil, loadedData, true)) + } } else { let fetchedThumbnail: Signal if let _ = decodedThumbnailData { @@ -2269,8 +2274,8 @@ private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaR } } -func chatAvatarGalleryPhoto(account: Account, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], autoFetchFullSize: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { - let signal = avatarGalleryPhotoDatas(account: account, fileReference: fileReference, representations: representations, autoFetchFullSize: autoFetchFullSize) +func chatAvatarGalleryPhoto(account: Account, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], alwaysShowThumbnailFirst: Bool = false, autoFetchFullSize: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { + let signal = avatarGalleryPhotoDatas(account: account, fileReference: fileReference, representations: representations, alwaysShowThumbnailFirst: alwaysShowThumbnailFirst, autoFetchFullSize: autoFetchFullSize) return signal |> map { (thumbnailData, fullSizeData, fullSizeComplete) in @@ -2794,7 +2799,10 @@ func playerAlbumArt(postbox: Postbox, fileReference: FileMediaReference?, albumA } func photoWallpaper(postbox: Postbox, photoLibraryResource: PhotoLibraryMediaResource) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { - return fetchPhotoLibraryImage(localIdentifier: photoLibraryResource.localIdentifier) + let thumbnail = fetchPhotoLibraryImage(localIdentifier: photoLibraryResource.localIdentifier, thumbnail: true) + let fullSize = fetchPhotoLibraryImage(localIdentifier: photoLibraryResource.localIdentifier, thumbnail: false) + + return (thumbnail |> then(fullSize)) |> map { result in var sourceImage = result?.0 let isThumbnail = result?.1 ?? false @@ -2802,7 +2810,7 @@ func photoWallpaper(postbox: Postbox, photoLibraryResource: PhotoLibraryMediaRes return { arguments in let context = DrawingContext(size: arguments.drawingSize, scale: 1.0, clear: true) - var dimensions = sourceImage?.size + let dimensions = sourceImage?.size if let thumbnailImage = sourceImage?.cgImage, isThumbnail { var fittedSize = arguments.imageSize diff --git a/TelegramUI/PresentationStrings.swift b/TelegramUI/PresentationStrings.swift index 660d690a12..8a9cba1fc4 100644 --- a/TelegramUI/PresentationStrings.swift +++ b/TelegramUI/PresentationStrings.swift @@ -2403,1082 +2403,1085 @@ public final class PresentationStrings { } public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2112]! } public var WallpaperColors_Title: String { return self._s[2113]! } - public var GroupPermission_Duration: String { return self._s[2114]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2114]! } + public var GroupPermission_Duration: String { return self._s[2115]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2115]!, self._r[2115]!, [_0]) + return formatWithArgumentRanges(self._s[2116]!, self._r[2116]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2116]! } - public var Username_Placeholder: String { return self._s[2117]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2118]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2119]! } - public var Passport_PasswordDescription: String { return self._s[2121]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2122]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2123]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2124]! } - public var Conversation_ContextMenuMore: String { return self._s[2125]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2126]! } - public var CallSettings_TabIcon: String { return self._s[2127]! } - public var KeyCommand_Find: String { return self._s[2128]! } - public var Message_PinnedGame: String { return self._s[2129]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2130]! } - public var Login_CallRequestState2: String { return self._s[2132]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2134]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2117]! } + public var Username_Placeholder: String { return self._s[2118]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2119]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2120]! } + public var Passport_PasswordDescription: String { return self._s[2122]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2123]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2124]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2125]! } + public var Conversation_ContextMenuMore: String { return self._s[2126]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2127]! } + public var CallSettings_TabIcon: String { return self._s[2128]! } + public var KeyCommand_Find: String { return self._s[2129]! } + public var Message_PinnedGame: String { return self._s[2130]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2131]! } + public var Login_CallRequestState2: String { return self._s[2133]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2135]! } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2136]!, self._r[2136]!, [_0]) + return formatWithArgumentRanges(self._s[2137]!, self._r[2137]!, [_0]) } - public var WallpaperPreview_Blurred: String { return self._s[2137]! } - public var Conversation_InstantPagePreview: String { return self._s[2138]! } + public var WallpaperPreview_Blurred: String { return self._s[2138]! } + public var Conversation_InstantPagePreview: String { return self._s[2139]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2139]!, self._r[2139]!, [_0]) + return formatWithArgumentRanges(self._s[2140]!, self._r[2140]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2142]! } - public var WallpaperSearch_ColorRed: String { return self._s[2143]! } - public var GroupPermission_NoPinMessages: String { return self._s[2144]! } - public var Passport_Language_es: String { return self._s[2145]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2147]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2148]! } + public var SecretTimer_VideoDescription: String { return self._s[2143]! } + public var WallpaperSearch_ColorRed: String { return self._s[2144]! } + public var GroupPermission_NoPinMessages: String { return self._s[2145]! } + public var Passport_Language_es: String { return self._s[2146]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2148]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2149]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2149]!, self._r[2149]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2150]!, self._r[2150]!, [_1, _2]) } - public var WebPreview_GettingLinkInfo: String { return self._s[2150]! } - public var Watch_UserInfo_Unmute: String { return self._s[2151]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2152]! } - public var AccessDenied_CameraRestricted: String { return self._s[2154]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2151]! } + public var Watch_UserInfo_Unmute: String { return self._s[2152]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2153]! } + public var AccessDenied_CameraRestricted: String { return self._s[2155]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2155]!, self._r[2155]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2156]!, self._r[2156]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2157]! } - public var Settings_CopyUsername: String { return self._s[2158]! } - public var Contacts_SearchLabel: String { return self._s[2159]! } - public var Map_OpenInYandexNavigator: String { return self._s[2161]! } - public var PasscodeSettings_EncryptData: String { return self._s[2162]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2163]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2164]! } - public var DialogList_AdNoticeAlert: String { return self._s[2165]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2167]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2168]! } - public var Localization_LanguageCustom: String { return self._s[2169]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2170]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2173]! } - public var Conversation_InfoGroup: String { return self._s[2174]! } - public var Compose_NewMessage: String { return self._s[2175]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2176]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2177]! } + public var ChatList_ReadAll: String { return self._s[2158]! } + public var Settings_CopyUsername: String { return self._s[2159]! } + public var Contacts_SearchLabel: String { return self._s[2160]! } + public var Map_OpenInYandexNavigator: String { return self._s[2162]! } + public var PasscodeSettings_EncryptData: String { return self._s[2163]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2164]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2165]! } + public var DialogList_AdNoticeAlert: String { return self._s[2166]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2168]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2169]! } + public var Localization_LanguageCustom: String { return self._s[2170]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2171]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2174]! } + public var Conversation_InfoGroup: String { return self._s[2175]! } + public var Compose_NewMessage: String { return self._s[2176]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2177]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2178]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2178]!, self._r[2178]!, [_0]) + return formatWithArgumentRanges(self._s[2179]!, self._r[2179]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2179]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2180]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2181]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2182]! } - public var Channel_BlackList_Title: String { return self._s[2183]! } - public var UserInfo_PhoneCall: String { return self._s[2184]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2186]! } - public var State_connecting: String { return self._s[2187]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2180]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2181]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2182]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2183]! } + public var Channel_BlackList_Title: String { return self._s[2184]! } + public var UserInfo_PhoneCall: String { return self._s[2185]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2187]! } + public var State_connecting: String { return self._s[2188]! } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2188]!, self._r[2188]!, [_0]) + return formatWithArgumentRanges(self._s[2189]!, self._r[2189]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2189]! } - public var Passport_Identity_EditPassport: String { return self._s[2190]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2192]! } - public var Localization_EnglishLanguageName: String { return self._s[2193]! } - public var Share_AuthDescription: String { return self._s[2194]! } - public var Passport_Identity_Surname: String { return self._s[2195]! } - public var Compose_TokenListPlaceholder: String { return self._s[2196]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[2197]! } - public var Settings_AboutEmpty: String { return self._s[2198]! } - public var Conversation_Unmute: String { return self._s[2199]! } + public var Notifications_GroupNotifications: String { return self._s[2190]! } + public var Passport_Identity_EditPassport: String { return self._s[2191]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2193]! } + public var Localization_EnglishLanguageName: String { return self._s[2194]! } + public var Share_AuthDescription: String { return self._s[2195]! } + public var Passport_Identity_Surname: String { return self._s[2196]! } + public var Compose_TokenListPlaceholder: String { return self._s[2197]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2198]! } + public var Settings_AboutEmpty: String { return self._s[2199]! } + public var Conversation_Unmute: String { return self._s[2200]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2201]!, self._r[2201]!, [_1]) + return formatWithArgumentRanges(self._s[2202]!, self._r[2202]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[2202]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2204]! } - public var ChatSettings_Appearance: String { return self._s[2205]! } - public var Appearance_PickAccentColor: String { return self._s[2206]! } + public var Login_CodeSentCall: String { return self._s[2203]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2205]! } + public var ChatSettings_Appearance: String { return self._s[2206]! } + public var Appearance_PickAccentColor: String { return self._s[2207]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2207]!, self._r[2207]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2208]!, self._r[2208]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2208]!, self._r[2208]!, [_1]) + return formatWithArgumentRanges(self._s[2209]!, self._r[2209]!, [_1]) } - public var Notification_CallMissed: String { return self._s[2209]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2210]! } - public var ChatAdmins_AdminLabel: String { return self._s[2212]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2213]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[2215]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2216]! } - public var Month_GenJune: String { return self._s[2217]! } - public var Watch_Location_Current: String { return self._s[2218]! } - public var Conversation_TitleMute: String { return self._s[2219]! } + public var Notification_CallMissed: String { return self._s[2210]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2211]! } + public var ChatAdmins_AdminLabel: String { return self._s[2213]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2214]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2216]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2217]! } + public var Month_GenJune: String { return self._s[2218]! } + public var Watch_Location_Current: String { return self._s[2219]! } + public var Conversation_TitleMute: String { return self._s[2220]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2220]!, self._r[2220]!, [_1]) + return formatWithArgumentRanges(self._s[2221]!, self._r[2221]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[2221]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2222]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2222]!, self._r[2222]!, [_0]) + return formatWithArgumentRanges(self._s[2223]!, self._r[2223]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[2223]! } - public var MaskStickerSettings_Info: String { return self._s[2224]! } + public var Call_ReportPlaceholder: String { return self._s[2224]! } + public var MaskStickerSettings_Info: String { return self._s[2225]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2225]!, self._r[2225]!, [_0]) + return formatWithArgumentRanges(self._s[2226]!, self._r[2226]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[2226]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[2228]! } - public var Contacts_ShareTelegram: String { return self._s[2229]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2230]! } - public var Channel_ErrorAccessDenied: String { return self._s[2231]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[2233]! } - public var Call_ConnectionErrorTitle: String { return self._s[2234]! } - public var UserInfo_NotificationsEnable: String { return self._s[2235]! } - public var Tour_Text4: String { return self._s[2238]! } - public var WallpaperSearch_Recent: String { return self._s[2239]! } - public var Profile_MessageLifetime2s: String { return self._s[2241]! } - public var Notification_MessageLifetime2s: String { return self._s[2242]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2227]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2229]! } + public var Contacts_ShareTelegram: String { return self._s[2230]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2231]! } + public var Channel_ErrorAccessDenied: String { return self._s[2232]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2234]! } + public var Call_ConnectionErrorTitle: String { return self._s[2235]! } + public var UserInfo_NotificationsEnable: String { return self._s[2236]! } + public var Tour_Text4: String { return self._s[2239]! } + public var WallpaperSearch_Recent: String { return self._s[2240]! } + public var Profile_MessageLifetime2s: String { return self._s[2242]! } + public var Notification_MessageLifetime2s: String { return self._s[2243]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2243]!, self._r[2243]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2244]!, self._r[2244]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[2244]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[2245]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2246]! } + public var Cache_ClearCache: String { return self._s[2245]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[2246]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2247]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2250]!, self._r[2250]!, [_0]) + return formatWithArgumentRanges(self._s[2251]!, self._r[2251]!, [_0]) } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2252]! } - public var SocksProxySetup_TypeSocks: String { return self._s[2253]! } - public var AutoNightTheme_Title: String { return self._s[2254]! } - public var InstantPage_FeedbackButton: String { return self._s[2255]! } - public var Passport_FieldAddress: String { return self._s[2256]! } - public var Month_ShortMarch: String { return self._s[2257]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2253]! } + public var SocksProxySetup_TypeSocks: String { return self._s[2254]! } + public var AutoNightTheme_Title: String { return self._s[2255]! } + public var InstantPage_FeedbackButton: String { return self._s[2256]! } + public var Passport_FieldAddress: String { return self._s[2257]! } + public var Month_ShortMarch: String { return self._s[2258]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2258]!, self._r[2258]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2259]!, self._r[2259]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2259]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2260]! } - public var Passport_FloodError: String { return self._s[2261]! } - public var SecretGif_Title: String { return self._s[2262]! } - public var Passport_Language_th: String { return self._s[2264]! } - public var Passport_Address_Address: String { return self._s[2265]! } - public var Login_InvalidLastNameError: String { return self._s[2266]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[2267]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[2268]! } - public var ShareMenu_Send: String { return self._s[2269]! } - public var WallpaperSearch_ColorYellow: String { return self._s[2271]! } - public var Month_GenNovember: String { return self._s[2273]! } - public var Checkout_Email: String { return self._s[2275]! } - public var NotificationsSound_Tritone: String { return self._s[2276]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[2278]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2260]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2261]! } + public var Passport_FloodError: String { return self._s[2262]! } + public var SecretGif_Title: String { return self._s[2263]! } + public var Passport_Language_th: String { return self._s[2265]! } + public var Passport_Address_Address: String { return self._s[2266]! } + public var Login_InvalidLastNameError: String { return self._s[2267]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[2268]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[2269]! } + public var ShareMenu_Send: String { return self._s[2270]! } + public var WallpaperSearch_ColorYellow: String { return self._s[2272]! } + public var Month_GenNovember: String { return self._s[2274]! } + public var Checkout_Email: String { return self._s[2276]! } + public var NotificationsSound_Tritone: String { return self._s[2277]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[2279]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2281]!, self._r[2281]!, [_1]) + return formatWithArgumentRanges(self._s[2282]!, self._r[2282]!, [_1]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[2282]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[2283]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2283]!, self._r[2283]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[2284]!, self._r[2284]!, [_1, _1, _1, _2]) } - public var DialogList_You: String { return self._s[2284]! } - public var MediaPicker_Send: String { return self._s[2287]! } - public var Call_AudioRouteSpeaker: String { return self._s[2288]! } - public var Watch_UserInfo_Title: String { return self._s[2289]! } - public var Appearance_AccentColor: String { return self._s[2290]! } + public var DialogList_You: String { return self._s[2285]! } + public var MediaPicker_Send: String { return self._s[2288]! } + public var Call_AudioRouteSpeaker: String { return self._s[2289]! } + public var Watch_UserInfo_Title: String { return self._s[2290]! } + public var Appearance_AccentColor: String { return self._s[2291]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2291]!, self._r[2291]!, [_0]) + return formatWithArgumentRanges(self._s[2292]!, self._r[2292]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2292]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2293]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2293]!, self._r[2293]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2294]!, self._r[2294]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[2294]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[2295]! } - public var Notification_CallOutgoing: String { return self._s[2296]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2297]! } - public var Call_RecordingDisabledMessage: String { return self._s[2298]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2299]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2300]! } - public var Date_DialogDateFormat: String { return self._s[2301]! } - public var WallpaperColors_SetCustomColor: String { return self._s[2302]! } - public var Notifications_InAppNotifications: String { return self._s[2303]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[2295]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[2296]! } + public var Notification_CallOutgoing: String { return self._s[2297]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2298]! } + public var Call_RecordingDisabledMessage: String { return self._s[2299]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2300]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2301]! } + public var Date_DialogDateFormat: String { return self._s[2302]! } + public var WallpaperColors_SetCustomColor: String { return self._s[2303]! } + public var Notifications_InAppNotifications: String { return self._s[2304]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2304]!, self._r[2304]!, [_0]) + return formatWithArgumentRanges(self._s[2305]!, self._r[2305]!, [_0]) } public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2305]!, self._r[2305]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2306]!, self._r[2306]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[2306]! } - public var Conversation_ViewContactDetails: String { return self._s[2307]! } + public var NewContact_Title: String { return self._s[2307]! } + public var Conversation_ViewContactDetails: String { return self._s[2308]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2309]!, self._r[2309]!, [_1]) + return formatWithArgumentRanges(self._s[2310]!, self._r[2310]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2310]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[2311]! } - public var PrivacySettings_Title: String { return self._s[2312]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2315]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[2316]! } - public var Contacts_PhoneNumber: String { return self._s[2317]! } - public var Map_ShowPlaces: String { return self._s[2319]! } - public var ChatAdmins_Title: String { return self._s[2320]! } - public var InstantPage_Reference: String { return self._s[2322]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2311]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[2312]! } + public var PrivacySettings_Title: String { return self._s[2313]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2316]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[2317]! } + public var Contacts_PhoneNumber: String { return self._s[2318]! } + public var Map_ShowPlaces: String { return self._s[2320]! } + public var ChatAdmins_Title: String { return self._s[2321]! } + public var InstantPage_Reference: String { return self._s[2323]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2323]!, self._r[2323]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2324]!, self._r[2324]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[2324]! } - public var Watch_UserInfo_Block: String { return self._s[2325]! } - public var ChatSettings_Stickers: String { return self._s[2326]! } - public var ChatSettings_DownloadInBackground: String { return self._s[2327]! } + public var Camera_FlashOff: String { return self._s[2325]! } + public var Watch_UserInfo_Block: String { return self._s[2326]! } + public var ChatSettings_Stickers: String { return self._s[2327]! } + public var ChatSettings_DownloadInBackground: String { return self._s[2328]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2328]!, self._r[2328]!, [_0]) + return formatWithArgumentRanges(self._s[2329]!, self._r[2329]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[2329]! } - public var Login_CheckOtherSessionMessages: String { return self._s[2330]! } - public var AutoDownloadSettings_Cellular: String { return self._s[2331]! } + public var Settings_ViewPhoto: String { return self._s[2330]! } + public var Login_CheckOtherSessionMessages: String { return self._s[2331]! } + public var AutoDownloadSettings_Cellular: String { return self._s[2332]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2333]!, self._r[2333]!, [_0]) + return formatWithArgumentRanges(self._s[2334]!, self._r[2334]!, [_0]) } - public var Privacy_DeleteDrafts: String { return self._s[2334]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2335]! } + public var Privacy_DeleteDrafts: String { return self._s[2335]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2336]! } public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2336]!, self._r[2336]!, [_0]) + return formatWithArgumentRanges(self._s[2337]!, self._r[2337]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[2337]! } - public var DialogList_SavedMessages: String { return self._s[2338]! } - public var GroupInfo_UpgradeButton: String { return self._s[2339]! } - public var DialogList_Pin: String { return self._s[2340]! } + public var DialogList_SavedMessagesHelp: String { return self._s[2338]! } + public var DialogList_SavedMessages: String { return self._s[2339]! } + public var GroupInfo_UpgradeButton: String { return self._s[2340]! } + public var DialogList_Pin: String { return self._s[2341]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2341]!, self._r[2341]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2342]!, self._r[2342]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2342]!, self._r[2342]!, [_0]) + return formatWithArgumentRanges(self._s[2343]!, self._r[2343]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[2343]! } - public var UserInfo_NotificationsDisable: String { return self._s[2344]! } - public var Paint_Outlined: String { return self._s[2345]! } - public var Activity_PlayingGame: String { return self._s[2346]! } - public var SearchImages_NoImagesFound: String { return self._s[2347]! } - public var SocksProxySetup_ProxyType: String { return self._s[2348]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[2350]! } - public var Settings_AppLanguage: String { return self._s[2351]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[2352]! } - public var Common_ChoosePhoto: String { return self._s[2353]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[2344]! } + public var UserInfo_NotificationsDisable: String { return self._s[2345]! } + public var Paint_Outlined: String { return self._s[2346]! } + public var Activity_PlayingGame: String { return self._s[2347]! } + public var SearchImages_NoImagesFound: String { return self._s[2348]! } + public var SocksProxySetup_ProxyType: String { return self._s[2349]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[2351]! } + public var Settings_AppLanguage: String { return self._s[2352]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[2353]! } + public var Common_ChoosePhoto: String { return self._s[2354]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2354]!, self._r[2354]!, [_1]) + return formatWithArgumentRanges(self._s[2355]!, self._r[2355]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[2355]! } - public var Activity_UploadingVideo: String { return self._s[2356]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2357]! } - public var NetworkUsageSettings_Wifi: String { return self._s[2358]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[2359]! } - public var Checkout_PayWithTouchId: String { return self._s[2360]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[2356]! } + public var Activity_UploadingVideo: String { return self._s[2357]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2358]! } + public var NetworkUsageSettings_Wifi: String { return self._s[2359]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[2360]! } + public var Checkout_PayWithTouchId: String { return self._s[2361]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2362]!, self._r[2362]!, [_1]) + return formatWithArgumentRanges(self._s[2363]!, self._r[2363]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[2363]! } + public var Notifications_ExceptionsNone: String { return self._s[2364]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2364]!, self._r[2364]!, [_0]) + return formatWithArgumentRanges(self._s[2365]!, self._r[2365]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2365]!, self._r[2365]!, [_1]) + return formatWithArgumentRanges(self._s[2366]!, self._r[2366]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[2367]! } - public var Passport_Address_Region: String { return self._s[2370]! } - public var ChatList_DeleteChat: String { return self._s[2371]! } - public var PhotoEditor_TiltShift: String { return self._s[2372]! } - public var Settings_FAQ_URL: String { return self._s[2373]! } - public var Passport_Language_sl: String { return self._s[2374]! } - public var Settings_PrivacySettings: String { return self._s[2376]! } - public var SharedMedia_TitleLink: String { return self._s[2377]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[2378]! } - public var Settings_SetProfilePhoto: String { return self._s[2379]! } - public var Channel_About_Help: String { return self._s[2380]! } - public var Contacts_PermissionsEnable: String { return self._s[2381]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[2382]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[2384]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[2385]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[2387]! } - public var Map_OpenInYandexMaps: String { return self._s[2389]! } - public var PhotoEditor_SaturationTool: String { return self._s[2390]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[2368]! } + public var Passport_Address_Region: String { return self._s[2371]! } + public var ChatList_DeleteChat: String { return self._s[2372]! } + public var PhotoEditor_TiltShift: String { return self._s[2373]! } + public var Settings_FAQ_URL: String { return self._s[2374]! } + public var Passport_Language_sl: String { return self._s[2375]! } + public var Settings_PrivacySettings: String { return self._s[2377]! } + public var SharedMedia_TitleLink: String { return self._s[2378]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[2379]! } + public var Settings_SetProfilePhoto: String { return self._s[2380]! } + public var Channel_About_Help: String { return self._s[2381]! } + public var Contacts_PermissionsEnable: String { return self._s[2382]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[2383]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[2385]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[2386]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[2388]! } + public var Map_OpenInYandexMaps: String { return self._s[2390]! } + public var PhotoEditor_SaturationTool: String { return self._s[2391]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2391]!, self._r[2391]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2392]!, self._r[2392]!, [_1, _2]) } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2392]! } - public var Appearance_TextSize: String { return self._s[2393]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2393]! } + public var Appearance_TextSize: String { return self._s[2394]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2394]!, self._r[2394]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2395]!, self._r[2395]!, [_1, "\(_2)"]) } - public var Channel_Username_InvalidTooShort: String { return self._s[2396]! } + public var Channel_Username_InvalidTooShort: String { return self._s[2397]! } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2397]!, self._r[2397]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2398]!, self._r[2398]!, [_1, _2, _3]) } - public var Passport_PassportInformation: String { return self._s[2400]! } - public var WatchRemote_AlertTitle: String { return self._s[2401]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2402]! } - public var ConvertToSupergroup_HelpText: String { return self._s[2404]! } + public var Passport_PassportInformation: String { return self._s[2401]! } + public var WatchRemote_AlertTitle: String { return self._s[2402]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2403]! } + public var ConvertToSupergroup_HelpText: String { return self._s[2405]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2405]!, self._r[2405]!, [_0]) + return formatWithArgumentRanges(self._s[2406]!, self._r[2406]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2406]!, self._r[2406]!, [_1]) + return formatWithArgumentRanges(self._s[2407]!, self._r[2407]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2407]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2409]! } - public var AccessDenied_CameraDisabled: String { return self._s[2410]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2408]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2410]! } + public var AccessDenied_CameraDisabled: String { return self._s[2411]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2411]!, self._r[2411]!, [_0]) + return formatWithArgumentRanges(self._s[2412]!, self._r[2412]!, [_0]) } - public var PhotoEditor_ContrastTool: String { return self._s[2414]! } + public var PhotoEditor_ContrastTool: String { return self._s[2415]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2415]!, self._r[2415]!, [_1]) + return formatWithArgumentRanges(self._s[2416]!, self._r[2416]!, [_1]) } - public var DialogList_Draft: String { return self._s[2416]! } - public var Privacy_TopPeersDelete: String { return self._s[2418]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[2419]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2420]! } - public var WebSearch_RecentSectionClear: String { return self._s[2421]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[2423]! } - public var Common_Done: String { return self._s[2425]! } - public var AuthSessions_EmptyText: String { return self._s[2426]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[2427]! } - public var Tour_Title5: String { return self._s[2428]! } + public var DialogList_Draft: String { return self._s[2417]! } + public var Privacy_TopPeersDelete: String { return self._s[2419]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[2420]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2421]! } + public var WebSearch_RecentSectionClear: String { return self._s[2422]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[2424]! } + public var Common_Done: String { return self._s[2426]! } + public var AuthSessions_EmptyText: String { return self._s[2427]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[2428]! } + public var Tour_Title5: String { return self._s[2429]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2429]!, self._r[2429]!, [_0]) + return formatWithArgumentRanges(self._s[2430]!, self._r[2430]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2430]! } - public var Conversation_LinkDialogSave: String { return self._s[2431]! } - public var GroupInfo_ActionRestrict: String { return self._s[2432]! } - public var Checkout_Title: String { return self._s[2433]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[2436]! } - public var Notification_RenamedGroup: String { return self._s[2437]! } - public var Checkout_PayWithFaceId: String { return self._s[2438]! } - public var Channel_BanList_BlockedTitle: String { return self._s[2439]! } - public var Checkout_WebConfirmation_Title: String { return self._s[2441]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[2442]! } - public var Profile_AddToExisting: String { return self._s[2444]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2431]! } + public var Conversation_LinkDialogSave: String { return self._s[2432]! } + public var GroupInfo_ActionRestrict: String { return self._s[2433]! } + public var Checkout_Title: String { return self._s[2434]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[2437]! } + public var Notification_RenamedGroup: String { return self._s[2438]! } + public var Checkout_PayWithFaceId: String { return self._s[2439]! } + public var Channel_BanList_BlockedTitle: String { return self._s[2440]! } + public var Checkout_WebConfirmation_Title: String { return self._s[2442]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[2443]! } + public var Profile_AddToExisting: String { return self._s[2445]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2445]!, self._r[2445]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2446]!, self._r[2446]!, [_0, _1]) } - public var Cache_Files: String { return self._s[2447]! } - public var Permissions_PrivacyPolicy: String { return self._s[2448]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[2449]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2450]! } - public var Calls_NoCallsPlaceholder: String { return self._s[2453]! } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2454]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2456]! } + public var Cache_Files: String { return self._s[2448]! } + public var Permissions_PrivacyPolicy: String { return self._s[2449]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[2450]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2451]! } + public var Calls_NoCallsPlaceholder: String { return self._s[2454]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2455]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2457]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2457]!, self._r[2457]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2458]!, self._r[2458]!, [_1, _2, _3]) } - public var Passport_FieldAddressHelp: String { return self._s[2458]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2459]! } + public var Passport_FieldAddressHelp: String { return self._s[2459]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2460]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2460]!, self._r[2460]!, [_0]) + return formatWithArgumentRanges(self._s[2461]!, self._r[2461]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[2461]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[2463]! } - public var Login_UnknownError: String { return self._s[2464]! } - public var Group_UpgradeNoticeText2: String { return self._s[2466]! } - public var Watch_Compose_AddContact: String { return self._s[2467]! } - public var Web_Error: String { return self._s[2468]! } - public var Profile_MessageLifetime1h: String { return self._s[2469]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2470]! } - public var Channel_Username_CheckingUsername: String { return self._s[2471]! } - public var Channel_AboutItem: String { return self._s[2472]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2474]! } - public var GroupInfo_SharedMedia: String { return self._s[2475]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[2462]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[2464]! } + public var Login_UnknownError: String { return self._s[2465]! } + public var Group_UpgradeNoticeText2: String { return self._s[2467]! } + public var Watch_Compose_AddContact: String { return self._s[2468]! } + public var Web_Error: String { return self._s[2469]! } + public var Profile_MessageLifetime1h: String { return self._s[2470]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2471]! } + public var Channel_Username_CheckingUsername: String { return self._s[2472]! } + public var Channel_AboutItem: String { return self._s[2473]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2475]! } + public var GroupInfo_SharedMedia: String { return self._s[2476]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2476]!, self._r[2476]!, [_1]) + return formatWithArgumentRanges(self._s[2477]!, self._r[2477]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[2477]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2478]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[2479]! } - public var CreatePoll_AddOption: String { return self._s[2480]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[2481]! } - public var Group_UpgradeNoticeHeader: String { return self._s[2482]! } - public var Channel_Management_AddModerator: String { return self._s[2483]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[2484]! } - public var NotificationsSound_Hello: String { return self._s[2485]! } - public var SocksProxySetup_SavedProxies: String { return self._s[2486]! } - public var Channel_Stickers_Placeholder: String { return self._s[2488]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[2478]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2479]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[2480]! } + public var CreatePoll_AddOption: String { return self._s[2481]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[2482]! } + public var Group_UpgradeNoticeHeader: String { return self._s[2483]! } + public var Channel_Management_AddModerator: String { return self._s[2484]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[2485]! } + public var NotificationsSound_Hello: String { return self._s[2486]! } + public var SocksProxySetup_SavedProxies: String { return self._s[2487]! } + public var Channel_Stickers_Placeholder: String { return self._s[2489]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2489]!, self._r[2489]!, [_0]) + return formatWithArgumentRanges(self._s[2490]!, self._r[2490]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[2490]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[2491]! } - public var ContactInfo_BirthdayLabel: String { return self._s[2492]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[2493]! } - public var AutoDownloadSettings_Channels: String { return self._s[2494]! } - public var Passport_Language_mn: String { return self._s[2495]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[2498]! } - public var Passport_Language_ja: String { return self._s[2500]! } - public var Settings_About_Title: String { return self._s[2501]! } - public var Settings_NotificationsAndSounds: String { return self._s[2502]! } - public var ChannelInfo_DeleteGroup: String { return self._s[2503]! } - public var Settings_BlockedUsers: String { return self._s[2504]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[2491]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[2492]! } + public var ContactInfo_BirthdayLabel: String { return self._s[2493]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[2494]! } + public var AutoDownloadSettings_Channels: String { return self._s[2495]! } + public var Passport_Language_mn: String { return self._s[2496]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[2499]! } + public var Passport_Language_ja: String { return self._s[2501]! } + public var Settings_About_Title: String { return self._s[2502]! } + public var Settings_NotificationsAndSounds: String { return self._s[2503]! } + public var ChannelInfo_DeleteGroup: String { return self._s[2504]! } + public var Settings_BlockedUsers: String { return self._s[2505]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2505]!, self._r[2505]!, [_0]) + return formatWithArgumentRanges(self._s[2506]!, self._r[2506]!, [_0]) } - public var Passport_Address_AddResidentialAddress: String { return self._s[2506]! } - public var Channel_Username_Title: String { return self._s[2507]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[2507]! } + public var Channel_Username_Title: String { return self._s[2508]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2508]!, self._r[2508]!, [_0]) + return formatWithArgumentRanges(self._s[2509]!, self._r[2509]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[2510]! } - public var AppleWatch_Title: String { return self._s[2511]! } - public var Activity_RecordingVideoMessage: String { return self._s[2512]! } - public var Weekday_Saturday: String { return self._s[2513]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[2514]! } - public var Profile_CreateEncryptedChatError: String { return self._s[2515]! } - public var Common_Next: String { return self._s[2517]! } - public var Channel_Stickers_YourStickers: String { return self._s[2519]! } - public var Call_AudioRouteHeadphones: String { return self._s[2520]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[2522]! } - public var Watch_Contacts_NoResults: String { return self._s[2524]! } - public var PhotoEditor_TintTool: String { return self._s[2527]! } - public var LoginPassword_ResetAccount: String { return self._s[2529]! } - public var Settings_SavedMessages: String { return self._s[2530]! } - public var StickerPack_Add: String { return self._s[2531]! } - public var Your_cards_number_is_invalid: String { return self._s[2532]! } - public var Checkout_TotalAmount: String { return self._s[2533]! } + public var AttachmentMenu_File: String { return self._s[2511]! } + public var AppleWatch_Title: String { return self._s[2512]! } + public var Activity_RecordingVideoMessage: String { return self._s[2513]! } + public var Weekday_Saturday: String { return self._s[2514]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[2515]! } + public var Profile_CreateEncryptedChatError: String { return self._s[2516]! } + public var Common_Next: String { return self._s[2518]! } + public var Channel_Stickers_YourStickers: String { return self._s[2520]! } + public var Call_AudioRouteHeadphones: String { return self._s[2521]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[2523]! } + public var Watch_Contacts_NoResults: String { return self._s[2525]! } + public var PhotoEditor_TintTool: String { return self._s[2528]! } + public var LoginPassword_ResetAccount: String { return self._s[2530]! } + public var Settings_SavedMessages: String { return self._s[2531]! } + public var StickerPack_Add: String { return self._s[2532]! } + public var Your_cards_number_is_invalid: String { return self._s[2533]! } + public var Checkout_TotalAmount: String { return self._s[2534]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2534]!, self._r[2534]!, [_0]) + return formatWithArgumentRanges(self._s[2535]!, self._r[2535]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2535]!, self._r[2535]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2536]!, self._r[2536]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[2536]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[2537]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2538]!, self._r[2538]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2539]!, self._r[2539]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2539]!, self._r[2539]!, [_0]) + return formatWithArgumentRanges(self._s[2540]!, self._r[2540]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[2540]! } - public var StickerPack_Share: String { return self._s[2541]! } - public var Passport_DeleteAddress: String { return self._s[2542]! } - public var Settings_Passport: String { return self._s[2543]! } - public var SharedMedia_EmptyFilesText: String { return self._s[2544]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[2545]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[2546]! } - public var Contacts_PermissionsText: String { return self._s[2547]! } - public var Group_Setup_HistoryVisible: String { return self._s[2548]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[2550]! } - public var SocksProxySetup_Title: String { return self._s[2551]! } - public var Notification_Mute1h: String { return self._s[2552]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[2541]! } + public var StickerPack_Share: String { return self._s[2542]! } + public var Passport_DeleteAddress: String { return self._s[2543]! } + public var Settings_Passport: String { return self._s[2544]! } + public var SharedMedia_EmptyFilesText: String { return self._s[2545]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[2546]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[2547]! } + public var Contacts_PermissionsText: String { return self._s[2548]! } + public var Group_Setup_HistoryVisible: String { return self._s[2549]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[2551]! } + public var SocksProxySetup_Title: String { return self._s[2552]! } + public var Notification_Mute1h: String { return self._s[2553]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2553]!, self._r[2553]!, [_0]) + return formatWithArgumentRanges(self._s[2554]!, self._r[2554]!, [_0]) } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2554]!, self._r[2554]!, [_1]) + return formatWithArgumentRanges(self._s[2555]!, self._r[2555]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[2555]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2558]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[2560]! } - public var DialogList_NoMessagesText: String { return self._s[2561]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[2562]! } - public var Privacy_Calls_P2PHelp: String { return self._s[2563]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[2565]! } - public var Common_TakePhotoOrVideo: String { return self._s[2566]! } - public var Call_StatusBusy: String { return self._s[2567]! } - public var Conversation_PinnedMessage: String { return self._s[2568]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[2569]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[2570]! } - public var AppleWatch_ReplyPresets: String { return self._s[2571]! } - public var Passport_DiscardMessageDescription: String { return self._s[2573]! } - public var Login_NetworkError: String { return self._s[2574]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[2556]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2559]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[2561]! } + public var DialogList_NoMessagesText: String { return self._s[2562]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[2563]! } + public var Privacy_Calls_P2PHelp: String { return self._s[2564]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[2566]! } + public var Common_TakePhotoOrVideo: String { return self._s[2567]! } + public var Call_StatusBusy: String { return self._s[2568]! } + public var Conversation_PinnedMessage: String { return self._s[2569]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[2570]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[2571]! } + public var AppleWatch_ReplyPresets: String { return self._s[2572]! } + public var Passport_DiscardMessageDescription: String { return self._s[2574]! } + public var Login_NetworkError: String { return self._s[2575]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2575]!, self._r[2575]!, [_0]) - } - public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2576]!, self._r[2576]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[2577]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2579]! } + public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2577]!, self._r[2577]!, [_0]) + } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[2578]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2580]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2581]!, self._r[2581]!, [_0]) + return formatWithArgumentRanges(self._s[2582]!, self._r[2582]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[2582]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[2584]! } - public var ConversationMedia_Title: String { return self._s[2585]! } - public var EncryptionKey_Title: String { return self._s[2587]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[2588]! } - public var Notification_Exceptions_AddException: String { return self._s[2589]! } - public var Profile_MessageLifetime1m: String { return self._s[2590]! } + public var Call_ConnectionErrorMessage: String { return self._s[2583]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[2585]! } + public var ConversationMedia_Title: String { return self._s[2586]! } + public var EncryptionKey_Title: String { return self._s[2588]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[2589]! } + public var Notification_Exceptions_AddException: String { return self._s[2590]! } + public var Profile_MessageLifetime1m: String { return self._s[2591]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2591]!, self._r[2591]!, [_1]) + return formatWithArgumentRanges(self._s[2592]!, self._r[2592]!, [_1]) } - public var Month_GenMay: String { return self._s[2592]! } + public var Month_GenMay: String { return self._s[2593]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2593]!, self._r[2593]!, [_0]) + return formatWithArgumentRanges(self._s[2594]!, self._r[2594]!, [_0]) } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2594]! } - public var Conversation_EmptyPlaceholder: String { return self._s[2596]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[2597]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[2598]! } - public var Camera_TapAndHoldForVideo: String { return self._s[2599]! } - public var Channel_JoinChannel: String { return self._s[2601]! } - public var Appearance_Animations: String { return self._s[2604]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2595]! } + public var Conversation_EmptyPlaceholder: String { return self._s[2597]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[2598]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[2599]! } + public var Camera_TapAndHoldForVideo: String { return self._s[2600]! } + public var Channel_JoinChannel: String { return self._s[2602]! } + public var Appearance_Animations: String { return self._s[2605]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2606]!, self._r[2606]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[2607]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[2609]! } - public var Passport_Address_Street: String { return self._s[2610]! } - public var Conversation_AddContact: String { return self._s[2611]! } - public var Login_PhonePlaceholder: String { return self._s[2612]! } - public var Channel_Members_InviteLink: String { return self._s[2614]! } - public var Bot_Stop: String { return self._s[2615]! } - public var Notification_PassportValueAddress: String { return self._s[2617]! } - public var Month_ShortJuly: String { return self._s[2618]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[2619]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[2620]! } - public var Passport_Identity_ReverseSide: String { return self._s[2621]! } - public var Watch_Stickers_Recents: String { return self._s[2624]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[2626]! } - public var Map_SendThisLocation: String { return self._s[2627]! } + public var Stickers_GroupStickers: String { return self._s[2608]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[2610]! } + public var Passport_Address_Street: String { return self._s[2611]! } + public var Conversation_AddContact: String { return self._s[2612]! } + public var Login_PhonePlaceholder: String { return self._s[2613]! } + public var Channel_Members_InviteLink: String { return self._s[2615]! } + public var Bot_Stop: String { return self._s[2616]! } + public var Notification_PassportValueAddress: String { return self._s[2618]! } + public var Month_ShortJuly: String { return self._s[2619]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[2620]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[2621]! } + public var Passport_Identity_ReverseSide: String { return self._s[2622]! } + public var Watch_Stickers_Recents: String { return self._s[2625]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[2627]! } + public var Map_SendThisLocation: String { return self._s[2628]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2628]!, self._r[2628]!, [_0]) - } - public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_0]) } - public var ConvertToSupergroup_Note: String { return self._s[2630]! } + public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2630]!, self._r[2630]!, [_0]) + } + public var ConvertToSupergroup_Note: String { return self._s[2631]! } public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_0]) + return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[2632]! } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[2633]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2633]!, self._r[2633]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2634]!, self._r[2634]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[2635]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[2637]! } + public var Login_CallRequestState3: String { return self._s[2636]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[2638]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2638]!, self._r[2638]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2639]!, self._r[2639]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[2639]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[2643]! } + public var Channel_AdminLogFilter_Title: String { return self._s[2640]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[2644]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2644]!, self._r[2644]!, [_0]) + return formatWithArgumentRanges(self._s[2645]!, self._r[2645]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[2645]! } + public var Passport_CorrectErrors: String { return self._s[2646]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2646]!, self._r[2646]!, [_0]) + return formatWithArgumentRanges(self._s[2647]!, self._r[2647]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[2647]! } + public var Map_SendMyCurrentLocation: String { return self._s[2648]! } public func PUSH_PINNED_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2648]!, self._r[2648]!, [_1]) + return formatWithArgumentRanges(self._s[2649]!, self._r[2649]!, [_1]) } - public var SharedMedia_SearchNoResults: String { return self._s[2649]! } - public var Permissions_NotificationsText_v0: String { return self._s[2650]! } - public var LoginPassword_FloodError: String { return self._s[2651]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[2653]! } + public var SharedMedia_SearchNoResults: String { return self._s[2650]! } + public var Permissions_NotificationsText_v0: String { return self._s[2651]! } + public var LoginPassword_FloodError: String { return self._s[2652]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[2654]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2654]!, self._r[2654]!, [_0]) + return formatWithArgumentRanges(self._s[2655]!, self._r[2655]!, [_0]) } - public var Passport_Language_bn: String { return self._s[2655]! } + public var Passport_Language_bn: String { return self._s[2656]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2656]!, self._r[2656]!, [_0]) - } - public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2657]!, self._r[2657]!, [_0]) } - public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2658]!, self._r[2658]!, [_0]) } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[2661]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[2663]! } - public var Contacts_PermissionsAllow: String { return self._s[2664]! } - public var ReportPeer_ReasonCopyright: String { return self._s[2665]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[2666]! } - public var Paint_Duplicate: String { return self._s[2667]! } - public var Passport_Address_Country: String { return self._s[2668]! } - public var Notification_RenamedChannel: String { return self._s[2670]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[2671]! } - public var Group_MessagePhotoUpdated: String { return self._s[2672]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[2673]! } - public var Conversation_ContextMenuBan: String { return self._s[2674]! } - public var TwoStepAuth_EmailSent: String { return self._s[2675]! } - public var MessagePoll_NoVotes: String { return self._s[2676]! } - public var Passport_Language_is: String { return self._s[2677]! } - public var Tour_Text5: String { return self._s[2679]! } + public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2659]!, self._r[2659]!, [_0]) + } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[2662]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[2664]! } + public var Contacts_PermissionsAllow: String { return self._s[2665]! } + public var ReportPeer_ReasonCopyright: String { return self._s[2666]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[2667]! } + public var Paint_Duplicate: String { return self._s[2668]! } + public var Passport_Address_Country: String { return self._s[2669]! } + public var Notification_RenamedChannel: String { return self._s[2671]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[2672]! } + public var Group_MessagePhotoUpdated: String { return self._s[2673]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[2674]! } + public var Conversation_ContextMenuBan: String { return self._s[2675]! } + public var TwoStepAuth_EmailSent: String { return self._s[2676]! } + public var MessagePoll_NoVotes: String { return self._s[2677]! } + public var Passport_Language_is: String { return self._s[2678]! } + public var Tour_Text5: String { return self._s[2680]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2681]!, self._r[2681]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2682]!, self._r[2682]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[2682]! } - public var Paint_Edit: String { return self._s[2684]! } - public var Undo_DeletedGroup: String { return self._s[2687]! } - public var LoginPassword_ForgotPassword: String { return self._s[2688]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[2689]! } + public var Undo_SecretChatDeleted: String { return self._s[2683]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[2684]! } + public var Paint_Edit: String { return self._s[2686]! } + public var Undo_DeletedGroup: String { return self._s[2689]! } + public var LoginPassword_ForgotPassword: String { return self._s[2690]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[2691]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2690]!, self._r[2690]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2692]!, self._r[2692]!, [_0, _1]) } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[2691]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[2692]! } - public var Passport_Language_uz: String { return self._s[2693]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[2694]! } - public var Map_StopLiveLocation: String { return self._s[2696]! } - public var PasscodeSettings_Help: String { return self._s[2698]! } - public var NotificationsSound_Input: String { return self._s[2699]! } - public var Share_Title: String { return self._s[2702]! } - public var Login_TermsOfServiceAgree: String { return self._s[2703]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[2704]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[2705]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[2706]! } - public var EnterPasscode_EnterTitle: String { return self._s[2707]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[2693]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[2694]! } + public var Passport_Language_uz: String { return self._s[2695]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[2696]! } + public var Map_StopLiveLocation: String { return self._s[2698]! } + public var PasscodeSettings_Help: String { return self._s[2700]! } + public var NotificationsSound_Input: String { return self._s[2701]! } + public var Share_Title: String { return self._s[2704]! } + public var Login_TermsOfServiceAgree: String { return self._s[2705]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[2706]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[2707]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[2708]! } + public var EnterPasscode_EnterTitle: String { return self._s[2709]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2708]!, self._r[2708]!, [_0]) + return formatWithArgumentRanges(self._s[2710]!, self._r[2710]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[2709]! } - public var NotificationsSound_Keys: String { return self._s[2710]! } + public var Settings_CopyPhoneNumber: String { return self._s[2711]! } + public var NotificationsSound_Keys: String { return self._s[2712]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2711]!, self._r[2711]!, [_0]) + return formatWithArgumentRanges(self._s[2713]!, self._r[2713]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[2712]! } - public var Message_Video: String { return self._s[2713]! } + public var Notification_MessageLifetime1w: String { return self._s[2714]! } + public var Message_Video: String { return self._s[2715]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2714]!, self._r[2714]!, [_1]) + return formatWithArgumentRanges(self._s[2716]!, self._r[2716]!, [_1]) } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2717]!, self._r[2717]!, [_0]) + return formatWithArgumentRanges(self._s[2719]!, self._r[2719]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2718]!, self._r[2718]!, [_0]) + return formatWithArgumentRanges(self._s[2720]!, self._r[2720]!, [_0]) } - public var Passport_Language_mk: String { return self._s[2719]! } - public var CreatePoll_CancelConfirmation: String { return self._s[2720]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[2722]! } - public var PrivacyPolicy_Decline: String { return self._s[2723]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[2724]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[2725]! } - public var Permissions_SiriAllow_v0: String { return self._s[2727]! } + public var Passport_Language_mk: String { return self._s[2721]! } + public var CreatePoll_CancelConfirmation: String { return self._s[2722]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[2724]! } + public var PrivacyPolicy_Decline: String { return self._s[2725]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[2726]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[2727]! } + public var Permissions_SiriAllow_v0: String { return self._s[2729]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2728]!, self._r[2728]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2730]!, self._r[2730]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2729]!, self._r[2729]!, [_0]) + return formatWithArgumentRanges(self._s[2731]!, self._r[2731]!, [_0]) } - public var Paint_Regular: String { return self._s[2730]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[2731]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[2732]! } - public var GroupInfo_InviteByLink: String { return self._s[2734]! } - public var MessageTimer_Custom: String { return self._s[2735]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[2736]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[2738]! } - public var Channel_Username_InvalidTaken: String { return self._s[2739]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[2740]! } - public var Settings_ChatBackground: String { return self._s[2741]! } - public var Channel_Subscribers_Title: String { return self._s[2742]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[2743]! } - public var Watch_ConnectionDescription: String { return self._s[2744]! } - public var EditProfile_Title: String { return self._s[2748]! } - public var NotificationsSound_Bamboo: String { return self._s[2750]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[2752]! } - public var Login_SmsRequestState2: String { return self._s[2753]! } - public var Passport_Language_ar: String { return self._s[2754]! } - public var Conversation_MessageDialogEdit: String { return self._s[2755]! } + public var Paint_Regular: String { return self._s[2732]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[2733]! } + public var SocksProxySetup_ShareLink: String { return self._s[2734]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[2735]! } + public var GroupInfo_InviteByLink: String { return self._s[2737]! } + public var MessageTimer_Custom: String { return self._s[2738]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[2739]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[2741]! } + public var Channel_Username_InvalidTaken: String { return self._s[2742]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[2743]! } + public var Settings_ChatBackground: String { return self._s[2744]! } + public var Channel_Subscribers_Title: String { return self._s[2745]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[2746]! } + public var Watch_ConnectionDescription: String { return self._s[2747]! } + public var EditProfile_Title: String { return self._s[2751]! } + public var NotificationsSound_Bamboo: String { return self._s[2753]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[2755]! } + public var Login_SmsRequestState2: String { return self._s[2756]! } + public var Passport_Language_ar: String { return self._s[2757]! } + public var Conversation_MessageDialogEdit: String { return self._s[2758]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2756]!, self._r[2756]!, [_1]) + return formatWithArgumentRanges(self._s[2759]!, self._r[2759]!, [_1]) } - public var Common_Close: String { return self._s[2757]! } + public var Common_Close: String { return self._s[2760]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2761]!, self._r[2761]!, [_0]) + return formatWithArgumentRanges(self._s[2764]!, self._r[2764]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[2762]! } + public var UserInfo_About_Placeholder: String { return self._s[2765]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2763]!, self._r[2763]!, [_0]) + return formatWithArgumentRanges(self._s[2766]!, self._r[2766]!, [_0]) } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[2764]! } - public var Channel_Info_Banned: String { return self._s[2766]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[2767]! } + public var Channel_Info_Banned: String { return self._s[2769]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2767]!, self._r[2767]!, [_0]) + return formatWithArgumentRanges(self._s[2770]!, self._r[2770]!, [_0]) } - public var Passport_Language_my: String { return self._s[2768]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[2769]! } + public var Passport_Language_my: String { return self._s[2771]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[2772]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2770]!, self._r[2770]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2773]!, self._r[2773]!, [_1, _2, _3]) } - public var Preview_CopyAddress: String { return self._s[2771]! } + public var Preview_CopyAddress: String { return self._s[2774]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2772]!, self._r[2772]!, [_0]) + return formatWithArgumentRanges(self._s[2775]!, self._r[2775]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[2773]! } - public var UserInfo_BotSettings: String { return self._s[2774]! } - public var LiveLocation_MenuStopAll: String { return self._s[2776]! } - public var Passport_PasswordCreate: String { return self._s[2777]! } - public var StickerSettings_MaskContextInfo: String { return self._s[2778]! } - public var Message_PinnedLocationMessage: String { return self._s[2779]! } - public var Map_Satellite: String { return self._s[2780]! } - public var Watch_Message_Unsupported: String { return self._s[2781]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[2782]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[2783]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[2776]! } + public var UserInfo_BotSettings: String { return self._s[2777]! } + public var LiveLocation_MenuStopAll: String { return self._s[2779]! } + public var Passport_PasswordCreate: String { return self._s[2780]! } + public var StickerSettings_MaskContextInfo: String { return self._s[2781]! } + public var Message_PinnedLocationMessage: String { return self._s[2782]! } + public var Map_Satellite: String { return self._s[2783]! } + public var Watch_Message_Unsupported: String { return self._s[2784]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[2785]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[2786]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2784]!, self._r[2784]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2787]!, self._r[2787]!, [_0, _1]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[2785]! } - public var Privacy_Calls_P2PContacts: String { return self._s[2786]! } - public var NotificationsSound_None: String { return self._s[2787]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[2789]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[2788]! } + public var Privacy_Calls_P2PContacts: String { return self._s[2789]! } + public var NotificationsSound_None: String { return self._s[2790]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[2792]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2790]!, self._r[2790]!, [_1]) + return formatWithArgumentRanges(self._s[2793]!, self._r[2793]!, [_1]) } - public var Cache_Indexing: String { return self._s[2791]! } - public var DialogList_RecentTitlePeople: String { return self._s[2793]! } - public var DialogList_EncryptionRejected: String { return self._s[2794]! } - public var GroupInfo_Administrators: String { return self._s[2795]! } - public var Passport_ScanPassportHelp: String { return self._s[2796]! } - public var Application_Name: String { return self._s[2797]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[2798]! } - public var Passport_Identity_TranslationHelp: String { return self._s[2800]! } + public var Cache_Indexing: String { return self._s[2794]! } + public var DialogList_RecentTitlePeople: String { return self._s[2796]! } + public var DialogList_EncryptionRejected: String { return self._s[2797]! } + public var GroupInfo_Administrators: String { return self._s[2798]! } + public var Passport_ScanPassportHelp: String { return self._s[2799]! } + public var Application_Name: String { return self._s[2800]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[2801]! } + public var Passport_Identity_TranslationHelp: String { return self._s[2803]! } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2801]!, self._r[2801]!, [_0]) + return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_0]) } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2802]!, self._r[2802]!, [_0]) + return formatWithArgumentRanges(self._s[2805]!, self._r[2805]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[2803]! } - public var Privacy_ChatsTitle: String { return self._s[2804]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[2805]! } - public var Watch_Suggestion_HoldOn: String { return self._s[2806]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[2807]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[2808]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[2809]! } - public var Channel_Setup_TypePublic: String { return self._s[2812]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[2806]! } + public var Privacy_ChatsTitle: String { return self._s[2807]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[2808]! } + public var Watch_Suggestion_HoldOn: String { return self._s[2809]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[2810]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[2811]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[2812]! } + public var Channel_Setup_TypePublic: String { return self._s[2815]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2813]!, self._r[2813]!, [_0]) + return formatWithArgumentRanges(self._s[2816]!, self._r[2816]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[2815]! } - public var Map_OpenInMaps: String { return self._s[2817]! } + public var Channel_TypeSetup_Title: String { return self._s[2818]! } + public var Map_OpenInMaps: String { return self._s[2820]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2818]!, self._r[2818]!, [_1]) + return formatWithArgumentRanges(self._s[2821]!, self._r[2821]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[2820]! } + public var NotificationsSound_Tremolo: String { return self._s[2823]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2821]!, self._r[2821]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2824]!, self._r[2824]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[2822]! } - public var Passport_PasswordHelp: String { return self._s[2823]! } - public var Login_CodeExpiredError: String { return self._s[2824]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[2825]! } - public var Conversation_TitleUnmute: String { return self._s[2826]! } - public var Passport_Identity_ScansHelp: String { return self._s[2827]! } - public var Passport_Language_lo: String { return self._s[2828]! } - public var Camera_FlashAuto: String { return self._s[2829]! } - public var Common_Cancel: String { return self._s[2830]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[2831]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[2832]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[2825]! } + public var Passport_PasswordHelp: String { return self._s[2826]! } + public var Login_CodeExpiredError: String { return self._s[2827]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[2828]! } + public var Conversation_TitleUnmute: String { return self._s[2829]! } + public var Passport_Identity_ScansHelp: String { return self._s[2830]! } + public var Passport_Language_lo: String { return self._s[2831]! } + public var Camera_FlashAuto: String { return self._s[2832]! } + public var Common_Cancel: String { return self._s[2833]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[2834]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[2835]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2833]!, self._r[2833]!, [_1]) + return formatWithArgumentRanges(self._s[2836]!, self._r[2836]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[2834]! } - public var ChatSettings_Title: String { return self._s[2836]! } - public var Passport_PasswordReset: String { return self._s[2837]! } - public var SocksProxySetup_TypeNone: String { return self._s[2838]! } - public var PhoneNumberHelp_Help: String { return self._s[2840]! } - public var Checkout_EnterPassword: String { return self._s[2841]! } - public var Share_AuthTitle: String { return self._s[2843]! } - public var Activity_UploadingDocument: String { return self._s[2844]! } - public var State_Connecting: String { return self._s[2845]! } - public var Profile_MessageLifetime1w: String { return self._s[2846]! } - public var Conversation_ContextMenuReport: String { return self._s[2847]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[2848]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[2849]! } - public var AuthSessions_Terminate: String { return self._s[2850]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[2851]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[2852]! } - public var PhotoEditor_Set: String { return self._s[2853]! } - public var EmptyGroupInfo_Title: String { return self._s[2854]! } - public var Login_PadPhoneHelp: String { return self._s[2855]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[2858]! } - public var NotificationsSound_Complete: String { return self._s[2859]! } - public var Group_Info_AdminLog: String { return self._s[2860]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[2861]! } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[2862]! } - public var Conversation_Admin: String { return self._s[2864]! } - public var Conversation_GifTooltip: String { return self._s[2865]! } - public var Passport_NotLoggedInMessage: String { return self._s[2866]! } - public var Profile_MessageLifetimeForever: String { return self._s[2867]! } - public var SharedMedia_EmptyTitle: String { return self._s[2869]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[2871]! } - public var Username_Help: String { return self._s[2872]! } - public var DialogList_LanguageTooltip: String { return self._s[2874]! } - public var Map_LoadError: String { return self._s[2875]! } - public var Channel_AdminLog_AddMembers: String { return self._s[2876]! } - public var Notification_Exceptions_NewException: String { return self._s[2877]! } - public var TwoStepAuth_EmailTitle: String { return self._s[2878]! } - public var WatchRemote_AlertText: String { return self._s[2879]! } - public var ChatSettings_ConnectionType_Title: String { return self._s[2882]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[2883]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[2837]! } + public var ChatSettings_Title: String { return self._s[2839]! } + public var Passport_PasswordReset: String { return self._s[2840]! } + public var SocksProxySetup_TypeNone: String { return self._s[2841]! } + public var PhoneNumberHelp_Help: String { return self._s[2843]! } + public var Checkout_EnterPassword: String { return self._s[2844]! } + public var Share_AuthTitle: String { return self._s[2846]! } + public var Activity_UploadingDocument: String { return self._s[2847]! } + public var State_Connecting: String { return self._s[2848]! } + public var Profile_MessageLifetime1w: String { return self._s[2849]! } + public var Conversation_ContextMenuReport: String { return self._s[2850]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[2851]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[2852]! } + public var AuthSessions_Terminate: String { return self._s[2853]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[2854]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[2855]! } + public var PhotoEditor_Set: String { return self._s[2856]! } + public var EmptyGroupInfo_Title: String { return self._s[2857]! } + public var Login_PadPhoneHelp: String { return self._s[2858]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[2861]! } + public var NotificationsSound_Complete: String { return self._s[2862]! } + public var Group_Info_AdminLog: String { return self._s[2863]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[2864]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[2865]! } + public var Conversation_Admin: String { return self._s[2867]! } + public var Conversation_GifTooltip: String { return self._s[2868]! } + public var Passport_NotLoggedInMessage: String { return self._s[2869]! } + public var Profile_MessageLifetimeForever: String { return self._s[2870]! } + public var SharedMedia_EmptyTitle: String { return self._s[2872]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[2874]! } + public var Username_Help: String { return self._s[2875]! } + public var DialogList_LanguageTooltip: String { return self._s[2877]! } + public var Map_LoadError: String { return self._s[2878]! } + public var Channel_AdminLog_AddMembers: String { return self._s[2879]! } + public var Notification_Exceptions_NewException: String { return self._s[2880]! } + public var TwoStepAuth_EmailTitle: String { return self._s[2881]! } + public var WatchRemote_AlertText: String { return self._s[2882]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[2885]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[2886]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2884]!, self._r[2884]!, [_0]) + return formatWithArgumentRanges(self._s[2887]!, self._r[2887]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2885]!, self._r[2885]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2888]!, self._r[2888]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[2886]! } - public var AccessDenied_VideoMicrophone: String { return self._s[2888]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[2889]! } - public var Cache_ClearNone: String { return self._s[2890]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[2891]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[2892]! } + public var Group_AdminLog_EmptyText: String { return self._s[2889]! } + public var AccessDenied_VideoMicrophone: String { return self._s[2891]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[2892]! } + public var Cache_ClearNone: String { return self._s[2893]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[2894]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[2895]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2893]!, self._r[2893]!, [_0]) + return formatWithArgumentRanges(self._s[2896]!, self._r[2896]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[2894]! } + public var Passport_Identity_Country: String { return self._s[2897]! } public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2895]!, self._r[2895]!, [_0]) + return formatWithArgumentRanges(self._s[2898]!, self._r[2898]!, [_0]) } - public var AccessDenied_Settings: String { return self._s[2896]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[2897]! } - public var Month_ShortMay: String { return self._s[2898]! } - public var Compose_NewGroup: String { return self._s[2899]! } - public var Group_Setup_TypePrivate: String { return self._s[2901]! } - public var Login_PadPhoneHelpTitle: String { return self._s[2903]! } - public var Appearance_ThemeDayClassic: String { return self._s[2904]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[2905]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[2906]! } - public var Conversation_typing: String { return self._s[2908]! } - public var Paint_Masks: String { return self._s[2909]! } - public var Username_InvalidTaken: String { return self._s[2910]! } - public var Call_StatusNoAnswer: String { return self._s[2911]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[2912]! } - public var Passport_Identity_Selfie: String { return self._s[2913]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[2914]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[2915]! } - public var Conversation_ClearSecretHistory: String { return self._s[2916]! } - public var NetworkUsageSettings_Title: String { return self._s[2918]! } - public var Your_cards_security_code_is_invalid: String { return self._s[2920]! } + public var AccessDenied_Settings: String { return self._s[2899]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[2900]! } + public var Month_ShortMay: String { return self._s[2901]! } + public var Compose_NewGroup: String { return self._s[2902]! } + public var Group_Setup_TypePrivate: String { return self._s[2904]! } + public var Login_PadPhoneHelpTitle: String { return self._s[2906]! } + public var Appearance_ThemeDayClassic: String { return self._s[2907]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[2908]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[2909]! } + public var Conversation_typing: String { return self._s[2911]! } + public var Paint_Masks: String { return self._s[2912]! } + public var Username_InvalidTaken: String { return self._s[2913]! } + public var Call_StatusNoAnswer: String { return self._s[2914]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[2915]! } + public var Passport_Identity_Selfie: String { return self._s[2916]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[2917]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[2918]! } + public var Conversation_ClearSecretHistory: String { return self._s[2919]! } + public var NetworkUsageSettings_Title: String { return self._s[2921]! } + public var Your_cards_security_code_is_invalid: String { return self._s[2923]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2922]!, self._r[2922]!, [_0]) + return formatWithArgumentRanges(self._s[2925]!, self._r[2925]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2923]!, self._r[2923]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2926]!, self._r[2926]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[2925]! } - public var Map_LiveLocationTitle: String { return self._s[2926]! } - public var Login_InfoAvatarAdd: String { return self._s[2927]! } - public var Passport_Identity_FilesView: String { return self._s[2928]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[2929]! } - public var Privacy_Calls_NeverAllow: String { return self._s[2930]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[2928]! } + public var Map_LiveLocationTitle: String { return self._s[2929]! } + public var Login_InfoAvatarAdd: String { return self._s[2930]! } + public var Passport_Identity_FilesView: String { return self._s[2931]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[2932]! } + public var Privacy_Calls_NeverAllow: String { return self._s[2933]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2931]!, self._r[2931]!, [_0]) + return formatWithArgumentRanges(self._s[2934]!, self._r[2934]!, [_0]) } - public var TwoStepAuth_ConfirmationText: String { return self._s[2932]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[2933]! } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[2934]! } - public var Tour_Title2: String { return self._s[2935]! } - public var Conversation_FileOpenIn: String { return self._s[2936]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[2937]! } - public var Wallpaper_Set: String { return self._s[2938]! } - public var Passport_Identity_Translations: String { return self._s[2940]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[2935]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[2936]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[2937]! } + public var Tour_Title2: String { return self._s[2938]! } + public var Conversation_FileOpenIn: String { return self._s[2939]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[2940]! } + public var Wallpaper_Set: String { return self._s[2941]! } + public var Passport_Identity_Translations: String { return self._s[2943]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2941]!, self._r[2941]!, [_0]) + return formatWithArgumentRanges(self._s[2944]!, self._r[2944]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[2942]! } + public var Channel_LeaveChannel: String { return self._s[2945]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2943]!, self._r[2943]!, [_1]) + return formatWithArgumentRanges(self._s[2946]!, self._r[2946]!, [_1]) } - public var PhotoEditor_HighlightsTint: String { return self._s[2944]! } - public var Passport_Email_Delete: String { return self._s[2945]! } - public var Conversation_Mute: String { return self._s[2947]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[2949]! } + public var PhotoEditor_HighlightsTint: String { return self._s[2947]! } + public var Passport_Email_Delete: String { return self._s[2948]! } + public var Conversation_Mute: String { return self._s[2950]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[2952]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2951]!, self._r[2951]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2954]!, self._r[2954]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[2952]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[2953]! } - public var Common_No: String { return self._s[2954]! } - public var Weekday_Sunday: String { return self._s[2955]! } - public var Notification_Reply: String { return self._s[2956]! } - public var Conversation_ViewMessage: String { return self._s[2957]! } + public var Calls_CallTabDescription: String { return self._s[2955]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[2956]! } + public var Common_No: String { return self._s[2957]! } + public var Weekday_Sunday: String { return self._s[2958]! } + public var Notification_Reply: String { return self._s[2959]! } + public var Conversation_ViewMessage: String { return self._s[2960]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2958]!, self._r[2958]!, [_0]) + return formatWithArgumentRanges(self._s[2961]!, self._r[2961]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2959]!, self._r[2959]!, [_0]) + return formatWithArgumentRanges(self._s[2962]!, self._r[2962]!, [_0]) } - public var Message_PinnedDocumentMessage: String { return self._s[2960]! } - public var DialogList_TabTitle: String { return self._s[2962]! } - public var Passport_FieldEmail: String { return self._s[2963]! } - public var Conversation_UnpinMessageAlert: String { return self._s[2964]! } - public var Passport_Address_TypeBankStatement: String { return self._s[2965]! } - public var Passport_Identity_ExpiryDate: String { return self._s[2966]! } - public var Privacy_Calls_P2P: String { return self._s[2967]! } + public var Message_PinnedDocumentMessage: String { return self._s[2963]! } + public var DialogList_TabTitle: String { return self._s[2965]! } + public var Passport_FieldEmail: String { return self._s[2966]! } + public var Conversation_UnpinMessageAlert: String { return self._s[2967]! } + public var Passport_Address_TypeBankStatement: String { return self._s[2968]! } + public var Passport_Identity_ExpiryDate: String { return self._s[2969]! } + public var Privacy_Calls_P2P: String { return self._s[2970]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2969]!, self._r[2969]!, [_0]) + return formatWithArgumentRanges(self._s[2972]!, self._r[2972]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[2970]! } - public var EnterPasscode_ChangeTitle: String { return self._s[2971]! } - public var Passport_InfoText: String { return self._s[2972]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[2973]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[2973]! } + public var EnterPasscode_ChangeTitle: String { return self._s[2974]! } + public var Passport_InfoText: String { return self._s[2975]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[2976]! } public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2974]!, self._r[2974]!, [_0]) + return formatWithArgumentRanges(self._s[2977]!, self._r[2977]!, [_0]) } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2975]!, self._r[2975]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2978]!, self._r[2978]!, [_1, _2, _3]) } - public var Passport_Identity_EditDriversLicense: String { return self._s[2976]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[2978]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[2979]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[2981]! } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2979]!, self._r[2979]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2982]!, self._r[2982]!, [_1, _2]) } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[2981]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[2984]! } public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2983]!, self._r[2983]!, [_0]) + return formatWithArgumentRanges(self._s[2986]!, self._r[2986]!, [_0]) } - public var DialogList_Unread: String { return self._s[2984]! } + public var DialogList_Unread: String { return self._s[2987]! } public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2985]!, self._r[2985]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2988]!, self._r[2988]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[2986]! } + public var User_DeletedAccount: String { return self._s[2989]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2987]!, self._r[2987]!, [_0]) + return formatWithArgumentRanges(self._s[2990]!, self._r[2990]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[2988]! } - public var SharedMedia_CategoryMedia: String { return self._s[2989]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[2990]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[2991]! } - public var Watch_ChatList_Compose: String { return self._s[2992]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[2993]! } - public var Watch_Microphone_Access: String { return self._s[2994]! } - public var Group_Setup_HistoryHeader: String { return self._s[2995]! } - public var Activity_UploadingPhoto: String { return self._s[2996]! } - public var Conversation_Edit: String { return self._s[2998]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[2999]! } - public var Login_TermsOfServiceDecline: String { return self._s[3000]! } - public var Message_PinnedContactMessage: String { return self._s[3001]! } + public var UserInfo_NotificationsDefault: String { return self._s[2991]! } + public var SharedMedia_CategoryMedia: String { return self._s[2992]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[2993]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[2994]! } + public var Watch_ChatList_Compose: String { return self._s[2995]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[2996]! } + public var Watch_Microphone_Access: String { return self._s[2997]! } + public var Group_Setup_HistoryHeader: String { return self._s[2998]! } + public var Activity_UploadingPhoto: String { return self._s[2999]! } + public var Conversation_Edit: String { return self._s[3001]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[3002]! } + public var Login_TermsOfServiceDecline: String { return self._s[3003]! } + public var Message_PinnedContactMessage: String { return self._s[3004]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3002]!, self._r[3002]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3005]!, self._r[3005]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3003]!, self._r[3003]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[3006]!, self._r[3006]!, [_1, _2, _3, _4, _5]) } - public var TwoStepAuth_AdditionalPassword: String { return self._s[3005]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[3008]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3006]!, self._r[3006]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3009]!, self._r[3009]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[3007]! } - public var Message_PinnedPhotoMessage: String { return self._s[3008]! } - public var Passport_FieldPhone: String { return self._s[3009]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3010]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[3012]! } - public var Conversation_Call: String { return self._s[3013]! } - public var Common_TakePhoto: String { return self._s[3015]! } - public var Channel_NotificationLoading: String { return self._s[3016]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[3010]! } + public var Message_PinnedPhotoMessage: String { return self._s[3011]! } + public var Passport_FieldPhone: String { return self._s[3012]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3013]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[3015]! } + public var Conversation_Call: String { return self._s[3016]! } + public var Common_TakePhoto: String { return self._s[3018]! } + public var Channel_NotificationLoading: String { return self._s[3019]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3017]!, self._r[3017]!, [_0]) - } - public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3018]!, self._r[3018]!, [_1]) - } - public var Permissions_SiriTitle_v0: String { return self._s[3019]! } - public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3020]!, self._r[3020]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[3021]! } - public var Common_edit: String { return self._s[3022]! } - public var PrivacySettings_AuthSessions: String { return self._s[3023]! } - public var Month_ShortJune: String { return self._s[3024]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3025]! } - public var Call_ReportSend: String { return self._s[3026]! } - public var Watch_LastSeen_JustNow: String { return self._s[3027]! } - public var Notifications_MessageNotifications: String { return self._s[3028]! } - public var WallpaperSearch_ColorGreen: String { return self._s[3029]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[3031]! } - public var Group_Status: String { return self._s[3032]! } + public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3021]!, self._r[3021]!, [_1]) + } + public var Permissions_SiriTitle_v0: String { return self._s[3022]! } + public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3023]!, self._r[3023]!, [_0]) + } + public var Channel_MessagePhotoRemoved: String { return self._s[3024]! } + public var Common_edit: String { return self._s[3025]! } + public var PrivacySettings_AuthSessions: String { return self._s[3026]! } + public var Month_ShortJune: String { return self._s[3027]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3028]! } + public var Call_ReportSend: String { return self._s[3029]! } + public var Watch_LastSeen_JustNow: String { return self._s[3030]! } + public var Notifications_MessageNotifications: String { return self._s[3031]! } + public var WallpaperSearch_ColorGreen: String { return self._s[3032]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[3034]! } + public var Group_Status: String { return self._s[3035]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3033]!, self._r[3033]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3036]!, self._r[3036]!, [_0, _1]) } - public var ShareMenu_ShareTo: String { return self._s[3034]! } - public var Conversation_Moderate_Ban: String { return self._s[3035]! } + public var ShareMenu_ShareTo: String { return self._s[3037]! } + public var Conversation_Moderate_Ban: String { return self._s[3038]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3036]!, self._r[3036]!, [_0]) + return formatWithArgumentRanges(self._s[3039]!, self._r[3039]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[3037]! } - public var Map_LiveLocationFor8Hours: String { return self._s[3038]! } + public var SharedMedia_ViewInChat: String { return self._s[3040]! } + public var Map_LiveLocationFor8Hours: String { return self._s[3041]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3039]!, self._r[3039]!, [_1]) + return formatWithArgumentRanges(self._s[3042]!, self._r[3042]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3040]!, self._r[3040]!, [_1]) + return formatWithArgumentRanges(self._s[3043]!, self._r[3043]!, [_1]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3042]!, self._r[3042]!, [_0]) + return formatWithArgumentRanges(self._s[3045]!, self._r[3045]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[3043]! } - public var Appearance_ReduceMotion: String { return self._s[3044]! } + public var Map_OpenInHereMaps: String { return self._s[3046]! } + public var Appearance_ReduceMotion: String { return self._s[3047]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3045]!, self._r[3045]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3048]!, self._r[3048]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[3046]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[3047]! } - public var PhotoEditor_Skip: String { return self._s[3048]! } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[3049]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[3050]! } + public var PhotoEditor_Skip: String { return self._s[3051]! } + public func MuteExpires_Minutes(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Map_ETAMinutes(_ value: Int32) -> String { + public func StickerPack_AddStickerCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_Seconds(_ value: Int32) -> String { + public func MessageTimer_Years(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedMessages(_ value: Int32) -> String { + public func AttachmentMenu_SendItem(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_Months(_ value: Int32) -> String { + public func SharedMedia_Generic(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedLocations(_ value: Int32) -> String { + public func ForwardedContacts(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, "\(value)") } - public func SharedMedia_Video(_ value: Int32) -> String { + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + public func UserCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_Weeks(_ value: Int32) -> String { + public func LastSeen_MinutesAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + public func Notification_GameScoreExtended(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, "\(value)") } - public func AttachmentMenu_SendGif(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, "\(value)") + public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, _1, _2) } - public func Media_ShareVideo(_ value: Int32) -> String { + public func LastSeen_HoursAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, _1, _2) + public func Media_ShareItem(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedContacts(_ value: Int32) -> String { + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, _0, _1) + public func SharedMedia_Video(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + public func Map_ETAMinutes(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func MuteFor_Hours(_ value: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MuteExpires_Hours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, "\(value)") } @@ -3486,155 +3489,155 @@ public final class PresentationStrings { let form = presentationStringsPluralizationForm(self.lc, selector) return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, _1, _2) } - public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, "\(value)") } - public func SharedMedia_Link(_ value: Int32) -> String { + public func Media_ShareVideo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedVideos(_ value: Int32) -> String { + public func QuickSend_Photos(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Call_Minutes(_ value: Int32) -> String { + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedFiles(_ value: Int32) -> String { + public func MessageTimer_ShortHours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Call_ShortMinutes(_ value: Int32) -> String { + public func Media_SharePhoto(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, "\(value)") } - public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + public func ForwardedLocations(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MuteFor_Days(_ value: Int32) -> String { + public func Call_Seconds(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Media_SharePhoto(_ value: Int32) -> String { + public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, "\(value)") } - public func UserCount(_ value: Int32) -> String { + public func MessageTimer_ShortDays(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MuteExpires_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, "\(value)") + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + public func MessageTimer_Weeks(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MuteExpires_Hours(_ value: Int32) -> String { + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, "\(value)") } - public func LastSeen_HoursAgo(_ value: Int32) -> String { + public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { + public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_Hours(_ value: Int32) -> String { + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Watch_UserInfo_Mute(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, "\(value)") + public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func Map_ETAHours(_ value: Int32) -> String { + public func Call_Minutes(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Conversation_StatusOnline(_ value: Int32) -> String { + public func ForwardedGifs(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + public func SharedMedia_File(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, "\(value)") } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { + public func Call_ShortMinutes(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_ShortDays(_ value: Int32) -> String { + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, "\(value)") } - public func StickerPack_StickerCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, "\(value)") + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, _1, _2) } - public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { + public func MessagePoll_VotedCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, "\(value)") } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + public func Conversation_StatusMembers(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { + public func ForwardedMessages(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Call_ShortSeconds(_ value: Int32) -> String { + public func Map_ETAHours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedStickers(_ value: Int32) -> String { + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_Years(_ value: Int32) -> String { + public func Watch_UserInfo_Mute(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedGifs(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, "\(value)") + public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, _1, _2) } - public func Invitation_Members(_ value: Int32) -> String { + public func MuteFor_Hours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Notifications_Exceptions(_ value: Int32) -> String { + public func ForwardedStickers(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, "\(value)") } - public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, "\(value)") } - public func InviteText_ContactsCountText(_ value: Int32) -> String { + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Contacts_ImportersCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, "\(value)") + public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func Conversation_StatusMembers(_ value: Int32) -> String { + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, "\(value)") } @@ -3642,83 +3645,83 @@ public final class PresentationStrings { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, "\(value)") } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + public func Conversation_StatusSubscribers(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedPhotos(_ value: Int32) -> String { + public func MessageTimer_Months(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + public func MessageTimer_Hours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + public func ForwardedVideoMessages(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, "\(value)") + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_Generic(_ value: Int32) -> String { + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func StickerPack_AddStickerCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func ForwardedPolls(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func SharedMedia_Photo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, "\(value)") } public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Notification_GameScoreSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Call_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, "\(value)") } - public func QuickSend_Photos(_ value: Int32) -> String { + public func ForwardedFiles(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, "\(value)") } - public func SharedMedia_File(_ value: Int32) -> String { + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + public func ForwardedVideos(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, "\(value)") } @@ -3726,107 +3729,107 @@ public final class PresentationStrings { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedAudios(_ value: Int32) -> String { + public func Conversation_StatusOnline(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, _1, _2) + public func ForwardedPolls(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, "\(value)") } - public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + public func Contacts_ImportersCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MessagePoll_VotedCount(_ value: Int32) -> String { + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func ForwardedAudios(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, "\(value)") } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, "\(value)") } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { + public func MessageTimer_Days(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, "\(value)") - } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, _1, _2) - } public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, _1, _2) } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { + public func Notifications_Exceptions(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, "\(value)") + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Media_ShareItem(_ value: Int32) -> String { + public func StickerPack_StickerCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, _2, _1, _3) + public func Invitation_Members(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ForwardedVideoMessages(_ value: Int32) -> String { + public func StickerPack_AddMaskCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, "\(value)") } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Notification_GameScoreSimple(_ value: Int32) -> String { + public func MessageTimer_Minutes(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_Days(_ value: Int32) -> String { + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_Minutes(_ value: Int32) -> String { + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, _1, _2) } - public func MuteExpires_Days(_ value: Int32) -> String { + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, "\(value)") } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { + public func AttachmentMenu_SendGif(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, "\(value)") } - public func Call_Seconds(_ value: Int32) -> String { + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, "\(value)") } - public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, _1, _2) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, _2, _1, _3) } - public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { + public func ForwardedPhotos(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, "\(value)") } - public func MessageTimer_ShortHours(_ value: Int32) -> String { + public func SharedMedia_Link(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, "\(value)") } diff --git a/TelegramUI/ProxyServerSettingsController.swift b/TelegramUI/ProxyServerSettingsController.swift index 6cdfb288c2..deb03313b4 100644 --- a/TelegramUI/ProxyServerSettingsController.swift +++ b/TelegramUI/ProxyServerSettingsController.swift @@ -373,14 +373,25 @@ func proxyServerSettingsController(theme: PresentationTheme, strings: Presentati let _ = controller?.dismiss() } - shareImpl = { + shareImpl = { [weak controller] in let state = stateValue.with { $0 } - guard let server = proxyServerSettings(with: state) else { + guard let server = proxyServerSettings(with: state), let strongController = controller else { return } - let controller = ShareProxyServerActionSheetController(theme: theme, strings: strings, updatedPresentationData: updatedPresentationData, link: shareLink(for: server)) - presentImpl?(controller, nil) + let link = shareLink(for: server) + if #available(iOSApplicationExtension 9.0, *) { + let controller = ShareProxyServerActionSheetController(theme: theme, strings: strings, updatedPresentationData: updatedPresentationData, link: link) + presentImpl?(controller, nil) + } else { + let activityController = UIActivityViewController(activityItems: [link], applicationActivities: nil) + + if let window = strongController.view.window, let rootViewController = window.rootViewController { + activityController.popoverPresentationController?.sourceView = window + activityController.popoverPresentationController?.sourceRect = CGRect(origin: CGPoint(x: window.bounds.width / 2.0, y: window.bounds.size.height - 1.0), size: CGSize(width: 1.0, height: 1.0)) + rootViewController.present(activityController, animated: true, completion: nil) + } + } } return controller diff --git a/TelegramUI/QRCode.swift b/TelegramUI/QRCode.swift index 3d1168a7b2..01ff2f20ed 100644 --- a/TelegramUI/QRCode.swift +++ b/TelegramUI/QRCode.swift @@ -76,7 +76,7 @@ func qrCode(string: String, color: UIColor, backgroundColor: UIColor? = nil, sca c.setFillColor(color.cgColor) let _ = try? drawSvgPath(c, path: "M0.0,40 C0,20.3664202 20.1230605,0.0 32.5,0.0 C44.8769395,0.0 65,20.3664202 65,40 C65,47.217934 65,55.5505326 65,64.9977957 L32.5,79 L0.0,64.9977957 C0.0,55.0825772 0.0,46.7499786 0.0,40 Z") - if false, let backgroundColor = backgroundColor { + if let backgroundColor = backgroundColor { c.setFillColor(backgroundColor.cgColor) } else { c.setBlendMode(.clear) diff --git a/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg b/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg index 310fe0dbe6..44f7cf5262 100644 Binary files a/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg and b/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg differ diff --git a/TelegramUI/Resources/PresentationStrings.mapping b/TelegramUI/Resources/PresentationStrings.mapping index 8979b17a62..d2d8c1774e 100644 Binary files a/TelegramUI/Resources/PresentationStrings.mapping and b/TelegramUI/Resources/PresentationStrings.mapping differ diff --git a/TelegramUI/SearchBarPlaceholderNode.swift b/TelegramUI/SearchBarPlaceholderNode.swift index 22666d7be0..4ad54f854b 100644 --- a/TelegramUI/SearchBarPlaceholderNode.swift +++ b/TelegramUI/SearchBarPlaceholderNode.swift @@ -112,8 +112,7 @@ class SearchBarPlaceholderNode: ASDisplayNode { var iconSize = CGSize() var totalWidth = labelLayoutResult.size.width - let spacing: CGFloat = 7.0 - + let spacing: CGFloat = 8.0 if let iconImage = strongSelf.iconNode.image { iconSize = iconImage.size diff --git a/TelegramUI/SettingsThemeWallpaperNode.swift b/TelegramUI/SettingsThemeWallpaperNode.swift index 98b6417ccd..fadf81150f 100644 --- a/TelegramUI/SettingsThemeWallpaperNode.swift +++ b/TelegramUI/SettingsThemeWallpaperNode.swift @@ -97,7 +97,7 @@ final class SettingsThemeWallpaperNode: ASDisplayNode { var convertedRepresentations: [ImageRepresentationWithReference] = [] for representation in file.file.previewRepresentations { - convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: .standalone(resource: representation.resource))) + convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: .wallpaper(resource: representation.resource))) } let dimensions = file.file.dimensions ?? CGSize(width: 100.0, height: 100.0) self.imageNode.setSignal(chatAvatarGalleryPhoto(account: account, fileReference: .standalone(media: file.file), representations: convertedRepresentations, autoFetchFullSize: true)) diff --git a/TelegramUI/ShareProxyServerActionSheetController.swift b/TelegramUI/ShareProxyServerActionSheetController.swift index ef4d7b62b9..061507a1cd 100644 --- a/TelegramUI/ShareProxyServerActionSheetController.swift +++ b/TelegramUI/ShareProxyServerActionSheetController.swift @@ -33,7 +33,7 @@ public final class ShareProxyServerActionSheetController: ActionSheetController items.append(ProxyServerQRCodeItem(strings: strings, link: link, ready: { [weak self] in self?._ready.set(.single(true)) })) - items.append(ActionSheetButtonItem(title: "Share QR Code", action: { [weak self] in + items.append(ActionSheetButtonItem(title: strings.SocksProxySetup_ShareQRCode, action: { [weak self] in self?.dismissAnimated() let _ = (qrCode(string: link, color: .black, backgroundColor: .white, scale: 1.0) |> map { generator -> UIImage? in @@ -47,7 +47,7 @@ public final class ShareProxyServerActionSheetController: ActionSheetController } }) })) - items.append(ActionSheetButtonItem(title: "Share Link", action: { [weak self] in + items.append(ActionSheetButtonItem(title: strings.SocksProxySetup_ShareLink, action: { [weak self] in self?.dismissAnimated() presentActivityController(link) })) @@ -105,6 +105,9 @@ private final class ProxyServerQRCodeItemNode: ActionSheetItemNode { private let ready: () -> Void + private var cachedHasLabel = true + private var cachedHasImage = true + init(theme: ActionSheetControllerTheme, strings: PresentationStrings, link: String, ready: @escaping () -> Void = {}) { self.theme = theme self.strings = strings @@ -117,10 +120,10 @@ private final class ProxyServerQRCodeItemNode: ActionSheetItemNode { self.label.displaysAsynchronously = false self.label.truncationMode = .byTruncatingTail self.label.isUserInteractionEnabled = false - self.label.attributedText = NSAttributedString(string: "Your friends can add this proxy by scanning this code with phone or in-app camera.", font: ActionSheetTextNode.defaultFont, textColor: self.theme.secondaryTextColor, paragraphAlignment: .center) + self.label.attributedText = NSAttributedString(string: strings.SocksProxySetup_ShareQRCodeInfo, font: ActionSheetTextNode.defaultFont, textColor: self.theme.secondaryTextColor, paragraphAlignment: .center) self.imageNode = TransformImageNode() - self.imageNode.setSignal(qrCode(string: link, color: self.theme.primaryTextColor), attemptSynchronously: true) + self.imageNode.setSignal(qrCode(string: link, color: .black, backgroundColor: .white), attemptSynchronously: true) super.init(theme: theme) @@ -131,16 +134,26 @@ private final class ProxyServerQRCodeItemNode: ActionSheetItemNode { override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize { let imageInset: CGFloat = 44.0 let side = constrainedSize.width - imageInset * 2.0 - let imageSize = CGSize(width: side, height: side) + var imageSize = CGSize(width: side, height: side) let makeLayout = self.imageNode.asyncLayout() let apply = makeLayout(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets(), emptyColor: nil)) apply() + var labelSize = self.label.measure(CGSize(width: max(1.0, constrainedSize.width - 64.0), height: constrainedSize.height)) + + self.cachedHasImage = constrainedSize.width < constrainedSize.height + if !self.cachedHasImage { + imageSize = CGSize() + } + self.ready() - let labelSize = self.label.measure(CGSize(width: max(1.0, constrainedSize.width - 64.0), height: constrainedSize.height)) - return CGSize(width: constrainedSize.width, height: 14.0 + labelSize.height + 14.0 + constrainedSize.width - 88.0 + 14.0) + self.cachedHasLabel = constrainedSize.height > 480 || !self.cachedHasImage + if !self.cachedHasLabel { + labelSize = CGSize() + } + return CGSize(width: constrainedSize.width, height: 14.0 + (labelSize.height > 0.0 ? labelSize.height + 14.0 : 0.0) + (imageSize.height > 0.0 ? imageSize.height + 14.0 : 8.0)) } override func layout() { @@ -151,10 +164,21 @@ private final class ProxyServerQRCodeItemNode: ActionSheetItemNode { let imageInset: CGFloat = 44.0 let spacing: CGFloat = 18.0 - let labelSize = self.label.measure(CGSize(width: max(1.0, size.width - inset * 2.0), height: size.height)) - self.label.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - labelSize.width) / 2.0), y: spacing), size: labelSize) + let labelSize: CGSize + if self.cachedHasLabel { + labelSize = self.label.measure(CGSize(width: max(1.0, size.width - inset * 2.0), height: size.height)) + self.label.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - labelSize.width) / 2.0), y: spacing), size: labelSize) + } else { + labelSize = CGSize() + } - let imageFrame = CGRect(x: imageInset, y: self.label.frame.maxY + spacing - 4.0, width: size.width - imageInset * 2.0, height: size.width - imageInset * 2.0) - self.imageNode.frame = imageFrame + let imageOrigin = CGPoint(x: imageInset, y: self.label.frame.maxY + spacing - 4.0) + var imageSize: CGSize + if !self.cachedHasImage { + imageSize = CGSize() + } else { + imageSize = CGSize(width: size.width - imageInset * 2.0, height: size.width - imageInset * 2.0) + } + self.imageNode.frame = CGRect(origin: imageOrigin, size: imageSize) } } diff --git a/TelegramUI/StickerPaneSearchBarPlaceholderItem.swift b/TelegramUI/StickerPaneSearchBarPlaceholderItem.swift index 1b2a767cfb..96e79d7ca3 100644 --- a/TelegramUI/StickerPaneSearchBarPlaceholderItem.swift +++ b/TelegramUI/StickerPaneSearchBarPlaceholderItem.swift @@ -80,7 +80,7 @@ final class StickerPaneSearchBarPlaceholderNode: GridItemNode { if self.currentState?.0 !== theme || self.currentState?.1 !== strings { self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 36.0, color: theme.chat.inputMediaPanel.stickersSearchBackgroundColor) self.iconNode.image = generateLoupeIcon(color: theme.chat.inputMediaPanel.stickersSearchControlColor) - self.labelNode.attributedText = NSAttributedString(string: strings.Stickers_Search, font: Font.regular(14.0), textColor: theme.chat.inputMediaPanel.stickersSearchPlaceholderColor) + self.labelNode.attributedText = NSAttributedString(string: strings.Stickers_Search, font: Font.regular(17.0), textColor: theme.chat.inputMediaPanel.stickersSearchPlaceholderColor) } } @@ -97,7 +97,7 @@ final class StickerPaneSearchBarPlaceholderNode: GridItemNode { self.labelNode.frame = textFrame if let iconImage = self.iconNode.image { - self.iconNode.frame = CGRect(origin: CGPoint(x: textFrame.minX - iconImage.size.width - 5.0, y: floorToScreenPixels(textFrame.midY - iconImage.size.height / 2.0)), size: iconImage.size) + self.iconNode.frame = CGRect(origin: CGPoint(x: textFrame.minX - iconImage.size.width - 6.0, y: floorToScreenPixels(textFrame.midY - iconImage.size.height / 2.0)), size: iconImage.size) } } diff --git a/TelegramUI/StickersChatInputContextPanelNode.swift b/TelegramUI/StickersChatInputContextPanelNode.swift new file mode 100644 index 0000000000..a9cb4de287 --- /dev/null +++ b/TelegramUI/StickersChatInputContextPanelNode.swift @@ -0,0 +1,239 @@ +import Foundation +import AsyncDisplayKit +import Postbox +import TelegramCore +import Display + +private struct StickersChatInputContextPanelEntryStableId: Hashable { + let text: String + + var hashValue: Int { + return self.text.hashValue + } + + static func ==(lhs: StickersChatInputContextPanelEntryStableId, rhs: StickersChatInputContextPanelEntryStableId) -> Bool { + return lhs.text == rhs.text + } +} + +private struct StickersChatInputContextPanelEntry: Comparable, Identifiable { + let index: Int + let theme: PresentationTheme + let text: String + + var stableId: StickersChatInputContextPanelEntryStableId { + return StickersChatInputContextPanelEntryStableId(text: self.text) + } + + func withUpdatedTheme(_ theme: PresentationTheme) -> StickersChatInputContextPanelEntry { + return StickersChatInputContextPanelEntry(index: self.index, theme: theme, text: self.text) + } + + static func ==(lhs: StickersChatInputContextPanelEntry, rhs: StickersChatInputContextPanelEntry) -> Bool { + return lhs.index == rhs.index && lhs.text == rhs.text && lhs.theme === rhs.theme + } + + static func <(lhs: StickersChatInputContextPanelEntry, rhs: StickersChatInputContextPanelEntry) -> Bool { + return lhs.index < rhs.index + } + + func item(account: Account, hashtagSelected: @escaping (String) -> Void) -> ListViewItem { + return StickersChatInputPanelItem(theme: self.theme, text: self.text, hashtagSelected: hashtagSelected) + } +} + +private struct StickersChatInputContextPanelTransition { + let deletions: [ListViewDeleteItem] + let insertions: [ListViewInsertItem] + let updates: [ListViewUpdateItem] +} + +private func preparedTransition(from fromEntries: [StickersChatInputContextPanelEntry], to toEntries: [StickersChatInputContextPanelEntry], account: Account, hashtagSelected: @escaping (String) -> Void) -> StickersChatInputContextPanelTransition { + let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) + + let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, hashtagSelected: hashtagSelected), directionHint: nil) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, hashtagSelected: hashtagSelected), directionHint: nil) } + + return StickersChatInputContextPanelTransition(deletions: deletions, insertions: insertions, updates: updates) +} + +final class StickersChatInputContextPanelNode: ChatInputContextPanelNode { + + private let listView: ListView + private var currentEntries: [StickersChatInputContextPanelEntry]? + + private var enqueuedTransitions: [(StickersChatInputContextPanelTransition, Bool)] = [] + 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 + self.listView.keepBottomItemOverscrollBackground = theme.list.plainBackgroundColor + self.listView.limitHitTestToNodes = true + self.listView.view.disablesInteractiveTransitionGestureRecognizer = true + + super.init(account: account, theme: theme, strings: strings) + + self.isOpaque = false + self.clipsToBounds = true + + self.addSubnode(self.listView) + } + + func updateResults(_ results: [String]) { + var entries: [StickersChatInputContextPanelEntry] = [] + var index = 0 + var stableIds = Set() + for text in results { + let entry = StickersChatInputContextPanelEntry(index: index, theme: self.theme, text: text) + if stableIds.contains(entry.stableId) { + continue + } + stableIds.insert(entry.stableId) + entries.append(entry) + index += 1 + } + self.prepareTransition(from: self.currentEntries ?? [], to: entries) + } + + private func prepareTransition(from: [StickersChatInputContextPanelEntry]? , to: [StickersChatInputContextPanelEntry]) { + let firstTime = from == nil + let transition = preparedTransition(from: from ?? [], to: to, account: self.account, hashtagSelected: { [weak self] text in + + }) + self.currentEntries = to + self.enqueueTransition(transition, firstTime: firstTime) + } + + private func enqueueTransition(_ transition: StickersChatInputContextPanelTransition, firstTime: Bool) { + self.enqueuedTransitions.append((transition, firstTime)) + + if self.validLayout != nil { + while !self.enqueuedTransitions.isEmpty { + self.dequeueTransition() + } + } + } + + private func dequeueTransition() { + if let validLayout = self.validLayout, let (transition, firstTime) = self.enqueuedTransitions.first { + self.enqueuedTransitions.remove(at: 0) + + var options = ListViewDeleteAndInsertOptions() + if firstTime { + //options.insert(.Synchronous) + //options.insert(.LowLatency) + } else { + options.insert(.AnimateTopItemPosition) + options.insert(.AnimateCrossfade) + } + + var insets = UIEdgeInsets() + insets.top = topInsetForLayout(size: validLayout.0) + insets.left = validLayout.1 + insets.right = validLayout.2 + + let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: validLayout.0, insets: insets, duration: 0.0, curve: .Default(duration: nil)) + + self.listView.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateSizeAndInsets: updateSizeAndInsets, updateOpaqueState: nil, completion: { [weak self] _ in + if let strongSelf = self, firstTime { + var topItemOffset: CGFloat? + strongSelf.listView.forEachItemNode { itemNode in + if topItemOffset == nil { + topItemOffset = itemNode.frame.minY + } + } + + 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) + } + } + }) + } + } + + private func topInsetForLayout(size: CGSize) -> CGFloat { + let minimumItemHeights: CGFloat = floor(MentionChatInputPanelItemNode.itemHeight * 3.5) + + return max(size.height - minimumItemHeights, 0.0) + } + + override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { + let hadValidLayout = self.validLayout != nil + self.validLayout = (size, leftInset, rightInset) + + var insets = UIEdgeInsets() + insets.top = self.topInsetForLayout(size: size) + insets.left = leftInset + insets.right = rightInset + + transition.updateFrame(node: self.listView, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height)) + + 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) + } + + let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: size, insets: insets, duration: duration, curve: listViewCurve) + + self.listView.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + + if !hadValidLayout { + while !self.enqueuedTransitions.isEmpty { + self.dequeueTransition() + } + } + + if self.theme !== interfaceState.theme { + self.theme = interfaceState.theme + self.listView.keepBottomItemOverscrollBackground = self.theme.list.plainBackgroundColor + + let new = self.currentEntries?.map({$0.withUpdatedTheme(interfaceState.theme)}) ?? [] + self.prepareTransition(from: self.currentEntries, to: new) + } + } + + override func animateOut(completion: @escaping () -> Void) { + var topItemOffset: CGFloat? + self.listView.forEachItemNode { itemNode in + if topItemOffset == nil { + topItemOffset = itemNode.frame.minY + } + } + + if let topItemOffset = topItemOffset { + let position = self.listView.layer.position + self.listView.layer.animatePosition(from: position, to: CGPoint(x: position.x, y: position.y + (self.listView.bounds.size.height - topItemOffset)), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in + completion() + }) + } else { + completion() + } + } + + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + let listViewFrame = self.listView.frame + return self.listView.hitTest(CGPoint(x: point.x - listViewFrame.minX, y: point.y - listViewFrame.minY), with: event) + } +} + diff --git a/TelegramUI/StickersChatInputPanelItem.swift b/TelegramUI/StickersChatInputPanelItem.swift new file mode 100644 index 0000000000..3ea953c990 --- /dev/null +++ b/TelegramUI/StickersChatInputPanelItem.swift @@ -0,0 +1,134 @@ +import Foundation +import AsyncDisplayKit +import Display +import TelegramCore +import SwiftSignalKit +import Postbox + +final class StickersChatInputPanelItem: ListViewItem { + fileprivate let theme: PresentationTheme + fileprivate let text: String + private let hashtagSelected: (String) -> Void + + let selectable: Bool = true + + public init(theme: PresentationTheme, text: String, hashtagSelected: @escaping (String) -> Void) { + self.theme = theme + self.text = text + self.hashtagSelected = hashtagSelected + } + + public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { + let configure = { () -> Void in + let node = StickersChatInputPanelItemNode() + + let nodeLayout = node.asyncLayout() + let (top, bottom) = (previousItem != nil, nextItem != nil) + let (layout, apply) = nodeLayout(self, params, top, bottom) + + node.contentSize = layout.contentSize + node.insets = layout.insets + + Queue.mainQueue().async { + completion(node, { + return (nil, { _ in apply(.None) }) + }) + } + } + if Thread.isMainThread { + async { + configure() + } + } else { + configure() + } + } + + public 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? StickersChatInputPanelItemNode { + let nodeLayout = nodeValue.asyncLayout() + + async { + let (top, bottom) = (previousItem != nil, nextItem != nil) + + let (layout, apply) = nodeLayout(self, params, top, bottom) + Queue.mainQueue().async { + completion(layout, { _ in + apply(animation) + }) + } + } + } else { + assertionFailure() + } + } + } +} + +private let textFont = Font.medium(14.0) + +final class StickersChatInputPanelItemNode: ListViewItemNode { + static let itemHeight: CGFloat = 42.0 + private let textNode: TextNode + private let topSeparatorNode: ASDisplayNode + private let highlightedBackgroundNode: ASDisplayNode + + init() { + self.textNode = TextNode() + + self.topSeparatorNode = ASDisplayNode() + self.topSeparatorNode.isLayerBacked = true + + self.highlightedBackgroundNode = ASDisplayNode() + self.highlightedBackgroundNode.isLayerBacked = true + + super.init(layerBacked: false, dynamicBounce: false) + + self.addSubnode(self.topSeparatorNode) + self.addSubnode(self.textNode) + } + + override public func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) { + if let item = item as? StickersChatInputPanelItem { + let doLayout = self.asyncLayout() + let merged = (top: previousItem != nil, bottom: nextItem != nil) + let (layout, apply) = doLayout(item, params, merged.top, merged.bottom) + self.contentSize = layout.contentSize + self.insets = layout.insets + apply(.None) + } + } + + func asyncLayout() -> (_ item: StickersChatInputPanelItem, _ params: ListViewItemLayoutParams, _ mergedTop: Bool, _ mergedBottom: Bool) -> (ListViewItemNodeLayout, (ListViewItemUpdateAnimation) -> Void) { + let makeTextLayout = TextNode.asyncLayout(self.textNode) + return { [weak self] item, params, mergedTop, mergedBottom in + let baseWidth = params.width - params.leftInset - params.rightInset + + let leftInset: CGFloat = 15.0 + params.leftInset + let rightInset: CGFloat = 10.0 + params.rightInset + + let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "#\(item.text)", font: textFont, textColor: item.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - rightInset, height: 100.0), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + + let nodeLayout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: HashtagChatInputPanelItemNode.itemHeight), insets: UIEdgeInsets()) + + return (nodeLayout, { _ in + if let strongSelf = self { + strongSelf.topSeparatorNode.backgroundColor = item.theme.list.itemPlainSeparatorColor + strongSelf.backgroundColor = item.theme.list.plainBackgroundColor + strongSelf.highlightedBackgroundNode.backgroundColor = item.theme.list.itemHighlightedBackgroundColor + + let _ = textApply() + strongSelf.textNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((nodeLayout.contentSize.height - textLayout.size.height) / 2.0)), size: textLayout.size) + + strongSelf.topSeparatorNode.isHidden = mergedTop + + + strongSelf.topSeparatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: params.width, height: UIScreenPixel)) + + strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: params.width, height: nodeLayout.size.height + UIScreenPixel)) + } + }) + } + } +} diff --git a/TelegramUI/TelegramRootController.swift b/TelegramUI/TelegramRootController.swift index 0c614da7a5..e2c6fbf1f7 100644 --- a/TelegramUI/TelegramRootController.swift +++ b/TelegramUI/TelegramRootController.swift @@ -82,7 +82,7 @@ public final class TelegramRootController: NavigationController { // // DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.15) { // //(controller.navigationController as? NavigationController)?.pushViewController(ThemeGridController(account: self.account)) -// +// // let wrapperNode = ASDisplayNode() // let bounds = controller.displayNode.bounds // wrapperNode.frame = bounds diff --git a/TelegramUI/ThemeColorsGridController.swift b/TelegramUI/ThemeColorsGridController.swift index 4af844602b..0a3007c2a1 100644 --- a/TelegramUI/ThemeColorsGridController.swift +++ b/TelegramUI/ThemeColorsGridController.swift @@ -45,7 +45,8 @@ private func availableColors() -> [Int32] { } private func randomColor() -> Int32 { - return availableColors().randomElement() ?? 0x000000 + let colors = availableColors() + return colors[1 ..< colors.count - 1].randomElement() ?? 0x000000 } final class ThemeColorsGridController: ViewController { @@ -116,9 +117,18 @@ final class ThemeColorsGridController: ViewController { override func loadDisplayNode() { self.displayNode = ThemeColorsGridControllerNode(account: self.account, presentationData: self.presentationData, colors: availableColors(), present: { [weak self] controller, arguments in self?.present(controller, in: .window(.root), with: arguments, blockInteraction: true) + }, pop: { [weak self] in + if let strongSelf = self, let navigationController = strongSelf.navigationController as? NavigationController { + let _ = navigationController.popViewController(animated: true) + } }, presentColorPicker: { [weak self] in if let strongSelf = self { let controller = WallpaperListPreviewController(account: strongSelf.account, source: .customColor(randomColor())) + controller.apply = { _, _, _ in + if let strongSelf = self, let navigationController = strongSelf.navigationController as? NavigationController { + let _ = navigationController.popViewController(animated: true) + } + } self?.present(controller, in: .window(.root), blockInteraction: true) } }) diff --git a/TelegramUI/ThemeColorsGridControllerNode.swift b/TelegramUI/ThemeColorsGridControllerNode.swift index 11304319b9..a757f0f61a 100644 --- a/TelegramUI/ThemeColorsGridControllerNode.swift +++ b/TelegramUI/ThemeColorsGridControllerNode.swift @@ -79,7 +79,7 @@ final class ThemeColorsGridControllerNode: ASDisplayNode { private var disposable: Disposable? - init(account: Account, presentationData: PresentationData, colors: [Int32], present: @escaping (ViewController, Any?) -> Void, presentColorPicker: @escaping () -> Void) { + init(account: Account, presentationData: PresentationData, colors: [Int32], present: @escaping (ViewController, Any?) -> Void, pop: @escaping () -> Void, presentColorPicker: @escaping () -> Void) { self.account = account self.presentationData = presentationData self.present = present @@ -119,7 +119,11 @@ final class ThemeColorsGridControllerNode: ASDisplayNode { 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, type: .colors)) + let controller = WallpaperGalleryController(account: account, source: .list(wallpapers: wallpapers, central: wallpaper, type: .colors)) + controller.apply = { _, _, _ in + pop() + } + //let controller = WallpaperListPreviewController(account: account, source: .list(wallpapers: wallpapers, central: wallpaper, type: .colors)) strongSelf.present(controller, nil) } } diff --git a/TelegramUI/ThemeGalleryController.swift b/TelegramUI/ThemeGalleryController.swift index 4438e244f4..19b5976528 100644 --- a/TelegramUI/ThemeGalleryController.swift +++ b/TelegramUI/ThemeGalleryController.swift @@ -206,7 +206,7 @@ class ThemeGalleryController: ViewController { let toolbarNode = ThemeGalleryToolbarNode(theme: presentationData.theme, strings: presentationData.strings) self.toolbarNode = toolbarNode self.galleryNode.addSubnode(toolbarNode) - self.galleryNode.toolbarNode = toolbarNode + //self.galleryNode.toolbarNode = toolbarNode toolbarNode.cancel = { [weak self] in self?.dismiss(forceAway: true) } diff --git a/TelegramUI/ThemeGalleryToolbarNode.swift b/TelegramUI/ThemeGalleryToolbarNode.swift index 8cfeedb2ef..2c0c35a9aa 100644 --- a/TelegramUI/ThemeGalleryToolbarNode.swift +++ b/TelegramUI/ThemeGalleryToolbarNode.swift @@ -49,6 +49,11 @@ final class ThemeGalleryToolbarNode: ASDisplayNode { self.doneButton.addTarget(self, action: #selector(self.donePressed), forControlEvents: .touchUpInside) } + func setDoneEnabled(_ enabled: Bool) { + self.doneButton.alpha = enabled ? 1.0 : 0.3 + self.doneButton.isUserInteractionEnabled = enabled + } + func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) { self.backgroundColor = theme.rootController.tabBar.backgroundColor self.separatorNode.backgroundColor = theme.rootController.tabBar.separatorColor diff --git a/TelegramUI/ThemeGridController.swift b/TelegramUI/ThemeGridController.swift index 85cf5b3996..48dae36458 100644 --- a/TelegramUI/ThemeGridController.swift +++ b/TelegramUI/ThemeGridController.swift @@ -64,10 +64,10 @@ final class ThemeGridController: ViewController { } }) - self.searchContentNode = NavigationBarSearchContentNode(theme: self.presentationData.theme, placeholder: self.presentationData.strings.Wallpaper_Search, activate: { [weak self] in - self?.activateSearch() - }) - self.navigationBar?.setContentNode(self.searchContentNode, animated: false) +// self.searchContentNode = NavigationBarSearchContentNode(theme: self.presentationData.theme, placeholder: self.presentationData.strings.Wallpaper_Search, activate: { [weak self] in +// self?.activateSearch() +// }) +// self.navigationBar?.setContentNode(self.searchContentNode, animated: false) } required public init(coder aDecoder: NSCoder) { @@ -84,11 +84,11 @@ final class ThemeGridController: ViewController { if let isEmpty = self.isEmpty, isEmpty { } else { - if self.editingMode { - self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed)) - } else { - self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed)) - } +// if self.editingMode { +// self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed)) +// } else { +// self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed)) +// } } self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBar.style.style @@ -103,19 +103,19 @@ final class ThemeGridController: ViewController { override func loadDisplayNode() { self.displayNode = ThemeGridControllerNode(account: self.account, presentationData: self.presentationData, presentPreviewController: { [weak self] source in if let strongSelf = self { - //let controller = WallpaperGalleryController(account: strongSelf.account, source: source) - //self?.present(controller, in: .window(.root), with: nil, blockInteraction: true) - 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() - } - } - } + let controller = WallpaperGalleryController(account: strongSelf.account, source: source) self?.present(controller, in: .window(.root), with: nil, blockInteraction: true) +// 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 { @@ -132,11 +132,12 @@ final class ThemeGridController: ViewController { let controller = WallpaperListPreviewController(account: strongSelf.account, source: .asset(asset.backingAsset, thumbnailImage)) controller.apply = { [weak self, weak legacyController, weak controller] wallpaper, mode, cropRect in if let strongSelf = self, let legacyController = legacyController, let controller = controller { - strongSelf.uploadCustomWallpaper(wallpaper, mode: mode, cropRect: cropRect) - - let _ = (strongSelf.navigationController as? NavigationController)?.popViewController(animated: true) - legacyController.dismiss() - controller.dismiss() + strongSelf.uploadCustomWallpaper(wallpaper, mode: mode, cropRect: cropRect, completion: { [weak legacyController, weak controller] in + if let legacyController = legacyController, let controller = controller { + legacyController.dismiss() + controller.dismiss() + } + }) } } strongSelf.present(controller, in: .window(.root), with: nil, blockInteraction: true) @@ -164,11 +165,11 @@ final class ThemeGridController: ViewController { if empty { strongSelf.navigationItem.setRightBarButton(nil, animated: true) } else { - if strongSelf.editingMode { - strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.donePressed)) - } else { - strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: strongSelf, action: #selector(strongSelf.editPressed)) - } +// if strongSelf.editingMode { +// strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.donePressed)) +// } else { +// strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: strongSelf, action: #selector(strongSelf.editPressed)) +// } } } } @@ -238,13 +239,13 @@ final class ThemeGridController: ViewController { self.displayNodeDidLoad() } - private func uploadCustomWallpaper(_ wallpaper: WallpaperEntry, mode: WallpaperPresentationOptions, cropRect: CGRect?) { + private func uploadCustomWallpaper(_ wallpaper: WallpaperEntry, mode: WallpaperPresentationOptions, cropRect: CGRect?, completion: @escaping () -> Void) { let imageSignal: Signal switch wallpaper { case .wallpaper: imageSignal = .complete() case let .asset(asset, _): - imageSignal = fetchPhotoLibraryImage(localIdentifier: asset.localIdentifier) + imageSignal = fetchPhotoLibraryImage(localIdentifier: asset.localIdentifier, thumbnail: false) |> filter { value in return !(value?.1 ?? true) } @@ -311,29 +312,31 @@ final class ThemeGridController: ViewController { })).start() } - let completion: () -> Void = { - let wallpaper: TelegramWallpaper = .image([TelegramMediaImageRepresentation(dimensions: image.size, resource: resource)]) + let apply: () -> Void = { + let wallpaper: TelegramWallpaper = .image([TelegramMediaImageRepresentation(dimensions: croppedImage.size, resource: resource)]) updateWallpaper(wallpaper) - - let _ = uploadWallpaper(account: account, resource: resource).start(next: { status in - if case let .complete(wallpaper) = status { - if mode.contains(.blur), 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) - } - } - }) + DispatchQueue.main.async { + completion() + } +// let _ = uploadWallpaper(account: account, resource: resource).start(next: { status in +// if case let .complete(wallpaper) = status { +// if mode.contains(.blur), 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) +// } +// } +// }).start() } if mode.contains(.blur) { let _ = account.postbox.mediaBox.cachedResourceRepresentation(resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true).start(completed: { - completion() + apply() }) } else { - completion() + apply() } } diff --git a/TelegramUI/ThemeGridControllerNode.swift b/TelegramUI/ThemeGridControllerNode.swift index cf736c6c2c..92623b10e4 100644 --- a/TelegramUI/ThemeGridControllerNode.swift +++ b/TelegramUI/ThemeGridControllerNode.swift @@ -233,7 +233,7 @@ final class ThemeGridControllerNode: ASDisplayNode { self.gridNode.addSubnode(self.separatorNode) self.gridNode.addSubnode(self.colorItemNode) self.gridNode.addSubnode(self.galleryItemNode) - self.gridNode.addSubnode(self.descriptionItemNode) + //self.gridNode.addSubnode(self.descriptionItemNode) self.addSubnode(self.gridNode) let wallpapersPromise: Promise<[TelegramWallpaper]> = Promise() @@ -471,7 +471,7 @@ final class ThemeGridControllerNode: ASDisplayNode { let buttonTopInset: CGFloat = 32.0 let buttonHeight: CGFloat = 44.0 - let buttonBottomInset: CGFloat = descriptionLayout.contentSize.height + 17.0 + let buttonBottomInset: CGFloat = 35.0 //descriptionLayout.contentSize.height + 17.0 let buttonInset: CGFloat = buttonTopInset + buttonHeight * 2.0 + buttonBottomInset let buttonOffset = buttonInset + 10.0 diff --git a/TelegramUI/WallpaperColorPickerNode.swift b/TelegramUI/WallpaperColorPickerNode.swift index 5e6b0e339b..4ba50fe3c8 100644 --- a/TelegramUI/WallpaperColorPickerNode.swift +++ b/TelegramUI/WallpaperColorPickerNode.swift @@ -244,6 +244,9 @@ final class WallpaperColorPickerNode: ASDisplayNode { let colorPanRecognizer = UIPanGestureRecognizer(target: self, action: #selector(WallpaperColorPickerNode.colorPan)) self.colorNode.view.addGestureRecognizer(colorPanRecognizer) + let colorTapRecognizer = UITapGestureRecognizer(target: self, action: #selector(WallpaperColorPickerNode.colorTap)) + self.colorNode.view.addGestureRecognizer(colorTapRecognizer) + let brightnessPanRecognizer = UIPanGestureRecognizer(target: self, action: #selector(WallpaperColorPickerNode.brightnessPan)) self.brightnessNode.view.addGestureRecognizer(brightnessPanRecognizer) } @@ -286,6 +289,23 @@ final class WallpaperColorPickerNode: ASDisplayNode { self.updateKnobLayout(size: size, panningColor: false, transition: transition) } + @objc private func colorTap(_ recognizer: UITapGestureRecognizer) { + guard let size = self.validLayout, recognizer.state == .recognized else { + return + } + + let location = recognizer.location(in: recognizer.view) + let newHue = max(0.0, min(1.0, location.x / size.width)) + let newSaturation = max(0.0, min(1.0, (1.0 - location.y / (size.height - 66.0)))) + self.colorHSV.0 = newHue + self.colorHSV.1 = newSaturation + + self.updateKnobLayout(size: size, panningColor: false, transition: .immediate) + + self.update() + self.colorChanged?(self.color) + } + @objc private func colorPan(_ recognizer: UIPanGestureRecognizer) { guard let size = self.validLayout else { return @@ -307,7 +327,7 @@ final class WallpaperColorPickerNode: ASDisplayNode { switch recognizer.state { case .began: - self.updateKnobLayout(size: size, panningColor: true, transition: .animated(duration: 0.3, curve: .easeInOut)) + self.updateKnobLayout(size: size, panningColor: true, transition: .immediate) case .changed: self.updateKnobLayout(size: size, panningColor: true, transition: .immediate) recognizer.setTranslation(CGPoint(), in: recognizer.view) diff --git a/TelegramUI/WallpaperGalleryController.swift b/TelegramUI/WallpaperGalleryController.swift index 4f5882d77c..e15e892242 100644 --- a/TelegramUI/WallpaperGalleryController.swift +++ b/TelegramUI/WallpaperGalleryController.swift @@ -50,6 +50,17 @@ enum WallpaperGalleryEntry: Equatable { } } +class WallpaperGalleryOverlayNode: ASDisplayNode { + override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { + let result = super.hitTest(point, with: event) + if result != self.view { + return result + } else { + return nil + } + } +} + class WallpaperGalleryController: ViewController { private var galleryNode: GalleryControllerNode { return self.displayNode as! GalleryControllerNode @@ -57,7 +68,7 @@ class WallpaperGalleryController: ViewController { private let account: Account private let source: WallpaperListSource - var apply: ((WallpaperEntry, WallpaperPresentationOptions, CGRect?) -> Void)? + var apply: ((WallpaperGalleryEntry, WallpaperPresentationOptions, CGRect?) -> Void)? private let _ready = Promise() override var ready: Promise { @@ -79,6 +90,8 @@ class WallpaperGalleryController: ViewController { private var validLayout: (ContainerViewLayout, CGFloat)? + private var overlayNode: WallpaperGalleryOverlayNode? + private var messageNodes: [ListViewItemNode]? private var toolbarNode: ThemeGalleryToolbarNode? init(account: Account, source: WallpaperListSource) { @@ -119,24 +132,6 @@ class WallpaperGalleryController: ViewController { self.centralEntryIndex = 0 } -// let initialEntries: [ThemeGalleryEntry] = wallpapers.map { ThemeGalleryEntry.wallpaper($0) } -// let entriesSignal: Signal<[ThemeGalleryEntry], NoError> = .single(initialEntries) -// -// self.disposable.set((entriesSignal |> deliverOnMainQueue).start(next: { [weak self] entries in -// if let strongSelf = self { -// strongSelf.entries = entries -// strongSelf.centralEntryIndex = wallpapers.index(of: centralWallpaper)! -// if strongSelf.isViewLoaded { -// strongSelf.galleryNode.pager.replaceItems(strongSelf.entries.map({ ThemeGalleryItem(account: account, entry: $0) }), centralItemIndex: strongSelf.centralEntryIndex, keepFirst: true) -// -// let ready = strongSelf.galleryNode.pager.ready() |> timeout(2.0, queue: Queue.mainQueue(), alternate: .single(Void())) |> afterNext { [weak strongSelf] _ in -// strongSelf?.didSetReady = true -// } -// strongSelf._ready.set(ready |> map { true }) -// } -// } -// })) - self.presentationDataDisposable = (account.telegramApplicationContext.presentationData |> deliverOnMainQueue).start(next: { [weak self] presentationData in if let strongSelf = self { @@ -150,15 +145,18 @@ class WallpaperGalleryController: ViewController { } }) - //self.centralItemAttributesDisposable.add(self.centralItemTitleView.get().start(next: { [weak self] titleView in - // self?.navigationItem.titleView = titleView - //})) - -// self.centralItemAttributesDisposable.add(self.centralItemFooterContentNode.get().start(next: { [weak self] footerContentNode in -// self?.galleryNode.updatePresentationState({ -// $0.withUpdatedFooterContentNode(footerContentNode) -// }, transition: .immediate) -// })) + self.centralItemAttributesDisposable.add(self.centralItemStatus.get().start(next: { [weak self] status in + if let strongSelf = self { + let enabled: Bool + switch status { + case .Local: + enabled = true + default: + enabled = false + } + strongSelf.toolbarNode?.setDoneEnabled(enabled) + } + })) } required init(coder aDecoder: NSCoder) { @@ -177,16 +175,12 @@ class WallpaperGalleryController: ViewController { self.toolbarNode?.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings) } - @objc func donePressed() { - self.dismiss(forceAway: false) - } - private func dismiss(forceAway: Bool) { - let completion = { [weak self] in + let completion: () -> Void = { [weak self] in self?.presentingViewController?.dismiss(animated: false, completion: nil) } - //self.galleryNode.modalAnimateOut(completion: completion) + self.galleryNode.modalAnimateOut(completion: completion) } override func loadDisplayNode() { @@ -203,27 +197,14 @@ class WallpaperGalleryController: ViewController { self.galleryNode.statusBar = self.statusBar self.galleryNode.navigationBar = self.navigationBar - - self.galleryNode.transitionDataForCentralItem = { [weak self] in -// if let strongSelf = self { -// if let centralItemNode = strongSelf.galleryNode.pager.centralItemNode(), let presentationArguments = strongSelf.presentationArguments as? ThemePreviewControllerPresentationArguments { -// if let transitionArguments = presentationArguments.transitionArguments(strongSelf.entries[centralItemNode.index]) { -// return (transitionArguments.transitionNode, transitionArguments.addToTransitionSurface) -// } -// } -// } - return nil - } self.galleryNode.dismiss = { [weak self] in self?.presentingViewController?.dismiss(animated: false, completion: nil) } self.galleryNode.pager.centralItemIndexUpdated = { [weak self] index in if let strongSelf = self { - if let index = index { - if let node = strongSelf.galleryNode.pager.centralItemNode() { - //strongSelf.centralItemTitle.set(node.title()) - } + if let node = strongSelf.galleryNode.pager.centralItemNode() as? WallpaperGalleryItemNode { + strongSelf.centralItemStatus.set(node.status.get()) } } } @@ -234,29 +215,36 @@ class WallpaperGalleryController: ViewController { let presentationData = self.account.telegramApplicationContext.currentPresentationData.with { $0 } let toolbarNode = ThemeGalleryToolbarNode(theme: presentationData.theme, strings: presentationData.strings) + let overlayNode = WallpaperGalleryOverlayNode() + self.overlayNode = overlayNode + self.galleryNode.overlayNode = overlayNode + self.galleryNode.addSubnode(overlayNode) + self.toolbarNode = toolbarNode - self.galleryNode.addSubnode(toolbarNode) - self.galleryNode.toolbarNode = toolbarNode + overlayNode.addSubnode(toolbarNode) + toolbarNode.cancel = { [weak self] in - //self?.dismiss(forceAway: true) + self?.dismiss(forceAway: true) } toolbarNode.done = { [weak self] in -// if let strongSelf = self { -// if let centralItemNode = strongSelf.galleryNode.pager.centralItemNode() { -// if !strongSelf.entries.isEmpty { -// let wallpaper: TelegramWallpaper -// switch strongSelf.entries[centralItemNode.index] { -// case let .wallpaper(value): -// wallpaper = value -// } -// let _ = (updatePresentationThemeSettingsInteractively(postbox: strongSelf.account.postbox, { current in -// return PresentationThemeSettings(chatWallpaper: wallpaper, chatWallpaperOptions: [], theme: current.theme, themeAccentColor: current.themeAccentColor, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, disableAnimations: current.disableAnimations) -// }) |> deliverOnMainQueue).start(completed: { -// self?.dismiss(forceAway: true) -// }) -// } -// } -// } + if let strongSelf = self { + if let centralItemNode = strongSelf.galleryNode.pager.centralItemNode() { + if !strongSelf.entries.isEmpty { + let entry = strongSelf.entries[centralItemNode.index] + switch entry { + case let .wallpaper(wallpaper): + let _ = (updatePresentationThemeSettingsInteractively(postbox: strongSelf.account.postbox, { current in + return PresentationThemeSettings(chatWallpaper: wallpaper, chatWallpaperOptions: [], theme: current.theme, themeAccentColor: current.themeAccentColor, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, disableAnimations: current.disableAnimations) + }) |> deliverOnMainQueue).start(completed: { + self?.dismiss(forceAway: true) + }) + default: + break + } + strongSelf.apply?(entry, [], nil) + } + } + } } let ready = self.galleryNode.pager.ready() |> timeout(2.0, queue: Queue.mainQueue(), alternate: .single(Void())) |> afterNext { [weak self] _ in @@ -276,10 +264,129 @@ class WallpaperGalleryController: ViewController { self.galleryNode.frame = CGRect(origin: CGPoint(), size: layout.size) self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition) + self.overlayNode?.frame = self.galleryNode.bounds + + var items: [ChatMessageItem] = [] + let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) + let otherPeerId = self.account.peerId + var peers = SimpleDictionary() + let messages = SimpleDictionary() + 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 }, 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 + }, canSetupReply: { _ in + return false + }, navigateToFirstDateMessage: { _ in + }, requestRedeliveryOfFailedMessages: { _ in + }, addContact: { _ in + }, rateCall: { _, _ in + }, requestSelectMessagePollOption: { _, _ in + }, openAppStorePage: { + }, requestMessageUpdate: { _ in + }, cancelInteractiveKeyboardGestures: { + }, automaticMediaDownloadSettings: AutomaticMediaDownloadSettings.defaultSettings, + pollActionState: ChatInterfacePollActionState()) + + 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) + + let topMessageText: String + let bottomMessageText: String + switch self.source { + case .wallpaper, .slug: + topMessageText = presentationData.strings.WallpaperPreview_PreviewTopText + bottomMessageText = presentationData.strings.WallpaperPreview_PreviewBottomText + case let .list(_, _, type): + switch type { + case .wallpapers: + topMessageText = presentationData.strings.WallpaperPreview_SwipeTopText + bottomMessageText = presentationData.strings.WallpaperPreview_SwipeBottomText + case .colors: + topMessageText = presentationData.strings.WallpaperPreview_SwipeColorsTopText + bottomMessageText = presentationData.strings.WallpaperPreview_SwipeColorsBottomText + } + case .asset, .contextResult: + topMessageText = presentationData.strings.WallpaperPreview_CropTopText + bottomMessageText = presentationData.strings.WallpaperPreview_CropBottomText + case .customColor: + topMessageText = presentationData.strings.WallpaperPreview_CustomColorTopText + bottomMessageText = presentationData.strings.WallpaperPreview_CustomColorBottomText + } + + 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: bottomMessageText, 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: topMessageText, 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 { + for i in 0 ..< items.count { + let itemNode = messageNodes[i] + items[i].updateNode(async: { $0() }, node: { + return itemNode + }, params: params, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], animation: .None, completion: { (layout, apply) in + let nodeFrame = CGRect(origin: itemNode.frame.origin, size: CGSize(width: layout.size.width, height: layout.size.height)) + + itemNode.contentSize = layout.contentSize + itemNode.insets = layout.insets + itemNode.frame = nodeFrame + itemNode.isUserInteractionEnabled = false + + apply(ListViewItemApply(isOnScreen: true)) + }) + } + } else { + var messageNodes: [ListViewItemNode] = [] + for i in 0 ..< items.count { + var itemNode: ListViewItemNode? + items[i].nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: false, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], completion: { node, apply in + itemNode = node + apply().1(ListViewItemApply(isOnScreen: true)) + }) + itemNode!.subnodeTransform = CATransform3DMakeRotation(CGFloat.pi, 0.0, 0.0, 1.0) + itemNode!.isUserInteractionEnabled = false + messageNodes.append(itemNode!) + self.overlayNode?.addSubnode(itemNode!) + } + self.messageNodes = messageNodes + } + + var bottomInset = layout.intrinsicInsets.bottom + 49.0 + + var optionsAvailable = true + if let centralItemNode = self.galleryNode.pager.centralItemNode() { + if !self.entries.isEmpty { + let entry = self.entries[centralItemNode.index] + switch entry { + case let .wallpaper(wallpaper): + switch wallpaper { + case .color: + optionsAvailable = false + default: + break + } + default: + break + } + } + } transition.updateFrame(node: self.toolbarNode!, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width, height: 49.0 + layout.intrinsicInsets.bottom))) self.toolbarNode!.updateLayout(size: CGSize(width: layout.size.width, height: 49.0), layout: layout, transition: transition) + if let messageNodes = self.messageNodes { + 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 + } + } + let replace = self.validLayout == nil self.validLayout = (layout, 0.0) diff --git a/TelegramUI/WallpaperGalleryItem.swift b/TelegramUI/WallpaperGalleryItem.swift index 4a1e0afac3..3c4855ae39 100644 --- a/TelegramUI/WallpaperGalleryItem.swift +++ b/TelegramUI/WallpaperGalleryItem.swift @@ -116,7 +116,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { case let .wallpaper(wallpaper): switch wallpaper { case .builtin: - displaySize = CGSize(width: 640.0, height: 1136.0) + displaySize = CGSize(width: 1308.0, height: 2688.0).fitted(CGSize(width: 1280.0, height: 1280.0)).dividedByScreenScale().integralFloor contentSize = displaySize signal = settingsBuiltinWallpaperImage(account: account) fetchSignal = .complete() @@ -135,10 +135,10 @@ final class WallpaperGalleryItemNode: GalleryItemNode { var convertedRepresentations: [ImageRepresentationWithReference] = [] for representation in file.file.previewRepresentations { - convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: .standalone(resource: representation.resource))) + convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: .wallpaper(resource: representation.resource))) } - convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource), reference: .standalone(resource: file.file.resource))) - signal = chatMessageImageFile(account: account, fileReference: .standalone(media: file.file), thumbnail: false) + convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource), reference: .wallpaper(resource: file.file.resource))) + signal = chatAvatarGalleryPhoto(account: account, fileReference: .standalone(media: file.file), representations: convertedRepresentations, alwaysShowThumbnailFirst: true, autoFetchFullSize: false) fetchSignal = fetchedMediaResource(postbox: account.postbox, reference: convertedRepresentations[convertedRepresentations.count - 1].reference) statusSignal = account.postbox.mediaBox.resourceStatus(file.file.resource) case let .image(representations): @@ -276,7 +276,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { controlsColorSignal = backgroundContrastColor(for: imagePromise.get()) } self.controlsColor.set(.single(.white) |> then(controlsColorSignal)) - self.status.set(statusSignal) + self.status.set(statusSignal |> deliverOnMainQueue) } } diff --git a/TelegramUI/WallpaperListPreviewController.swift b/TelegramUI/WallpaperListPreviewController.swift index e7716d1561..d7ccaecea1 100644 --- a/TelegramUI/WallpaperListPreviewController.swift +++ b/TelegramUI/WallpaperListPreviewController.swift @@ -55,7 +55,7 @@ final class WallpaperListPreviewController: ViewController { }) 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)) + //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)) } required init(coder aDecoder: NSCoder) { @@ -166,7 +166,7 @@ final class WallpaperListPreviewController: ViewController { } else { strongSelf.wallpaper = nil } - strongSelf.navigationItem.rightBarButtonItem = barButtonItem + //strongSelf.navigationItem.rightBarButtonItem = barButtonItem }) } diff --git a/TelegramUI/WallpaperListPreviewControllerNode.swift b/TelegramUI/WallpaperListPreviewControllerNode.swift index e0a112c72e..efa13e69ef 100644 --- a/TelegramUI/WallpaperListPreviewControllerNode.swift +++ b/TelegramUI/WallpaperListPreviewControllerNode.swift @@ -719,23 +719,23 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { self.colorPanelNode.updateLayout(size: colorPanelFrame.size, keyboardHeight: layout.inputHeight ?? 0.0, transition: transition) bottomInset += height - } - - var optionsAvailable = true - if let centralWallpaper = self.centralWallpaper { - switch centralWallpaper { - case let .wallpaper(wallpaper): - switch wallpaper { - case .color: - optionsAvailable = false - default: - break - } - default: - break - } } + let optionsAvailable = false //true +// if let centralWallpaper = self.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) @@ -875,6 +875,7 @@ final class WallpaperListPreviewControllerNode: ViewControllerTracingNode { break } self.apply(wallpaper, options, self.centralNode()?.cropRect) + self.isUserInteractionEnabled = false } } }