From e19439a33eb30468a373ad3cee293f4dd6fe3f65 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sat, 14 Dec 2019 03:32:42 +0400 Subject: [PATCH 1/5] Various theme improvements --- Telegram-iOS/en.lproj/Localizable.strings | 6 + .../Display/TransformImageArguments.swift | 18 +- .../Display/WallpaperBackgroundNode.swift | 2 +- .../CachedResourceRepresentations.swift | 19 +- .../TextSizeSelectionController.swift | 6 +- .../Sources/Themes/EditThemeController.swift | 5 + .../Themes/SettingsThemeWallpaperNode.swift | 23 +- .../Themes/ThemeAccentColorController.swift | 82 +- .../ThemeAccentColorControllerNode.swift | 537 +- .../Themes/ThemePreviewController.swift | 18 +- .../Themes/ThemePreviewControllerNode.swift | 27 +- .../Themes/ThemeSettingsAccentColorItem.swift | 63 +- .../Themes/ThemeSettingsController.swift | 53 +- .../Themes/ThemeSettingsThemeItem.swift | 582 +- .../Themes/WallpaperColorPanelNode.swift | 29 +- .../Themes/WallpaperGalleryController.swift | 8 +- .../Sources/Themes/WallpaperGalleryItem.swift | 24 +- .../Themes/WallpaperGalleryToolbarNode.swift | 44 +- ....swift => WallpaperOptionButtonNode.swift} | 41 +- .../Themes/WallpaperPatternPanelNode.swift | 169 +- .../SyncCore/Sources/TelegramWallpaper.swift | 34 +- .../ChatControllerBackgroundNode.swift | 19 +- .../Sources/DefaultDayPresentationTheme.swift | 3 +- .../Sources/PresentationData.swift | 20 +- .../Sources/PresentationStrings.swift | 4974 +++++++++-------- .../Sources/WallpaperUtils.swift | 9 + .../ThemeColorSwapIcon.imageset/Contents.json | 12 + .../ic_input_change.pdf | Bin 0 -> 4296 bytes .../ChatMessageAttachedContentNode.swift | 2 +- .../ChatMessageInteractiveMediaNode.swift | 24 +- .../ChatMessageWebpageBubbleContentNode.swift | 6 +- .../FetchCachedRepresentations.swift | 142 +- .../Resources/PresentationStrings.mapping | Bin 141616 -> 141792 bytes .../TelegramUI/UpgradedAccounts.swift | 2 +- .../TelegramUI/WallpaperPreviewMedia.swift | 4 +- .../Sources/PresentationThemeSettings.swift | 2 +- .../Sources/WallpaperResources.swift | 104 +- 37 files changed, 3981 insertions(+), 3132 deletions(-) rename submodules/SettingsUI/Sources/Themes/{WallpaperGalleryDecorationNode.swift => WallpaperOptionButtonNode.swift} (80%) create mode 100644 submodules/TelegramUI/Images.xcassets/Settings/ThemeColorSwapIcon.imageset/Contents.json create mode 100644 submodules/TelegramUI/Images.xcassets/Settings/ThemeColorSwapIcon.imageset/ic_input_change.pdf diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 88601572d0..9b8fb69067 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -5185,3 +5185,9 @@ Any member of this group will be able to see messages in the channel."; "Theme.Colors.Proceed" = "Proceed"; "AuthSessions.AddDevice.UrlLoginHint" = "This code can be used to allow someone to log in to your Telegram account.\n\nTo confirm Telegram login, please go to Settings > Devices > Scan QR and scan the code."; + +"Appearance.RemoveThemeColor" = "Remove Color"; + +"WallpaperPreview.PatternTitle" = "Choose Pattern"; +"WallpaperPreview.PatternPaternDiscard" = "Discard"; +"WallpaperPreview.PatternPaternApply" = "Apply"; diff --git a/submodules/Display/Display/TransformImageArguments.swift b/submodules/Display/Display/TransformImageArguments.swift index a7b1f64d25..122de00a10 100644 --- a/submodules/Display/Display/TransformImageArguments.swift +++ b/submodules/Display/Display/TransformImageArguments.swift @@ -7,6 +7,10 @@ public enum TransformImageResizeMode { case blurBackground } +public protocol TransformImageCustomArguments { + func serialized() -> NSArray +} + public struct TransformImageArguments: Equatable { public let corners: ImageCorners @@ -15,15 +19,17 @@ public struct TransformImageArguments: Equatable { public let intrinsicInsets: UIEdgeInsets public let resizeMode: TransformImageResizeMode public let emptyColor: UIColor? + public let custom: TransformImageCustomArguments? public let scale: CGFloat? - public init(corners: ImageCorners, imageSize: CGSize, boundingSize: CGSize, intrinsicInsets: UIEdgeInsets, resizeMode: TransformImageResizeMode = .fill(.black), emptyColor: UIColor? = nil, scale: CGFloat? = nil) { + public init(corners: ImageCorners, imageSize: CGSize, boundingSize: CGSize, intrinsicInsets: UIEdgeInsets, resizeMode: TransformImageResizeMode = .fill(.black), emptyColor: UIColor? = nil, custom: TransformImageCustomArguments? = nil, scale: CGFloat? = nil) { self.corners = corners self.imageSize = imageSize self.boundingSize = boundingSize self.intrinsicInsets = intrinsicInsets self.resizeMode = resizeMode self.emptyColor = emptyColor + self.custom = custom self.scale = scale } @@ -43,6 +49,14 @@ public struct TransformImageArguments: Equatable { } public static func ==(lhs: TransformImageArguments, rhs: TransformImageArguments) -> Bool { - return lhs.imageSize == rhs.imageSize && lhs.boundingSize == rhs.boundingSize && lhs.corners == rhs.corners && lhs.emptyColor == rhs.emptyColor + var result = lhs.imageSize == rhs.imageSize && lhs.boundingSize == rhs.boundingSize && lhs.corners == rhs.corners && lhs.emptyColor == rhs.emptyColor + if result { + if let lhsCustom = lhs.custom, let rhsCustom = rhs.custom { + return lhsCustom.serialized().isEqual(rhsCustom.serialized()) + } else { + return (lhs.custom != nil) == (rhs.custom != nil) + } + } + return result } } diff --git a/submodules/Display/Display/WallpaperBackgroundNode.swift b/submodules/Display/Display/WallpaperBackgroundNode.swift index fb3f47874a..203f3632de 100644 --- a/submodules/Display/Display/WallpaperBackgroundNode.swift +++ b/submodules/Display/Display/WallpaperBackgroundNode.swift @@ -81,7 +81,7 @@ public final class WallpaperBackgroundNode: ASDisplayNode { } public func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) { - let isFirstLayout = self.frame.isEmpty + let isFirstLayout = self.contentNode.frame.isEmpty transition.updatePosition(node: self.contentNode, position: CGPoint(x: size.width / 2.0, y: size.height / 2.0)) transition.updateBounds(node: self.contentNode, bounds: CGRect(origin: CGPoint(), size: size)) diff --git a/submodules/MediaResources/Sources/CachedResourceRepresentations.swift b/submodules/MediaResources/Sources/CachedResourceRepresentations.swift index 4c4b6b8270..da317b350c 100644 --- a/submodules/MediaResources/Sources/CachedResourceRepresentations.swift +++ b/submodules/MediaResources/Sources/CachedResourceRepresentations.swift @@ -148,20 +148,33 @@ public final class CachedPatternWallpaperRepresentation: CachedMediaResourceRepr public let keepDuration: CachedMediaRepresentationKeepDuration = .general public let color: Int32 + public let bottomColor: Int32? public let intensity: Int32 + public let rotation: Int32? public var uniqueId: String { - return "pattern-wallpaper-\(self.color)-\(self.intensity)" + var id: String + if let bottomColor = self.bottomColor { + id = "pattern-wallpaper-\(self.color)-\(bottomColor)-\(self.intensity)" + } else { + id = "pattern-wallpaper-\(self.color)-\(self.intensity)" + } + if let rotation = self.rotation, rotation != 0 { + id += "-\(rotation)deg" + } + return id } - public init(color: Int32, intensity: Int32) { + public init(color: Int32, bottomColor: Int32?, intensity: Int32, rotation: Int32?) { self.color = color + self.bottomColor = bottomColor self.intensity = intensity + self.rotation = rotation } public func isEqual(to: CachedMediaResourceRepresentation) -> Bool { if let to = to as? CachedPatternWallpaperRepresentation { - return self.color == to.color && self.intensity == intensity + return self.color == to.color && self.bottomColor == to.bottomColor && self.intensity == intensity && self.rotation == to.rotation } else { return false } diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift index 8b5de5ea31..f2ebfa88dd 100644 --- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift +++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift @@ -126,11 +126,15 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView self.toolbarNode.cancel = { dismiss() } + var dismissed = false self.toolbarNode.done = { [weak self] in guard let strongSelf = self else { return } - apply(strongSelf.presentationThemeSettings.useSystemFont, strongSelf.presentationThemeSettings.fontSize) + if !dismissed { + dismissed = true + apply(strongSelf.presentationThemeSettings.useSystemFont, strongSelf.presentationThemeSettings.fontSize) + } } self.toolbarNode.updateUseSystemFont = { [weak self] value in guard let strongSelf = self else { diff --git a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift index 7cf1ff0d94..57735a1003 100644 --- a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift +++ b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift @@ -315,6 +315,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll let _ = (previewThemePromise.get() |> take(1) |> deliverOnMainQueue).start(next: { theme in + var controllerDismissImpl: (() -> Void)? let controller = ThemeAccentColorController(context: context, mode: .edit(theme: theme, wallpaper: nil, defaultThemeReference: nil, create: false, completion: { updatedTheme in updateState { current in var state = current @@ -322,7 +323,11 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll state.updatedTheme = updatedTheme return state } + controllerDismissImpl?() })) + controllerDismissImpl = { [weak controller] in + controller?.dismiss() + } pushControllerImpl?(controller) }) }, openFile: { diff --git a/submodules/SettingsUI/Sources/Themes/SettingsThemeWallpaperNode.swift b/submodules/SettingsUI/Sources/Themes/SettingsThemeWallpaperNode.swift index a927943e2e..1208ef23e0 100644 --- a/submodules/SettingsUI/Sources/Themes/SettingsThemeWallpaperNode.swift +++ b/submodules/SettingsUI/Sources/Themes/SettingsThemeWallpaperNode.swift @@ -30,8 +30,8 @@ private func whiteColorImage(theme: PresentationTheme, color: UIColor) -> Signal } final class SettingsThemeWallpaperNode: ASDisplayNode { - private var wallpaper: TelegramWallpaper? - private var color: UIColor? + var wallpaper: TelegramWallpaper? + private var arguments: PatternWallpaperArguments? let buttonNode = HighlightTrackingButtonNode() let backgroundNode = ASDisplayNode() @@ -39,7 +39,7 @@ final class SettingsThemeWallpaperNode: ASDisplayNode { private let statusNode: RadialStatusNode var pressed: (() -> Void)? - + init(overlayBackgroundColor: UIColor = UIColor(white: 0.0, alpha: 0.3)) { self.imageNode.contentAnimations = [.subsequentUpdates] @@ -63,6 +63,10 @@ final class SettingsThemeWallpaperNode: ASDisplayNode { self.statusNode.transitionToState(state, animated: animated, completion: {}) } + func setOverlayBackgroundColor(_ color: UIColor) { + self.statusNode.backgroundNodeColor = color + } + func setWallpaper(context: AccountContext, wallpaper: TelegramWallpaper, selected: Bool, size: CGSize, cornerRadius: CGFloat = 0.0, synchronousLoad: Bool = false) { self.buttonNode.frame = CGRect(origin: CGPoint(), size: size) self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size) @@ -125,6 +129,7 @@ final class SettingsThemeWallpaperNode: ASDisplayNode { if file.isPattern { self.backgroundNode.isHidden = false + var patternColors: [UIColor] = [] var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5) var patternIntensity: CGFloat = 0.5 if let color = file.settings.color { @@ -132,9 +137,15 @@ final class SettingsThemeWallpaperNode: ASDisplayNode { patternIntensity = CGFloat(intensity) / 100.0 } patternColor = UIColor(rgb: UInt32(bitPattern: color), alpha: patternIntensity) + patternColors.append(patternColor) + + if let bottomColor = file.settings.bottomColor { + patternColors.append(UIColor(rgb: UInt32(bitPattern: bottomColor), alpha: patternIntensity)) + } } + self.backgroundNode.backgroundColor = patternColor - self.color = patternColor + self.arguments = PatternWallpaperArguments(colors: patternColors, rotation: file.settings.rotation) imageSignal = patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, mode: .thumbnail, autoFetchFullSize: true) } else { self.backgroundNode.isHidden = true @@ -144,7 +155,7 @@ final class SettingsThemeWallpaperNode: ASDisplayNode { self.imageNode.setSignal(imageSignal, attemptSynchronously: synchronousLoad) let dimensions = file.file.dimensions ?? PixelDimensions(width: 100, height: 100) - let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: dimensions.cgSize.aspectFilled(size), boundingSize: size, intrinsicInsets: UIEdgeInsets(), emptyColor: self.color)) + let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: dimensions.cgSize.aspectFilled(size), boundingSize: size, intrinsicInsets: UIEdgeInsets(), custom: self.arguments)) apply() } } else if let wallpaper = self.wallpaper { @@ -157,7 +168,7 @@ final class SettingsThemeWallpaperNode: ASDisplayNode { apply() case let .file(file): let dimensions = file.file.dimensions ?? PixelDimensions(width: 100, height: 100) - let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: dimensions.cgSize.aspectFilled(size), boundingSize: size, intrinsicInsets: UIEdgeInsets(), emptyColor: self.color)) + let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: dimensions.cgSize.aspectFilled(size), boundingSize: size, intrinsicInsets: UIEdgeInsets(), custom: self.arguments)) apply() } } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift index 2608b5e0e6..7c62b63322 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift @@ -10,8 +10,9 @@ import TelegramPresentationData import TelegramUIPreferences import AccountContext import PresentationDataUtils +import MediaResources -private let colors: [Int32] = [0x007aff, 0x00c2ed, 0x29b327, 0xeb6ca4, 0xf08200, 0x9472ee, 0xd33213, 0xedb400, 0x6d839e] +private let randomBackgroundColors: [Int32] = [0x007aff, 0x00c2ed, 0x29b327, 0xeb6ca4, 0xf08200, 0x9472ee, 0xd33213, 0xedb400, 0x6d839e] enum ThemeAccentColorControllerMode { case colors(themeReference: PresentationThemeReference) @@ -64,7 +65,7 @@ final class ThemeAccentColorController: ViewController { self.segmentedTitleView = ThemeColorSegmentedTitleView(theme: self.presentationData.theme, strings: self.presentationData.strings, selectedSection: section) if case .background = mode { - self.initialBackgroundColor = colors.randomElement().flatMap { UIColor(rgb: UInt32(bitPattern: $0)) } + self.initialBackgroundColor = randomBackgroundColors.randomElement().flatMap { UIColor(rgb: UInt32(bitPattern: $0)) } } else { self.initialBackgroundColor = nil } @@ -146,7 +147,35 @@ final class ThemeAccentColorController: ViewController { completion(updatedTheme) } else { - let _ = (updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in + let prepare: Signal + if let patternWallpaper = state.patternWallpaper, case let .file(file) = patternWallpaper, let backgroundColors = state.backgroundColors { + let resource = file.file.resource + let representation = CachedPatternWallpaperRepresentation(color: Int32(bitPattern: backgroundColors.0.rgb), bottomColor: backgroundColors.1.flatMap { Int32(bitPattern: $0.rgb) }, intensity: state.patternIntensity, rotation: state.rotation) + + var data: Data? + if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) { + data = maybeData + } else if let path = strongSelf.context.sharedContext.accountManager.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) { + data = maybeData + } + + if let data = data { + strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true) + prepare = (strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true) + |> filter({ $0.complete }) + |> take(1) + |> mapToSignal { _ -> Signal in + return .complete() + }) + } else { + prepare = .complete() + } + } else { + prepare = .complete() + } + + let _ = (prepare + |> then(updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in let autoNightModeTriggered = context.sharedContext.currentPresentationData.with { $0 }.autoNightModeTriggered var currentTheme = current.theme if autoNightModeTriggered { @@ -170,16 +199,21 @@ final class ThemeAccentColorController: ViewController { var wallpaper = themeSpecificChatWallpapers[currentTheme.index] if let backgroundColors = state.backgroundColors { - if let bottomColor = backgroundColors.1 { - wallpaper = .gradient(Int32(bitPattern: backgroundColors.0.rgb), Int32(bitPattern: bottomColor.rgb), WallpaperSettings()) + let color = Int32(bitPattern: backgroundColors.0.rgb) + let bottomColor = backgroundColors.1.flatMap { Int32(bitPattern: $0.rgb) } + + if let patternWallpaper = state.patternWallpaper { + wallpaper = patternWallpaper.withUpdatedSettings(WallpaperSettings(motion: state.motion, color: color, bottomColor: bottomColor, intensity: state.patternIntensity, rotation: state.rotation)) + } else if let bottomColor = bottomColor { + wallpaper = .gradient(color, bottomColor, WallpaperSettings(motion: state.motion, rotation: state.rotation)) } else { - wallpaper = .color(Int32(bitPattern: backgroundColors.0.rgb)) + wallpaper = .color(color) } } themeSpecificChatWallpapers[currentTheme.index] = wallpaper return PresentationThemeSettings(theme: current.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) - }) |> deliverOnMainQueue).start(completed: { [weak self] in + })) |> deliverOnMainQueue).start(completed: { [weak self] in if let strongSelf = self { strongSelf.completion?() strongSelf.dismiss() @@ -196,6 +230,7 @@ final class ThemeAccentColorController: ViewController { } let _ = (self.context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]) + |> take(1) |> deliverOnMainQueue).start(next: { [weak self] sharedData in guard let strongSelf = self else { return @@ -205,8 +240,12 @@ final class ThemeAccentColorController: ViewController { let accentColor: UIColor var initialWallpaper: TelegramWallpaper? let backgroundColors: (UIColor, UIColor?)? + var patternWallpaper: TelegramWallpaper? + var patternIntensity: Int32 = 50 + var motion = false let messageColors: (UIColor, UIColor?)? var defaultMessagesColor: UIColor? + var rotation: Int32 = 0 var ignoreDefaultWallpaper = false @@ -235,10 +274,28 @@ final class ThemeAccentColorController: ViewController { if let initialBackgroundColor = strongSelf.initialBackgroundColor { backgroundColors = (initialBackgroundColor, nil) } else if !ignoreDefaultWallpaper { - if case let .color(color) = wallpaper { + if case let .file(file) = wallpaper, file.isPattern { + var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5) + var bottomColor: UIColor? + if let color = file.settings.color { + if let intensity = file.settings.intensity { + patternIntensity = intensity + } + patternColor = UIColor(rgb: UInt32(bitPattern: color)) + if let bottomColorValue = file.settings.bottomColor { + bottomColor = UIColor(rgb: UInt32(bitPattern: bottomColorValue)) + } + } + patternWallpaper = wallpaper + backgroundColors = (patternColor, bottomColor) + motion = file.settings.motion + rotation = file.settings.rotation ?? 0 + } else if case let .color(color) = wallpaper { backgroundColors = (UIColor(rgb: UInt32(bitPattern: color)), nil) - } else if case let .gradient(topColor, bottomColor, _) = wallpaper { + } else if case let .gradient(topColor, bottomColor, settings) = wallpaper { backgroundColors = (UIColor(rgb: UInt32(bitPattern: topColor)), UIColor(rgb: UInt32(bitPattern: bottomColor))) + motion = settings.motion + rotation = settings.rotation ?? 0 } else { backgroundColors = nil } @@ -263,8 +320,9 @@ final class ThemeAccentColorController: ViewController { accentColor = theme.rootController.navigationBar.accentTextColor if case let .color(color) = theme.chat.defaultWallpaper { backgroundColors = (UIColor(rgb: UInt32(bitPattern: color)), nil) - } else if case let .gradient(topColor, bottomColor, _) = theme.chat.defaultWallpaper { + } else if case let .gradient(topColor, bottomColor, settings) = theme.chat.defaultWallpaper { backgroundColors = (UIColor(rgb: UInt32(bitPattern: topColor)), UIColor(rgb: UInt32(bitPattern: bottomColor))) + rotation = settings.rotation ?? 0 } else { backgroundColors = nil } @@ -277,12 +335,12 @@ final class ThemeAccentColorController: ViewController { messageColors = (topMessageColor, bottomMessageColor) } } else { - accentColor = UIColor(rgb: 0x007ee5) + accentColor = defaultDayAccentColor backgroundColors = nil messageColors = nil } - let initialState = ThemeColorState(section: strongSelf.section, accentColor: accentColor, initialWallpaper: initialWallpaper, backgroundColors: backgroundColors, defaultMessagesColor: defaultMessagesColor, messagesColors: messageColors) + let initialState = ThemeColorState(section: strongSelf.section, accentColor: accentColor, initialWallpaper: initialWallpaper, backgroundColors: backgroundColors, patternWallpaper: patternWallpaper, patternIntensity: patternIntensity, motion: motion, defaultMessagesColor: defaultMessagesColor, messagesColors: messageColors, rotation: rotation) strongSelf.controllerNode.updateState({ _ in return initialState diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift index 444799f6b0..018ca8745a 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift @@ -10,10 +10,7 @@ import TelegramPresentationData import TelegramUIPreferences import ChatListUI import AccountContext - -private func radiansToDegrees(_ radians: CGFloat) -> CGFloat { - return radians * 180.0 / CGFloat.pi -} +import WallpaperResources private func generateMaskImage(color: UIColor) -> UIImage? { return generateImage(CGSize(width: 1.0, height: 80.0), opaque: false, rotatedContext: { size, context in @@ -39,38 +36,73 @@ enum ThemeColorSection: Int { struct ThemeColorState { fileprivate var section: ThemeColorSection? fileprivate var colorPanelCollapsed: Bool + fileprivate var displayPatternPanel: Bool + var accentColor: UIColor var initialWallpaper: TelegramWallpaper? var backgroundColors: (UIColor, UIColor?)? + + fileprivate var preview: Bool + fileprivate var previousPatternWallpaper: TelegramWallpaper? + var patternWallpaper: TelegramWallpaper? + var patternIntensity: Int32 + var motion: Bool + var defaultMessagesColor: UIColor? var messagesColors: (UIColor, UIColor?)? - var rotation: CGFloat + + var rotation: Int32 init() { self.section = nil self.colorPanelCollapsed = false + self.displayPatternPanel = false self.accentColor = .clear self.initialWallpaper = nil self.backgroundColors = nil + self.preview = false + self.previousPatternWallpaper = nil + self.patternWallpaper = nil + self.patternIntensity = 50 + self.motion = false + self.defaultMessagesColor = nil self.messagesColors = nil - self.rotation = 0.0 + self.rotation = 0 } - init(section: ThemeColorSection, accentColor: UIColor, initialWallpaper: TelegramWallpaper?, backgroundColors: (UIColor, UIColor?)?, defaultMessagesColor: UIColor?, messagesColors: (UIColor, UIColor?)?, rotation: CGFloat = 0.0) { + init(section: ThemeColorSection, accentColor: UIColor, initialWallpaper: TelegramWallpaper?, backgroundColors: (UIColor, UIColor?)?, patternWallpaper: TelegramWallpaper?, patternIntensity: Int32, motion: Bool, defaultMessagesColor: UIColor?, messagesColors: (UIColor, UIColor?)?, rotation: Int32 = 0) { self.section = section self.colorPanelCollapsed = false + self.displayPatternPanel = false self.accentColor = accentColor self.initialWallpaper = initialWallpaper self.backgroundColors = backgroundColors + self.preview = false + self.previousPatternWallpaper = nil + self.patternWallpaper = patternWallpaper + self.patternIntensity = patternIntensity + self.motion = motion self.defaultMessagesColor = defaultMessagesColor self.messagesColors = messagesColors self.rotation = rotation } - func areColorsEqual(to otherState: ThemeColorState) -> Bool { + func isEqual(to otherState: ThemeColorState) -> Bool { if self.accentColor != otherState.accentColor { return false } + if self.preview != otherState.preview { + return false + } + if self.patternWallpaper != otherState.patternWallpaper { + return false + } + if self.patternIntensity != otherState.patternIntensity { + return false + } + if self.rotation != otherState.rotation { + return false + } if let lhsBackgroundColors = self.backgroundColors, let rhsBackgroundColors = otherState.backgroundColors { if lhsBackgroundColors.0 != rhsBackgroundColors.0 { return false @@ -103,6 +135,22 @@ struct ThemeColorState { } } +private func calcPatternColors(for state: ThemeColorState) -> [UIColor] { + if let backgroundColors = state.backgroundColors { + let patternIntensity = CGFloat(state.patternIntensity) / 100.0 + let topPatternColor = backgroundColors.0.withAlphaComponent(patternIntensity) + if let bottomColor = backgroundColors.1 { + let bottomPatternColor = bottomColor.withAlphaComponent(patternIntensity) + return [topPatternColor, bottomPatternColor] + } else { + return [topPatternColor, topPatternColor] + } + } else { + let patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5) + return [patternColor, patternColor] + } +} + final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate { private let context: AccountContext private var theme: PresentationTheme @@ -115,23 +163,38 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate private let scrollNode: ASScrollNode private let pageControlBackgroundNode: ASDisplayNode private let pageControlNode: PageControlNode + private var motionButtonNode: WallpaperOptionButtonNode + private var patternButtonNode: WallpaperOptionButtonNode private let chatListBackgroundNode: ASDisplayNode private var chatNodes: [ListViewItemNode]? private let maskNode: ASImageNode - private let chatBackgroundNode: WallpaperBackgroundNode + private let backgroundContainerNode: ASDisplayNode + private let backgroundWrapperNode: ASDisplayNode + private let immediateBackgroundNode: ASImageNode + private let signalBackgroundNode: TransformImageNode private let messagesContainerNode: ASDisplayNode private var dateHeaderNode: ListViewItemHeaderNode? private var messageNodes: [ListViewItemNode]? - private var colorPanelNode: WallpaperColorPanelNode + private let colorPanelNode: WallpaperColorPanelNode + private let patternPanelNode: WallpaperPatternPanelNode private let toolbarNode: WallpaperGalleryToolbarNode private var serviceColorDisposable: Disposable? - private var colorsDisposable: Disposable? - private let colors = Promise<(UIColor, (UIColor, UIColor?)?, (UIColor, UIColor?)?, TelegramWallpaper?, CGFloat)>() + private var stateDisposable: Disposable? + private let statePromise = Promise() private let themePromise = Promise() private var wallpaper: TelegramWallpaper private var serviceBackgroundColor: UIColor? private let serviceBackgroundColorPromise = Promise() + private var wallpaperDisposable = MetaDisposable() + + private var preview = false + private var currentBackgroundColor: UIColor? + private var patternWallpaper: TelegramWallpaper? + private var patternArguments: PatternWallpaperArguments? + + private var patternArgumentsValue = Promise() + private var patternArgumentsDisposable: Disposable? private var tapGestureRecognizer: UITapGestureRecognizer? @@ -141,8 +204,10 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate var requiresWallpaperChange: Bool { switch self.wallpaper { - case .image, .file: + case .image, .builtin: return true + case let .file(file): + return !file.isPattern default: return false } @@ -170,21 +235,24 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.pageControlNode = PageControlNode(dotSpacing: 7.0, dotColor: .white, inactiveDotColor: UIColor.white.withAlphaComponent(0.4)) + self.motionButtonNode = WallpaperOptionButtonNode(title: self.presentationData.strings.WallpaperPreview_Motion, value: .check(false)) + self.patternButtonNode = WallpaperOptionButtonNode(title: self.presentationData.strings.WallpaperPreview_Pattern, value: .check(false)) + self.chatListBackgroundNode = ASDisplayNode() - self.chatBackgroundNode = WallpaperBackgroundNode() - self.chatBackgroundNode.displaysAsynchronously = false + + self.backgroundContainerNode = ASDisplayNode() + self.backgroundContainerNode.clipsToBounds = true + self.backgroundWrapperNode = ASDisplayNode() + self.immediateBackgroundNode = ASImageNode() + self.signalBackgroundNode = TransformImageNode() + self.signalBackgroundNode.displaysAsynchronously = false self.messagesContainerNode = ASDisplayNode() self.messagesContainerNode.clipsToBounds = true self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0) - if case .color = wallpaper { - } else { - self.chatBackgroundNode.image = chatControllerBackgroundImage(theme: theme, wallpaper: wallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false) - self.chatBackgroundNode.motionEnabled = wallpaper.settings?.motion ?? false - } - self.colorPanelNode = WallpaperColorPanelNode(theme: self.theme, strings: self.presentationData.strings) + self.patternPanelNode = WallpaperPatternPanelNode(context: self.context, theme: self.theme, strings: self.presentationData.strings) let doneButtonType: WallpaperGalleryToolbarDoneButtonType if case .edit(_, _, _, true, _) = self.mode { @@ -215,45 +283,48 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.chatListBackgroundNode.addSubnode(self.maskNode) self.addSubnode(self.pageControlBackgroundNode) self.addSubnode(self.pageControlNode) + self.addSubnode(self.motionButtonNode) + self.addSubnode(self.patternButtonNode) self.addSubnode(self.colorPanelNode) + self.addSubnode(self.patternPanelNode) self.addSubnode(self.toolbarNode) self.scrollNode.addSubnode(self.chatListBackgroundNode) - self.scrollNode.addSubnode(self.chatBackgroundNode) + self.scrollNode.addSubnode(self.backgroundContainerNode) self.scrollNode.addSubnode(self.messagesContainerNode) + + self.backgroundContainerNode.addSubnode(self.backgroundWrapperNode) + self.backgroundWrapperNode.addSubnode(self.immediateBackgroundNode) + self.backgroundWrapperNode.addSubnode(self.signalBackgroundNode) + + self.motionButtonNode.addTarget(self, action: #selector(self.toggleMotion), forControlEvents: .touchUpInside) + self.patternButtonNode.addTarget(self, action: #selector(self.togglePattern), forControlEvents: .touchUpInside) - self.colorPanelNode.colorsChanged = { [weak self] firstColor, secondColor, _ in + self.colorPanelNode.colorsChanged = { [weak self] firstColor, secondColor, ended in if let strongSelf = self, let section = strongSelf.state.section { - switch section { - case .accent: - strongSelf.updateState({ current in - var updated = current + strongSelf.updateState({ current in + var updated = current + updated.preview = !ended + switch section { + case .accent: if let firstColor = firstColor { updated.accentColor = firstColor } - return updated - }) - case .background: - strongSelf.updateState({ current in - var updated = current + case .background: if let firstColor = firstColor { updated.backgroundColors = (firstColor, secondColor) } else { updated.backgroundColors = nil } - return updated - }) - case .messages: - strongSelf.updateState({ current in - var updated = current + case .messages: if let firstColor = firstColor { updated.messagesColors = (firstColor, secondColor) } else { updated.messagesColors = nil } - return updated - }) - } + } + return updated + }) } } @@ -271,9 +342,9 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate if let strongSelf = self { strongSelf.updateState({ current in var updated = current - var newRotation = updated.rotation + CGFloat.pi / 4.0 - if newRotation >= CGFloat.pi * 2.0 { - newRotation = 0.0 + var newRotation = updated.rotation + 45 + if newRotation >= 360 { + newRotation = 0 } updated.rotation = newRotation return updated @@ -281,47 +352,106 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate } } - self.toolbarNode.cancel = { - dismiss() - } - self.toolbarNode.done = { [weak self] in + self.patternPanelNode.patternChanged = { [weak self] wallpaper, intensity, preview in if let strongSelf = self { - apply(strongSelf.state, strongSelf.serviceBackgroundColor) + strongSelf.updateState({ current in + var updated = current + updated.patternWallpaper = wallpaper + updated.patternIntensity = intensity ?? 50 + updated.preview = preview + return updated + }, animated: true) } } - self.colorsDisposable = (self.colors.get() + self.toolbarNode.cancel = { [weak self] in + if let strongSelf = self { + if strongSelf.state.displayPatternPanel { + strongSelf.updateState({ current in + var updated = current + updated.displayPatternPanel = false + updated.patternWallpaper = nil + return updated + }, animated: true) + } else { + dismiss() + } + } + } + + var dismissed = false + self.toolbarNode.done = { [weak self] in + if let strongSelf = self { + if strongSelf.state.displayPatternPanel { + strongSelf.updateState({ current in + var updated = current + updated.displayPatternPanel = false + return updated + }, animated: true) + } else { + if !dismissed { + dismissed = true + apply(strongSelf.state, strongSelf.serviceBackgroundColor) + } + } + } + } + + self.stateDisposable = (self.statePromise.get() |> deliverOn(Queue.concurrentDefaultQueue()) - |> map { accentColor, backgroundColors, messagesColors, initialWallpaper, rotation -> (PresentationTheme, (TelegramWallpaper, UIImage?), UIColor) in + |> map { state -> (PresentationTheme, (TelegramWallpaper, UIImage?, Signal<(TransformImageArguments) -> DrawingContext?, NoError>?), UIColor, UIColor?, [UIColor], Bool) in + let accentColor = state.accentColor + var backgroundColors = state.backgroundColors + let messagesColors = state.messagesColors + var wallpaper: TelegramWallpaper var wallpaperImage: UIImage? - var backgroundColors = backgroundColors + var wallpaperSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? + + var singleBackgroundColor: UIColor? + if let backgroundColors = backgroundColors { - if let bottomColor = backgroundColors.1 { - wallpaper = .gradient(Int32(bitPattern: backgroundColors.0.rgb), Int32(bitPattern: bottomColor.rgb), WallpaperSettings(rotation: Int32(radiansToDegrees(rotation)))) - wallpaperImage = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false) + if let patternWallpaper = state.patternWallpaper, case let .file(file) = patternWallpaper { + let color = Int32(bitPattern: backgroundColors.0.rgb) + let bottomColor = backgroundColors.1.flatMap { Int32(bitPattern: $0.rgb) } + wallpaper = patternWallpaper.withUpdatedSettings(WallpaperSettings(motion: state.motion, color: color, bottomColor: bottomColor, intensity: state.patternIntensity, rotation: state.rotation)) + + let dimensions = file.file.dimensions ?? PixelDimensions(width: 100, height: 100) + var convertedRepresentations: [ImageRepresentationWithReference] = [] + for representation in file.file.previewRepresentations { + convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: .wallpaper(resource: representation.resource))) + } + convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource), reference: .wallpaper(resource: file.file.resource))) + + wallpaperSignal = patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, mode: .screen, autoFetchFullSize: true) + } else if let bottomColor = backgroundColors.1 { + wallpaper = .gradient(Int32(bitPattern: backgroundColors.0.rgb), Int32(bitPattern: bottomColor.rgb), WallpaperSettings(rotation: state.rotation)) + wallpaperSignal = gradientImage([backgroundColors.0, bottomColor], rotation: state.rotation) } else { wallpaper = .color(Int32(bitPattern: backgroundColors.0.rgb)) } - } else if let themeReference = mode.themeReference, case let .builtin(theme) = themeReference, initialWallpaper == nil { + } else if let themeReference = mode.themeReference, case let .builtin(theme) = themeReference, state.initialWallpaper == nil { var suggestedWallpaper: TelegramWallpaper switch theme { case .dayClassic: let topColor = accentColor.withMultiplied(hue: 1.010, saturation: 0.414, brightness: 0.957) let bottomColor = accentColor.withMultiplied(hue: 1.019, saturation: 0.867, brightness: 0.965) suggestedWallpaper = .gradient(Int32(bitPattern: topColor.rgb), Int32(bitPattern: bottomColor.rgb), WallpaperSettings()) + wallpaperSignal = gradientImage([topColor, bottomColor], rotation: state.rotation) backgroundColors = (topColor, bottomColor) + singleBackgroundColor = bottomColor case .nightAccent: let color = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) suggestedWallpaper = .color(Int32(bitPattern: color.rgb)) backgroundColors = (color, nil) + singleBackgroundColor = color default: suggestedWallpaper = .builtin(WallpaperSettings()) } - wallpaperImage = chatControllerBackgroundImage(theme: nil, wallpaper: suggestedWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false) wallpaper = suggestedWallpaper } else { - wallpaper = initialWallpaper ?? .builtin(WallpaperSettings()) + wallpaper = state.initialWallpaper ?? .builtin(WallpaperSettings()) + wallpaperImage = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false) } let serviceBackgroundColor = serviceColor(for: (wallpaper, wallpaperImage)) @@ -336,13 +466,15 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate let _ = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: updatedTheme, wallpaper: wallpaper) - return (updatedTheme, (wallpaper, wallpaperImage), serviceBackgroundColor) + let patternColors = calcPatternColors(for: state) + + return (updatedTheme, (wallpaper, wallpaperImage, wallpaperSignal), serviceBackgroundColor, singleBackgroundColor, patternColors, state.preview) } - |> deliverOnMainQueue).start(next: { [weak self] theme, wallpaperAndImage, serviceBackgroundColor in + |> deliverOnMainQueue).start(next: { [weak self] theme, wallpaperImageAndSignal, serviceBackgroundColor, singleBackgroundColor, patternColors, preview in guard let strongSelf = self else { return } - let (wallpaper, wallpaperImage) = wallpaperAndImage + let (wallpaper, wallpaperImage, wallpaperSignal) = wallpaperImageAndSignal strongSelf.theme = theme strongSelf.themeUpdated?(theme) @@ -356,15 +488,69 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate strongSelf.chatListBackgroundNode.backgroundColor = theme.chatList.backgroundColor strongSelf.maskNode.image = generateMaskImage(color: theme.chatList.backgroundColor) + let patternArguments = PatternWallpaperArguments(colors: patternColors, rotation: wallpaper.settings?.rotation ?? 0, preview: preview) if case let .color(value) = wallpaper { - strongSelf.backgroundColor = UIColor(rgb: UInt32(bitPattern: value)) - strongSelf.chatBackgroundNode.backgroundColor = UIColor(rgb: UInt32(bitPattern: value)) - strongSelf.chatBackgroundNode.image = nil + strongSelf.backgroundColor = UIColor(rgb: UInt32(bitPattern: value)) + strongSelf.immediateBackgroundNode.backgroundColor = UIColor(rgb: UInt32(bitPattern: value)) + strongSelf.immediateBackgroundNode.image = nil + strongSelf.immediateBackgroundNode.isHidden = false + strongSelf.signalBackgroundNode.isHidden = true + + strongSelf.patternWallpaper = nil } else if let wallpaperImage = wallpaperImage { - strongSelf.chatBackgroundNode.imageContentMode = .scaleToFill - strongSelf.chatBackgroundNode.image = wallpaperImage + strongSelf.immediateBackgroundNode.image = wallpaperImage + strongSelf.immediateBackgroundNode.isHidden = false + strongSelf.signalBackgroundNode.isHidden = true + + strongSelf.patternWallpaper = nil + } else if let wallpaperSignal = wallpaperSignal { + strongSelf.signalBackgroundNode.contentMode = .scaleToFill + strongSelf.immediateBackgroundNode.isHidden = false + strongSelf.signalBackgroundNode.isHidden = false + + if case let .file(file) = wallpaper, let (layout, _, _) = strongSelf.validLayout { + var dispatch = false + if let previousWallpaper = strongSelf.patternWallpaper, case let .file(previousFile) = previousWallpaper, file.id == previousFile.id { + dispatch = true + } else { + strongSelf.patternWallpaper = wallpaper + strongSelf.signalBackgroundNode.setSignal(wallpaperSignal) + } + + if dispatch { + if let _ = strongSelf.patternArgumentsDisposable { + } else { + let throttledSignal = strongSelf.patternArgumentsValue.get() + |> mapToThrottled { next -> Signal in + return .single(next) |> then(.complete() |> delay(0.016667, queue: Queue.concurrentDefaultQueue())) + } + + strongSelf.patternArgumentsDisposable = (throttledSignal).start(next: { [weak self] arguments in + if let strongSelf = self { + let makeImageLayout = strongSelf.signalBackgroundNode.asyncLayout() + let imageApply = makeImageLayout(arguments) + let _ = imageApply() + } + }) + } + + strongSelf.patternArgumentsValue.set(.single(TransformImageArguments(corners: ImageCorners(), imageSize: layout.size, boundingSize: layout.size, intrinsicInsets: UIEdgeInsets(), custom: patternArguments))) + } else { + strongSelf.patternArgumentsDisposable?.dispose() + strongSelf.patternArgumentsDisposable = nil + + let makeImageLayout = strongSelf.signalBackgroundNode.asyncLayout() + let imageApply = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: layout.size, boundingSize: layout.size, intrinsicInsets: UIEdgeInsets(), custom: patternArguments)) + let _ = imageApply() + } + } else { + strongSelf.signalBackgroundNode.setSignal(wallpaperSignal) + strongSelf.patternWallpaper = nil + } } strongSelf.wallpaper = wallpaper + strongSelf.patternArguments = patternArguments + strongSelf.currentBackgroundColor = singleBackgroundColor if let (layout, navigationBarHeight, messagesBottomInset) = strongSelf.validLayout { strongSelf.updateChatsLayout(layout: layout, topInset: navigationBarHeight, transition: .immediate) @@ -380,14 +566,19 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate |> then(self.serviceBackgroundColorPromise.get())) |> deliverOnMainQueue).start(next: { [weak self] color in if let strongSelf = self { + strongSelf.patternPanelNode.serviceBackgroundColor = color strongSelf.pageControlBackgroundNode.backgroundColor = color + strongSelf.patternButtonNode.buttonColor = color + strongSelf.motionButtonNode.buttonColor = color } }) } deinit { - self.colorsDisposable?.dispose() + self.stateDisposable?.dispose() self.serviceColorDisposable?.dispose() + self.wallpaperDisposable.dispose() + self.patternArgumentsDisposable?.dispose() } override func didLoad() { @@ -400,6 +591,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.scrollNode.view.delegate = self self.pageControlNode.setPage(0.0) self.colorPanelNode.view.disablesInteractiveTransitionGestureRecognizer = true + self.patternPanelNode.view.disablesInteractiveTransitionGestureRecognizer = true let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.chatTapped)) self.scrollNode.view.addGestureRecognizer(tapGestureRecognizer) @@ -421,13 +613,22 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate var animationCurve = ContainedViewLayoutTransitionCurve.easeInOut var animationDuration: Double = 0.3 - let colorsChanged = !previousState.areColorsEqual(to: self.state) - if colorsChanged { - self.colors.set(.single((self.state.accentColor, self.state.backgroundColors, self.state.messagesColors, self.state.initialWallpaper, self.state.rotation))) + let visibleStateChange = !previousState.isEqual(to: self.state) + if visibleStateChange { + self.statePromise.set(.single(self.state)) } let colorPanelCollapsed = self.state.colorPanelCollapsed - + + if (previousState.patternWallpaper != nil) != (self.state.patternWallpaper != nil) { + self.patternButtonNode.setSelected(self.state.patternWallpaper != nil, animated: animated) + } + + if previousState.motion != self.state.motion { + self.motionButtonNode.setSelected(self.state.motion, animated: animated) + self.setMotionEnabled(self.state.motion, animated: animated) + } + let sectionChanged = previousState.section != self.state.section if sectionChanged, let section = self.state.section { self.view.endEditing(true) @@ -437,7 +638,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate var defaultColor: UIColor? switch section { case .accent: - firstColor = self.state.accentColor ?? .blue + firstColor = self.state.accentColor ?? defaultDayAccentColor secondColor = nil case .background: if let themeReference = self.mode.themeReference, case let .builtin(theme) = themeReference { @@ -453,7 +654,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate if let backgroundColors = self.state.backgroundColors { firstColor = backgroundColors.0 secondColor = backgroundColors.1 - } else if let image = self.chatBackgroundNode.image, previousState.initialWallpaper != nil { + } else if previousState.initialWallpaper != nil, let image = self.immediateBackgroundNode.image { firstColor = averageColor(from: image) secondColor = nil } else { @@ -461,7 +662,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate secondColor = nil } case .messages: - defaultColor = self.state.defaultMessagesColor ?? (self.state.accentColor ?? UIColor(rgb: 0x007ee5)) + defaultColor = self.state.defaultMessagesColor ?? (self.state.accentColor ?? defaultDayAccentColor) if let messagesColors = self.state.messagesColors { firstColor = messagesColors.0 secondColor = messagesColors.1 @@ -472,7 +673,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate } self.colorPanelNode.updateState({ _ in - return WallpaperColorPanelNodeState(selection: colorPanelCollapsed ? .none : .first, firstColor: firstColor, defaultColor: defaultColor, secondColor: secondColor, secondColorAvailable: self.state.section != .accent) + return WallpaperColorPanelNodeState(selection: colorPanelCollapsed ? .none : .first, firstColor: firstColor, defaultColor: defaultColor, secondColor: secondColor, secondColorAvailable: self.state.section != .accent, preview: false) }, animated: animated) needsLayout = true @@ -490,6 +691,29 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate }, animated: animated) } + if previousState.displayPatternPanel != self.state.displayPatternPanel { + let cancelButtonType: WallpaperGalleryToolbarCancelButtonType + let doneButtonType: WallpaperGalleryToolbarDoneButtonType + if self.state.displayPatternPanel { + doneButtonType = .apply + cancelButtonType = .discard + } else { + if case .edit(_, _, _, true, _) = self.mode { + doneButtonType = .proceed + } else { + doneButtonType = .set + } + cancelButtonType = .cancel + } + + self.toolbarNode.cancelButtonType = cancelButtonType + self.toolbarNode.doneButtonType = doneButtonType + + animationCurve = .easeInOut + animationDuration = 0.3 + needsLayout = true + } + if needsLayout, let (layout, navigationBarHeight, _) = self.validLayout { self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: animated ? .animated(duration: animationDuration, curve: animationCurve) : .immediate) } @@ -502,6 +726,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate updated.initialWallpaper = nil } updated.section = section + updated.displayPatternPanel = false return updated }, animated: true) } @@ -667,22 +892,18 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate } func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + let isFirstLayout = self.validLayout == nil + let bounds = CGRect(origin: CGPoint(), size: layout.size) + + let chatListPreviewAvailable = self.state.section == .accent + self.scrollNode.frame = bounds - - let toolbarHeight = 49.0 + layout.intrinsicInsets.bottom - self.chatListBackgroundNode.frame = CGRect(x: bounds.width, y: 0.0, width: bounds.width, height: bounds.height) - self.scrollNode.view.contentSize = CGSize(width: bounds.width * 2.0, height: bounds.height) - - var pageControlAlpha: CGFloat = 1.0 - if self.state.section != .accent { - pageControlAlpha = 0.0 - } - self.scrollNode.view.isScrollEnabled = pageControlAlpha > 0.0 + self.scrollNode.view.isScrollEnabled = chatListPreviewAvailable var messagesTransition = transition - if !self.scrollNode.view.isScrollEnabled && self.scrollNode.view.contentOffset.x > 0.0 { + if !chatListPreviewAvailable && self.scrollNode.view.contentOffset.x > 0.0 { var bounds = self.scrollNode.bounds bounds.origin.x = 0.0 transition.updateBounds(node: scrollNode, bounds: bounds) @@ -690,6 +911,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.pageControlNode.setPage(0.0) } + let toolbarHeight = 49.0 + layout.intrinsicInsets.bottom transition.updateFrame(node: self.toolbarNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - toolbarHeight), 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) @@ -712,14 +934,36 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate transition.updateFrame(node: self.colorPanelNode, frame: colorPanelFrame) self.colorPanelNode.updateLayout(size: colorPanelFrame.size, transition: transition) + var patternPanelAlpha: CGFloat = self.state.displayPatternPanel ? 1.0 : 0.0 + var patternPanelFrame = colorPanelFrame + transition.updateFrame(node: self.patternPanelNode, frame: patternPanelFrame) + self.patternPanelNode.updateLayout(size: patternPanelFrame.size, transition: transition) + self.patternPanelNode.isUserInteractionEnabled = self.state.displayPatternPanel + transition.updateAlpha(node: self.patternPanelNode, alpha: patternPanelAlpha) + + self.chatListBackgroundNode.frame = CGRect(x: bounds.width, y: 0.0, width: bounds.width, height: bounds.height) + transition.updateFrame(node: self.messagesContainerNode, frame: CGRect(x: 0.0, y: navigationBarHeight, width: bounds.width, height: bounds.height - bottomInset - navigationBarHeight)) let backgroundSize = CGSize(width: bounds.width, height: bounds.height - (colorPanelHeight - colorPanelOffset)) - transition.updateFrame(node: self.chatBackgroundNode, frame: CGRect(origin: CGPoint(), size: backgroundSize)) - self.chatBackgroundNode.updateLayout(size: backgroundSize, transition: transition) + transition.updateFrame(node: self.backgroundContainerNode, frame: CGRect(origin: CGPoint(), size: backgroundSize)) + let makeImageLayout = self.signalBackgroundNode.asyncLayout() + let imageApply = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: layout.size, boundingSize: layout.size, intrinsicInsets: UIEdgeInsets(), custom: self.patternArguments)) + let _ = imageApply() + + transition.updatePosition(node: self.backgroundWrapperNode, position: CGPoint(x: backgroundSize.width / 2.0, y: backgroundSize.height / 2.0)) + + transition.updateBounds(node: self.backgroundWrapperNode, bounds: CGRect(origin: CGPoint(), size: layout.size)) + transition.updateFrame(node: self.immediateBackgroundNode, frame: CGRect(origin: CGPoint(), size: layout.size)) + transition.updateFrame(node: self.signalBackgroundNode, frame: CGRect(origin: CGPoint(), size: layout.size)) + + let displayOptionButtons = self.state.section == .background var messagesBottomInset: CGFloat = 0.0 - if pageControlAlpha > 0.0 { + + if displayOptionButtons { + messagesBottomInset = 46.0 + } else if chatListPreviewAvailable { messagesBottomInset = 37.0 } self.updateChatsLayout(layout: layout, topInset: navigationBarHeight, transition: transition) @@ -727,6 +971,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.validLayout = (layout, navigationBarHeight, messagesBottomInset) + let pageControlAlpha: CGFloat = chatListPreviewAvailable ? 1.0 : 0.0 let pageControlSize = self.pageControlNode.measure(CGSize(width: bounds.width, height: 100.0)) let pageControlFrame = CGRect(origin: CGPoint(x: floor((bounds.width - pageControlSize.width) / 2.0), y: layout.size.height - bottomInset - 28.0), size: pageControlSize) transition.updateFrame(node: self.pageControlNode, frame: pageControlFrame) @@ -735,13 +980,127 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate transition.updateAlpha(node: self.pageControlNode, alpha: pageControlAlpha) transition.updateAlpha(node: self.pageControlBackgroundNode, alpha: pageControlAlpha) transition.updateFrame(node: self.maskNode, frame: CGRect(x: 0.0, y: layout.size.height - bottomInset - 80.0, width: bounds.width, height: 80.0)) + + let patternButtonSize = self.patternButtonNode.measure(layout.size) + let motionButtonSize = self.motionButtonNode.measure(layout.size) + let maxButtonWidth = max(patternButtonSize.width, motionButtonSize.width) + let buttonSize = CGSize(width: maxButtonWidth, height: 30.0) + + let leftButtonFrame = CGRect(origin: CGPoint(x: floor(layout.size.width / 2.0 - buttonSize.width - 10.0), y: layout.size.height - bottomInset - 44.0), size: buttonSize) + let centerButtonFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - buttonSize.width) / 2.0), y: layout.size.height - bottomInset - 44.0), size: buttonSize) + let rightButtonFrame = CGRect(origin: CGPoint(x: ceil(layout.size.width / 2.0 + 10.0), y: layout.size.height - bottomInset - 44.0), size: buttonSize) + + var hasMotion: Bool = self.state.backgroundColors?.1 != nil || self.state.patternWallpaper != nil || self.state.displayPatternPanel + + var patternAlpha: CGFloat = displayOptionButtons ? 1.0 : 0.0 + var motionAlpha: CGFloat = displayOptionButtons && hasMotion ? 1.0 : 0.0 + + var patternFrame = hasMotion ? leftButtonFrame : centerButtonFrame + var motionFrame = hasMotion ? rightButtonFrame : centerButtonFrame + + transition.updateFrame(node: self.patternButtonNode, frame: patternFrame) + transition.updateAlpha(node: self.patternButtonNode, alpha: patternAlpha) + + transition.updateFrame(node: self.motionButtonNode, frame: motionFrame) + transition.updateAlpha(node: self.motionButtonNode, alpha: motionAlpha) + + if isFirstLayout { + self.setMotionEnabled(self.state.motion, animated: false) + } } @objc private func chatTapped() { self.updateState({ current in var updated = current - updated.colorPanelCollapsed = !updated.colorPanelCollapsed + if updated.displayPatternPanel { + updated.displayPatternPanel = false + } else { + updated.colorPanelCollapsed = !updated.colorPanelCollapsed + } return updated }, animated: true) } + + @objc private func toggleMotion() { + self.updateState({ current in + var updated = current + updated.motion = !updated.motion + return updated + }, animated: true) + } + + @objc private func togglePattern() { + let wallpaper = self.state.previousPatternWallpaper ?? self.patternPanelNode.wallpapers.first + let backgroundColor = self.currentBackgroundColor + + var appeared = false + self.updateState({ current in + var updated = current + if updated.patternWallpaper != nil { + updated.previousPatternWallpaper = updated.patternWallpaper + updated.patternWallpaper = nil + updated.displayPatternPanel = false + } else { + updated.displayPatternPanel = true + if current.patternWallpaper == nil, let wallpaper = wallpaper { + updated.patternWallpaper = wallpaper + if updated.backgroundColors == nil, let color = backgroundColor { + updated.backgroundColors = (color, nil) + } + appeared = true + } + } + return updated + }, animated: true) + + if appeared { + self.patternPanelNode.didAppear(initialWallpaper: wallpaper) + } + } + + private let motionAmount: CGFloat = 32.0 + private func setMotionEnabled(_ enabled: Bool, animated: Bool) { + guard let (layout, _, _) = self.validLayout else { + return + } + + if enabled { + let horizontal = UIInterpolatingMotionEffect(keyPath: "center.x", type: .tiltAlongHorizontalAxis) + horizontal.minimumRelativeValue = motionAmount + horizontal.maximumRelativeValue = -motionAmount + + let vertical = UIInterpolatingMotionEffect(keyPath: "center.y", type: .tiltAlongVerticalAxis) + vertical.minimumRelativeValue = motionAmount + vertical.maximumRelativeValue = -motionAmount + + let group = UIMotionEffectGroup() + group.motionEffects = [horizontal, vertical] + self.backgroundWrapperNode.view.addMotionEffect(group) + + let scale = (layout.size.width + motionAmount * 2.0) / layout.size.width + if animated { + self.backgroundWrapperNode.transform = CATransform3DMakeScale(scale, scale, 1.0) + self.backgroundWrapperNode.layer.animateScale(from: 1.0, to: scale, duration: 0.2) + } else { + self.backgroundWrapperNode.transform = CATransform3DMakeScale(scale, scale, 1.0) + } + } else { + let position = self.backgroundWrapperNode.layer.presentation()?.position + + for effect in self.backgroundWrapperNode.view.motionEffects { + self.backgroundWrapperNode.view.removeMotionEffect(effect) + } + + let scale = (layout.size.width + motionAmount * 2.0) / layout.size.width + if animated { + self.backgroundWrapperNode.transform = CATransform3DIdentity + self.backgroundWrapperNode.layer.animateScale(from: scale, to: 1.0, duration: 0.2) + if let position = position { + self.backgroundWrapperNode.layer.animatePosition(from: position, to: self.backgroundWrapperNode.layer.position, duration: 0.2) + } + } else { + self.backgroundWrapperNode.transform = CATransform3DIdentity + } + } + } } diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift index 53ad04a89b..6c432016ee 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift @@ -17,7 +17,7 @@ import AppBundle import PresentationDataUtils public enum ThemePreviewSource { - case settings(PresentationThemeReference) + case settings(PresentationThemeReference, TelegramWallpaper?) case theme(TelegramTheme) case slug(String, TelegramMediaFile) case media(AnyMediaReference) @@ -95,7 +95,7 @@ public final class ThemePreviewController: ViewController { } )) hasInstallsCount = true - } else if case let .settings(themeReference) = source, case let .cloud(theme) = themeReference { + } else if case let .settings(themeReference, _) = source, case let .cloud(theme) = themeReference { self.theme.set(getTheme(account: context.account, slug: theme.theme.slug) |> map(Optional.init) |> `catch` { _ -> Signal in @@ -171,7 +171,13 @@ public final class ThemePreviewController: ViewController { if case .settings = self.source { isPreview = true } - self.displayNode = ThemePreviewControllerNode(context: self.context, previewTheme: self.previewTheme, dismiss: { [weak self] in + + var initialWallpaper: TelegramWallpaper? + if case let .settings(_, currentWallpaper) = self.source, let wallpaper = currentWallpaper { + initialWallpaper = wallpaper + } + + self.displayNode = ThemePreviewControllerNode(context: self.context, previewTheme: self.previewTheme, initialWallpaper: initialWallpaper, dismiss: { [weak self] in if let strongSelf = self { strongSelf.dismiss() } @@ -183,7 +189,9 @@ public final class ThemePreviewController: ViewController { self.displayNodeDidLoad() let previewTheme = self.previewTheme - if case let .file(file) = previewTheme.chat.defaultWallpaper, file.id == 0 { + if let initialWallpaper = initialWallpaper { + self.controllerNode.wallpaperPromise.set(.single(initialWallpaper)) + } else if case let .file(file) = previewTheme.chat.defaultWallpaper, file.id == 0 { self.controllerNode.wallpaperPromise.set(cachedWallpaper(account: self.context.account, slug: file.slug, settings: file.settings) |> mapToSignal { wallpaper in return .single(wallpaper?.wallpaper ?? .color(Int32(bitPattern: previewTheme.chatList.backgroundColor.rgb))) @@ -203,7 +211,7 @@ public final class ThemePreviewController: ViewController { let disposable = self.applyDisposable switch self.source { - case let .settings(reference): + case let .settings(reference, _): theme = .single(reference) case .theme, .slug: theme = combineLatest(self.theme.get() |> take(1), wallpaperPromise.get() |> take(1)) diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift index df6a0b5590..45660fd000 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift @@ -65,7 +65,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { private var statusDisposable: Disposable? private var fetchDisposable = MetaDisposable() - init(context: AccountContext, previewTheme: PresentationTheme, dismiss: @escaping () -> Void, apply: @escaping () -> Void, isPreview: Bool) { + init(context: AccountContext, previewTheme: PresentationTheme, initialWallpaper: TelegramWallpaper?, dismiss: @escaping () -> Void, apply: @escaping () -> Void, isPreview: Bool) { self.context = context self.previewTheme = previewTheme self.isPreview = isPreview @@ -98,8 +98,10 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { self.instantChatBackgroundNode = WallpaperBackgroundNode() self.instantChatBackgroundNode.displaysAsynchronously = false - self.instantChatBackgroundNode.image = chatControllerBackgroundImage(theme: previewTheme, wallpaper: previewTheme.chat.defaultWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper) - if case .gradient = previewTheme.chat.defaultWallpaper { + + let wallpaper = initialWallpaper ?? previewTheme.chat.defaultWallpaper + self.instantChatBackgroundNode.image = chatControllerBackgroundImage(theme: previewTheme, wallpaper: wallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper) + if case .gradient = wallpaper { self.instantChatBackgroundNode.imageContentMode = .scaleToFill } self.instantChatBackgroundNode.motionEnabled = previewTheme.chat.defaultWallpaper.settings?.motion ?? false @@ -167,8 +169,12 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { self.toolbarNode.cancel = { dismiss() } + var dismissed = false self.toolbarNode.done = { - apply() + if !dismissed { + dismissed = true + apply() + } } if case let .file(file) = self.previewTheme.chat.defaultWallpaper { @@ -255,16 +261,21 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { } }) - var patternColor: UIColor? - var patternIntensity: CGFloat = 0.5 + + var patternArguments: PatternWallpaperArguments? if let color = file.settings.color { + var patternIntensity: CGFloat = 0.5 if let intensity = file.settings.intensity { patternIntensity = CGFloat(intensity) / 100.0 } - patternColor = UIColor(rgb: UInt32(bitPattern: color), alpha: patternIntensity) + var patternColors = [UIColor(rgb: UInt32(bitPattern: color), alpha: patternIntensity)] + if let bottomColor = file.settings.bottomColor { + patternColors.append(UIColor(rgb: UInt32(bitPattern: bottomColor), alpha: patternIntensity)) + } + patternArguments = PatternWallpaperArguments(colors: patternColors, rotation: file.settings.rotation) } - strongSelf.remoteChatBackgroundNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), emptyColor: patternColor))() + strongSelf.remoteChatBackgroundNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), custom: patternArguments))() } }) } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift index 2fc1c4d720..1c9cd633b1 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift @@ -8,9 +8,10 @@ import SyncCore import TelegramPresentationData import TelegramUIPreferences import ItemListUI +import ContextUI import PresentationDataUtils -private func generateSwatchImage(theme: PresentationTheme, color: PresentationThemeAccentColor, bubbles: (UIColor, UIColor?)?, selected: Bool, more: Bool) -> UIImage? { +private func generateSwatchImage(theme: PresentationTheme, themeReference: PresentationThemeReference, color: PresentationThemeAccentColor, bubbles: (UIColor, UIColor?)?, selected: Bool, more: Bool) -> UIImage? { return generateImage(CGSize(width: 40.0, height: 40.0), rotatedContext: { size, context in let bounds = CGRect(origin: CGPoint(), size: size) context.clear(bounds) @@ -50,9 +51,17 @@ private func generateSwatchImage(theme: PresentationTheme, color: PresentationTh context.addEllipse(in: bounds.insetBy(dx: 10.0, dy: 10.0)) context.clip() - if let colors = bubbles { - var colors: (UIColor, UIColor) = (colors.0, colors.1 ?? colors.0) - + var colors: (UIColor, UIColor)? + + if let customColors = bubbles { + colors = (customColors.0, customColors.1 ?? customColors.0) + } else if case .builtin(.dayClassic) = themeReference { + let hsb = color.color.hsb + let bubbleColor = UIColor(hue: hsb.0, saturation: (hsb.1 > 0.0 && hsb.2 > 0.0) ? 0.14 : 0.0, brightness: 0.79 + hsb.2 * 0.21, alpha: 1.0) + colors = (bubbleColor, bubbleColor) + } + + if let colors = colors { let gradientColors = [colors.0.cgColor, colors.1.cgColor] as CFArray var locations: [CGFloat] = [0.0, 1.0] let colorSpace = CGColorSpaceCreateDeviceRGB() @@ -105,17 +114,21 @@ class ThemeSettingsAccentColorItem: ListViewItem, ItemListItem { var sectionId: ItemListSectionId let theme: PresentationTheme + let themeReference: PresentationThemeReference let colors: [ThemeSettingsAccentColor] let currentColor: PresentationThemeAccentColor? let updated: (PresentationThemeAccentColor?) -> Void + let contextAction: ((PresentationThemeReference, PresentationThemeAccentColor?, ASDisplayNode, ContextGesture?) -> Void)? let openColorPicker: () -> Void let tag: ItemListItemTag? - init(theme: PresentationTheme, sectionId: ItemListSectionId, colors: [ThemeSettingsAccentColor], currentColor: PresentationThemeAccentColor?, updated: @escaping (PresentationThemeAccentColor?) -> Void, openColorPicker: @escaping () -> Void, tag: ItemListItemTag? = nil) { + init(theme: PresentationTheme, sectionId: ItemListSectionId, themeReference: PresentationThemeReference, colors: [ThemeSettingsAccentColor], currentColor: PresentationThemeAccentColor?, updated: @escaping (PresentationThemeAccentColor?) -> Void, contextAction: ((PresentationThemeReference, PresentationThemeAccentColor?, ASDisplayNode, ContextGesture?) -> Void)?, openColorPicker: @escaping () -> Void, tag: ItemListItemTag? = nil) { self.theme = theme + self.themeReference = themeReference self.colors = colors self.currentColor = currentColor self.updated = updated + self.contextAction = contextAction self.openColorPicker = openColorPicker self.tag = tag self.sectionId = sectionId @@ -156,24 +169,40 @@ class ThemeSettingsAccentColorItem: ListViewItem, ItemListItem { } private final class ThemeSettingsAccentColorNode : ASDisplayNode { + private let containerNode: ContextControllerSourceNode private let iconNode: ASImageNode private var action: (() -> Void)? + private var contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? override init() { + self.containerNode = ContextControllerSourceNode() + self.iconNode = ASImageNode() self.iconNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 62.0, height: 62.0)) self.iconNode.isLayerBacked = true super.init() - self.addSubnode(self.iconNode) + self.addSubnode(self.containerNode) + self.containerNode.addSubnode(self.iconNode) + + self.containerNode.activated = { [weak self] gesture in + guard let strongSelf = self else { + gesture.cancel() + return + } + strongSelf.contextAction?(strongSelf.containerNode, gesture) + } } - func setup(theme: PresentationTheme, color: PresentationThemeAccentColor, bubbles: (UIColor, UIColor?)?, selected: Bool, more: Bool, action: @escaping () -> Void) { - self.iconNode.image = generateSwatchImage(theme: theme, color: color, bubbles: bubbles, selected: selected, more: more) + func setup(theme: PresentationTheme, themeReference: PresentationThemeReference, isDefault: Bool, color: PresentationThemeAccentColor, bubbles: (UIColor, UIColor?)?, selected: Bool, more: Bool, action: @escaping () -> Void, contextAction: ((PresentationThemeReference, PresentationThemeAccentColor?, ASDisplayNode, ContextGesture?) -> Void)?) { + self.iconNode.image = generateSwatchImage(theme: theme, themeReference: themeReference, color: color, bubbles: bubbles, selected: selected, more: more) self.action = { action() } + self.contextAction = { node, gesture in + contextAction?(themeReference, isDefault ? nil : color, node, gesture) + } } override func didLoad() { @@ -191,7 +220,8 @@ private final class ThemeSettingsAccentColorNode : ASDisplayNode { override func layout() { super.layout() - self.iconNode.frame = self.bounds + self.containerNode.frame = self.bounds + self.iconNode.frame = self.containerNode.bounds } } @@ -340,10 +370,7 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { var updated = false var selectedNode: ThemeSettingsAccentColorNode? - - strongSelf.customNode.frame = CGRect(origin: CGPoint(x: nodeOffset, y: 9.0), size: CGSize(width: 42.0, height: 42.0)) - nodeOffset += nodeSize.width + 18.0 - + var i = 0 for color in item.colors { let imageNode: ThemeSettingsAccentColorNode @@ -359,10 +386,12 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { let selected: Bool var accentColor: PresentationThemeAccentColor var itemColor: PresentationThemeAccentColor? + var isDefault = false switch color { case .default: selected = item.currentColor == nil accentColor = PresentationThemeAccentColor(baseColor: .blue, accentColor: 0x007ee5, bubbleColors: (0xe1ffc7, nil)) + isDefault = true case let .color(color): selected = item.currentColor?.baseColor == color if let currentColor = item.currentColor, selected { @@ -377,7 +406,7 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { selectedNode = imageNode } - imageNode.setup(theme: item.theme, color: accentColor, bubbles: accentColor.customBubbleColors, selected: selected, more: true, action: { [weak self, weak imageNode] in + imageNode.setup(theme: item.theme, themeReference: item.themeReference, isDefault: isDefault, color: accentColor, bubbles: accentColor.customBubbleColors, selected: selected, more: true, action: { [weak self, weak imageNode] in if selected { item.openColorPicker() } else { @@ -386,7 +415,7 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { if let imageNode = imageNode { self?.scrollToNode(imageNode, animated: true) } - }) + }, contextAction: item.contextAction) imageNode.frame = CGRect(origin: CGPoint(x: nodeOffset, y: 10.0), size: nodeSize) nodeOffset += nodeSize.width + 18.0 @@ -394,7 +423,7 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { i += 1 } -// strongSelf.customNode.frame = CGRect(origin: CGPoint(x: nodeOffset, y: 9.0), size: CGSize(width: 42.0, height: 42.0)) + strongSelf.customNode.frame = CGRect(origin: CGPoint(x: nodeOffset, y: 9.0), size: CGSize(width: 42.0, height: 42.0)) for k in (i ..< strongSelf.colorNodes.count).reversed() { let node = strongSelf.colorNodes[k] @@ -402,7 +431,7 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { node.removeFromSupernode() } - let contentSize = CGSize(width: strongSelf.colorNodes.last!.frame.maxX + nodeInset, height: strongSelf.scrollNode.frame.height) + let contentSize = CGSize(width: strongSelf.customNode.frame.maxX + nodeInset, height: strongSelf.scrollNode.frame.height) if strongSelf.scrollNode.view.contentSize != contentSize { strongSelf.scrollNode.view.contentSize = contentSize } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift index 3928b1bc34..a8f175e5a1 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift @@ -79,9 +79,10 @@ private final class ThemeSettingsControllerArguments { let disableAnimations: (Bool) -> Void let selectAppIcon: (String) -> Void let editTheme: (PresentationCloudTheme) -> Void - let contextAction: (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void + let themeContextAction: (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void + let colorContextAction: (PresentationThemeReference, PresentationThemeAccentColor?, ASDisplayNode, ContextGesture?) -> Void - init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor?) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference) -> Void, openAutoNightTheme: @escaping () -> Void, openTextSize: @escaping () -> Void, toggleLargeEmoji: @escaping (Bool) -> Void, disableAnimations: @escaping (Bool) -> Void, selectAppIcon: @escaping (String) -> Void, editTheme: @escaping (PresentationCloudTheme) -> Void, contextAction: @escaping (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void) { + init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor?) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference) -> Void, openAutoNightTheme: @escaping () -> Void, openTextSize: @escaping () -> Void, toggleLargeEmoji: @escaping (Bool) -> Void, disableAnimations: @escaping (Bool) -> Void, selectAppIcon: @escaping (String) -> Void, editTheme: @escaping (PresentationCloudTheme) -> Void, themeContextAction: @escaping (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void, colorContextAction: @escaping (PresentationThemeReference, PresentationThemeAccentColor?, ASDisplayNode, ContextGesture?) -> Void) { self.context = context self.selectTheme = selectTheme self.selectFontSize = selectFontSize @@ -94,7 +95,8 @@ private final class ThemeSettingsControllerArguments { self.disableAnimations = disableAnimations self.selectAppIcon = selectAppIcon self.editTheme = editTheme - self.contextAction = contextAction + self.themeContextAction = themeContextAction + self.colorContextAction = colorContextAction } } @@ -331,8 +333,10 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { colorItems.append(contentsOf: colors.map { .color($0) }) - return ThemeSettingsAccentColorItem(theme: theme, sectionId: self.section, colors: colorItems, currentColor: currentColor, updated: { color in + return ThemeSettingsAccentColorItem(theme: theme, sectionId: self.section, themeReference: currentTheme, colors: colorItems, currentColor: currentColor, updated: { color in arguments.selectAccentColor(color) + }, contextAction: { theme, color, node, gesture in + arguments.colorContextAction(theme, color, node, gesture) }, openColorPicker: { arguments.openAccentColorPicker(currentTheme) }, tag: ThemeSettingsEntryTag.accentColor) @@ -356,7 +360,7 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { arguments.selectTheme(theme) } }, contextAction: { theme, node, gesture in - arguments.contextAction(theme.index == currentTheme.index, theme, node, gesture) + arguments.themeContextAction(theme.index == currentTheme.index, theme, node, gesture) }) case let .iconHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) @@ -486,7 +490,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The themeSpecificAccentColors[currentTheme.index] = color if case let .builtin(theme) = currentTheme, theme == .dayClassic || theme == .nightAccent { - if let wallpaper = current.themeSpecificChatWallpapers[currentTheme.index], wallpaper.isColorOrGradient || wallpaper.isBuiltin { + if let wallpaper = current.themeSpecificChatWallpapers[currentTheme.index], wallpaper.isColorOrGradient || wallpaper.isPattern || wallpaper.isBuiltin { themeSpecificChatWallpapers[currentTheme.index] = nil } } @@ -524,20 +528,20 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The } }) pushControllerImpl?(controller) - }, contextAction: { isCurrent, reference, node, gesture in - let _ = (context.sharedContext.accountManager.transaction { transaction -> PresentationThemeAccentColor? in + }, themeContextAction: { isCurrent, reference, node, gesture in + let _ = (context.sharedContext.accountManager.transaction { transaction -> (PresentationThemeAccentColor?, TelegramWallpaper?) in let settings = transaction.getSharedData(ApplicationSpecificSharedDataKeys.presentationThemeSettings) as? PresentationThemeSettings ?? PresentationThemeSettings.defaultSettings - return settings.themeSpecificAccentColors[reference.index] - } |> map { accentColor in - return makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: reference, accentColor: accentColor?.color, bubbleColors: accentColor?.customBubbleColors) + return (settings.themeSpecificAccentColors[reference.index], settings.themeSpecificChatWallpapers[reference.index]) + } |> map { accentColor, wallpaper in + return (makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: reference, accentColor: accentColor?.color, bubbleColors: accentColor?.customBubbleColors), wallpaper) } - |> deliverOnMainQueue).start(next: { theme in + |> deliverOnMainQueue).start(next: { theme, wallpaper in guard let theme = theme else { return } let presentationData = context.sharedContext.currentPresentationData.with { $0 } let strings = presentationData.strings - let themeController = ThemePreviewController(context: context, previewTheme: theme, source: .settings(reference)) + let themeController = ThemePreviewController(context: context, previewTheme: theme, source: .settings(reference, wallpaper)) var items: [ContextMenuItem] = [] if case let .cloud(theme) = reference { @@ -633,6 +637,27 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The let contextController = ContextController(account: context.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: themeController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) presentInGlobalOverlayImpl?(contextController, nil) }) + }, colorContextAction: { reference, accentColor, node, gesture in + guard let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: reference, accentColor: accentColor?.color, bubbleColors: accentColor?.customBubbleColors) else { + return + } + let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let strings = presentationData.strings + let themeController = ThemePreviewController(context: context, previewTheme: theme, source: .settings(reference, nil)) + var items: [ContextMenuItem] = [] + + let removable = accentColor?.accentColor != nil || accentColor?.bubbleColors != nil + if removable { + items.append(.action(ContextMenuActionItem(text: presentationData.strings.Appearance_RemoveThemeColor, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor) + }, action: { c, f in + c.dismiss(completion: { + let controller = ThemeAccentColorController(context: context, mode: .colors(themeReference: reference)) + pushControllerImpl?(controller) + }) + }))) + } + let contextController = ContextController(account: context.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: themeController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture) + presentInGlobalOverlayImpl?(contextController, nil) }) let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]), cloudThemes.get(), availableAppIcons, currentAppIconName.get()) @@ -811,7 +836,7 @@ public final class ThemeSettingsCrossfadeController: ViewController { private let snapshotView: UIView? public init() { - self.snapshotView = UIScreen.main.snapshotView(afterScreenUpdates: false) + self.snapshotView = (UIScreen.main as? UIView)?.snapshotContentTree() //UIScreen.main.snapshotView(afterScreenUpdates: false) super.init(navigationBarPresentationData: nil) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift index 91b7b469b9..38dbb80104 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift @@ -7,6 +7,7 @@ import Postbox import TelegramCore import SyncCore import TelegramPresentationData +import MergeLists import TelegramUIPreferences import ItemListUI import PresentationDataUtils @@ -15,22 +16,134 @@ import AccountContext import AppBundle import ContextUI -private var borderImages: [String: UIImage] = [:] +private struct ThemeSettingsThemeEntry: Comparable, Identifiable { + let index: Int + let themeReference: PresentationThemeReference + let title: String + let accentColor: PresentationThemeAccentColor? + var selected: Bool + let theme: PresentationTheme + + var stableId: Int64 { + return self.themeReference.index + } + + static func ==(lhs: ThemeSettingsThemeEntry, rhs: ThemeSettingsThemeEntry) -> Bool { + if lhs.index != rhs.index { + return false + } + if lhs.themeReference.index != rhs.themeReference.index { + return false + } + if lhs.accentColor != rhs.accentColor { + return false + } + if lhs.title != rhs.title { + return false + } + if lhs.selected != rhs.selected { + return false + } + if lhs.theme !== rhs.theme { + return false + } + return true + } + + static func <(lhs: ThemeSettingsThemeEntry, rhs: ThemeSettingsThemeEntry) -> Bool { + return lhs.index < rhs.index + } + + func item(context: AccountContext, action: @escaping (PresentationThemeReference) -> Void, contextAction: ((PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void)?) -> ListViewItem { + return ThemeSettingsThemeIconItem(context: context, themeReference: self.themeReference, accentColor: self.accentColor, selected: self.selected, title: self.title, theme: self.theme, action: action, contextAction: contextAction) + } +} + +private class ThemeSettingsThemeIconItem: ListViewItem { + let context: AccountContext + let themeReference: PresentationThemeReference + let accentColor: PresentationThemeAccentColor? + let selected: Bool + let title: String + let theme: PresentationTheme + let action: (PresentationThemeReference) -> Void + let contextAction: ((PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void)? + + public init(context: AccountContext, themeReference: PresentationThemeReference, accentColor: PresentationThemeAccentColor?, selected: Bool, title: String, theme: PresentationTheme, action: @escaping (PresentationThemeReference) -> Void, contextAction: ((PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void)?) { + self.context = context + self.themeReference = themeReference + self.accentColor = accentColor + self.selected = selected + self.title = title + self.theme = theme + self.action = action + self.contextAction = contextAction + } + + public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { + async { + let node = ThemeSettingsThemeItemIconNode() + let (nodeLayout, apply) = node.asyncLayout()(self, params) + node.insets = nodeLayout.insets + node.contentSize = nodeLayout.contentSize + + Queue.mainQueue().async { + completion(node, { + return (nil, { _ in + apply(false) + }) + }) + } + } + } + + 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 { + assert(node() is ThemeSettingsThemeItemIconNode) + if let nodeValue = node() as? ThemeSettingsThemeItemIconNode { + let layout = nodeValue.asyncLayout() + async { + let (nodeLayout, apply) = layout(self, params) + Queue.mainQueue().async { + completion(nodeLayout, { _ in + apply(animation.isAnimated) + }) + } + } + } + } + } + + public var selectable = true + public func selected(listView: ListView) { + self.action(self.themeReference) + } +} + + +private let textFont = Font.regular(12.0) +private let selectedTextFont = Font.bold(12.0) + +private var cachedBorderImages: [String: UIImage] = [:] private func generateBorderImage(theme: PresentationTheme, bordered: Bool, selected: Bool) -> UIImage? { let key = "\(theme.list.itemBlocksBackgroundColor.hexString)_\(selected ? "s" + theme.list.itemAccentColor.hexString : theme.list.disclosureArrowColor.hexString)" - if let image = borderImages[key] { + if let image = cachedBorderImages[key] { return image } else { let image = generateImage(CGSize(width: 32.0, height: 32.0), rotatedContext: { size, context in let bounds = CGRect(origin: CGPoint(), size: size) context.setFillColor(theme.list.itemBlocksBackgroundColor.cgColor) context.fill(bounds) - + context.setBlendMode(.clear) - context.fillEllipse(in: bounds.insetBy(dx: 1.0, dy: 1.0)) + if selected { + context.fillEllipse(in: bounds.insetBy(dx: 5.0, dy: 5.0)) + } else { + context.fillEllipse(in: bounds.insetBy(dx: 1.0, dy: 1.0)) + } context.setBlendMode(.normal) - + let lineWidth: CGFloat if selected { var accentColor = theme.list.itemAccentColor @@ -43,13 +156,13 @@ private func generateBorderImage(theme: PresentationTheme, bordered: Bool, selec context.setStrokeColor(theme.list.disclosureArrowColor.withAlphaComponent(0.4).cgColor) lineWidth = 1.0 } - + if bordered || selected { context.setLineWidth(lineWidth) context.strokeEllipse(in: bounds.insetBy(dx: 1.0 + lineWidth / 2.0, dy: 1.0 + lineWidth / 2.0)) } })?.stretchableImage(withLeftCapWidth: 16, topCapHeight: 16) - borderImages[key] = image + cachedBorderImages[key] = image return image } } @@ -80,9 +193,136 @@ private func createThemeImage(theme: PresentationTheme) -> Signal<(TransformImag } +private final class ThemeSettingsThemeItemIconNode : ListViewItemNode { + private let containerNode: ContextControllerSourceNode + private let imageNode: TransformImageNode + private let overlayNode: ASImageNode + private let titleNode: TextNode + + var item: ThemeSettingsThemeIconItem? + + init() { + self.containerNode = ContextControllerSourceNode() + + self.imageNode = TransformImageNode() + self.imageNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 98.0, height: 62.0)) + self.imageNode.isLayerBacked = true + + self.overlayNode = ASImageNode() + self.overlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 100.0, height: 64.0)) + self.overlayNode.isLayerBacked = true + + self.titleNode = TextNode() + self.titleNode.isUserInteractionEnabled = false + + super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false) + + self.addSubnode(self.containerNode) + self.containerNode.addSubnode(self.imageNode) + self.containerNode.addSubnode(self.overlayNode) + self.containerNode.addSubnode(self.titleNode) + + self.containerNode.activated = { [weak self] gesture in + guard let strongSelf = self, let item = strongSelf.item else { + gesture.cancel() + return + } + item.contextAction?(item.themeReference, strongSelf.containerNode, gesture) + } + } + + override func didLoad() { + super.didLoad() + + self.layer.sublayerTransform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0) + } + + func asyncLayout() -> (ThemeSettingsThemeIconItem, ListViewItemLayoutParams) -> (ListViewItemNodeLayout, (Bool) -> Void) { + let makeTitleLayout = TextNode.asyncLayout(self.titleNode) + let makeImageLayout = self.imageNode.asyncLayout() + + let currentItem = self.item + + return { [weak self] item, params in + var updatedThemeReference = false + var updatedAccentColor = false + var updatedTheme = false + var updatedSelected = false + + if currentItem?.themeReference != item.themeReference { + updatedThemeReference = true + } + if currentItem?.accentColor != item.accentColor { + updatedAccentColor = true + } + if currentItem?.theme !== item.theme { + updatedTheme = true + } + if currentItem?.selected != item.selected { + updatedSelected = true + } + + let title = NSAttributedString(string: item.title, font: item.selected ? selectedTextFont : textFont, textColor: item.selected ? item.theme.list.itemAccentColor : item.theme.list.itemPrimaryTextColor) + let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: title, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, cutout: nil, insets: UIEdgeInsets())) + + let itemLayout = ListViewItemNodeLayout(contentSize: CGSize(width: 116.0, height: 116.0), insets: UIEdgeInsets()) + return (itemLayout, { animated in + if let strongSelf = self { + strongSelf.item = item + + if case let .cloud(theme) = item.themeReference, theme.theme.file == nil { + if updatedTheme { + strongSelf.imageNode.setSignal(createThemeImage(theme: item.theme)) + } + strongSelf.containerNode.isGestureEnabled = false + } else { + if updatedThemeReference || updatedAccentColor { + strongSelf.imageNode.setSignal(themeIconImage(account: item.context.account, accountManager: item.context.sharedContext.accountManager, theme: item.themeReference, accentColor: item.accentColor?.color, bubbleColors: item.accentColor?.plainBubbleColors)) + } + strongSelf.containerNode.isGestureEnabled = true + } + if updatedTheme || updatedSelected { + strongSelf.overlayNode.image = generateBorderImage(theme: item.theme, bordered: true, selected: item.selected) + } + + strongSelf.containerNode.frame = CGRect(origin: CGPoint(), size: itemLayout.contentSize) + + let _ = titleApply() + + let imageSize = CGSize(width: 98.0, height: 62.0) + strongSelf.imageNode.frame = CGRect(origin: CGPoint(x: 10.0, y: 14.0), size: imageSize) + let applyLayout = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets(), emptyColor: .clear)) + applyLayout() + + strongSelf.overlayNode.frame = CGRect(origin: CGPoint(x: 9.0, y: 13.0), size: CGSize(width: 100.0, height: 64.0)) + strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 88.0), size: CGSize(width: itemLayout.contentSize.width, height: 16.0)) + } + }) + } + } + + override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { + super.animateInsertion(currentTimestamp, duration: duration, short: short) + + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } + + override func animateRemoved(_ currentTimestamp: Double, duration: Double) { + super.animateRemoved(currentTimestamp, duration: duration) + + self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false) + } + + override func animateAdded(_ currentTimestamp: Double, duration: Double) { + super.animateAdded(currentTimestamp, duration: duration) + + self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) + } +} + class ThemeSettingsThemeItem: ListViewItem, ItemListItem { var sectionId: ItemListSectionId - + let context: AccountContext let theme: PresentationTheme let strings: PresentationStrings @@ -93,7 +333,7 @@ class ThemeSettingsThemeItem: ListViewItem, ItemListItem { let updatedTheme: (PresentationThemeReference) -> Void let contextAction: ((PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void)? let tag: ItemListItemTag? - + init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, themes: [PresentationThemeReference], displayUnsupported: Bool, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], currentTheme: PresentationThemeReference, updatedTheme: @escaping (PresentationThemeReference) -> Void, contextAction: ((PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void)?, tag: ItemListItemTag? = nil) { self.context = context self.theme = theme @@ -107,15 +347,15 @@ class ThemeSettingsThemeItem: ListViewItem, ItemListItem { self.tag = tag self.sectionId = sectionId } - + func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal?, (ListViewItemApply) -> Void)) -> Void) { async { let node = ThemeSettingsThemeItemNode() let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) - + node.contentSize = layout.contentSize node.insets = layout.insets - + Queue.mainQueue().async { completion(node, { return (nil, { _ in apply() }) @@ -123,12 +363,12 @@ class ThemeSettingsThemeItem: ListViewItem, ItemListItem { } } } - + 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? ThemeSettingsThemeItemNode { let makeLayout = nodeValue.asyncLayout() - + async { let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem)) Queue.mainQueue().async { @@ -142,211 +382,132 @@ class ThemeSettingsThemeItem: ListViewItem, ItemListItem { } } -private func areBubbleColorsEqual(_ lhs: (UIColor, UIColor)?, _ rhs: (UIColor, UIColor)?) -> Bool { - if let (lhsTopColor, lhsBottomColor) = lhs, let (rhsTopColor, rhsBottomColor) = rhs { - return lhsTopColor.rgb == rhsTopColor.rgb && lhsBottomColor.rgb == rhsBottomColor.rgb - } else { - return (lhs == nil) == (rhs == nil) - } +private struct ThemeSettingsThemeItemNodeTransition { + let deletions: [ListViewDeleteItem] + let insertions: [ListViewInsertItem] + let updates: [ListViewUpdateItem] } -private final class ThemeSettingsThemeItemIconNode : ASDisplayNode { - private let containerNode: ContextControllerSourceNode - private let imageNode: TransformImageNode - private let overlayNode: ASImageNode - private let textNode: ASTextNode - private var action: (() -> Void)? - private var contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? +private func preparedTransition(context: AccountContext, action: @escaping (PresentationThemeReference) -> Void, contextAction: ((PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void)?, from fromEntries: [ThemeSettingsThemeEntry], to toEntries: [ThemeSettingsThemeEntry]) -> ThemeSettingsThemeItemNodeTransition { + let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries) - private var theme: PresentationThemeReference? - private var currentTheme: PresentationTheme? - private var accentColor: UIColor? - private var bubbleColors: (UIColor, UIColor)? - private var bordered: Bool? - private var selected: Bool? + let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) } + let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, action: action, contextAction: contextAction), directionHint: .Down) } + let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, action: action, contextAction: contextAction), directionHint: nil) } - override init() { - self.containerNode = ContextControllerSourceNode() - - self.imageNode = TransformImageNode() - self.imageNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 98.0, height: 62.0)) - self.imageNode.isLayerBacked = true - - self.overlayNode = ASImageNode() - self.overlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 100.0, height: 64.0)) - self.overlayNode.isLayerBacked = true - - self.textNode = ASTextNode() - self.textNode.isUserInteractionEnabled = false - self.textNode.displaysAsynchronously = true - - super.init() - - self.addSubnode(self.containerNode) - self.containerNode.addSubnode(self.imageNode) - self.containerNode.addSubnode(self.overlayNode) - self.containerNode.addSubnode(self.textNode) - - self.containerNode.activated = { [weak self] gesture in - guard let strongSelf = self else { - gesture.cancel() - return - } - strongSelf.contextAction?(strongSelf.containerNode, gesture) - } - } - - func setup(context: AccountContext, theme: PresentationThemeReference, accentColor: UIColor?, bubbleColors: (UIColor, UIColor)?, currentTheme: PresentationTheme, title: NSAttributedString, bordered: Bool, selected: Bool, action: @escaping () -> Void, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)?) { - let updatedTheme = self.currentTheme == nil || currentTheme !== self.currentTheme! - var contextActionEnabled = true - if case let .cloud(theme) = theme, theme.theme.file == nil { - if updatedTheme || accentColor != self.accentColor { - self.imageNode.setSignal(createThemeImage(theme: currentTheme)) - self.currentTheme = currentTheme - self.accentColor = accentColor - contextActionEnabled = false - } - } else { - if theme != self.theme || accentColor != self.accentColor || !areBubbleColorsEqual(bubbleColors, self.bubbleColors) { - self.imageNode.setSignal(themeIconImage(account: context.account, accountManager: context.sharedContext.accountManager, theme: theme, accentColor: accentColor, bubbleColors: bubbleColors)) - self.theme = theme - self.accentColor = accentColor - self.bubbleColors = bubbleColors - } - } - if updatedTheme || bordered != self.bordered || selected != self.selected { - self.overlayNode.image = generateBorderImage(theme: currentTheme, bordered: bordered, selected: selected) - self.currentTheme = currentTheme - self.bordered = bordered - self.selected = selected - } - self.textNode.attributedText = title - self.action = action - self.contextAction = contextAction - self.containerNode.isGestureEnabled = contextActionEnabled - } - - override func didLoad() { - super.didLoad() - - let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:))) - recognizer.delaysTouchesBegan = false - recognizer.tapActionAtPoint = { point in - return .waitForSingleTap - } - self.view.addGestureRecognizer(recognizer) - } - - @objc private func tapLongTapOrDoubleTapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) { - switch recognizer.state { - case .ended: - if let (gesture, _) = recognizer.lastRecognizedGestureAndLocation { - switch gesture { - case .tap: - self.action?() - default: - break - } - } - default: - break - } - } - - override func layout() { - super.layout() - - let bounds = self.bounds - - self.containerNode.frame = CGRect(origin: CGPoint(), size: bounds.size) - - let imageSize = CGSize(width: 98.0, height: 62.0) - self.imageNode.frame = CGRect(origin: CGPoint(x: 10.0, y: 14.0), size: imageSize) - let makeLayout = self.imageNode.asyncLayout() - let applyLayout = makeLayout(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets(), emptyColor: .clear)) - applyLayout() - - self.overlayNode.frame = CGRect(origin: CGPoint(x: 9.0, y: 13.0), size: CGSize(width: 100.0, height: 64.0)) - self.textNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 14.0 + 60.0 + 4.0 + 9.0), size: CGSize(width: bounds.size.width, height: 16.0)) - } + return ThemeSettingsThemeItemNodeTransition(deletions: deletions, insertions: insertions, updates: updates) } - -private let textFont = Font.regular(12.0) -private let selectedTextFont = Font.bold(12.0) +private func ensureThemeVisible(listNode: ListView, themeReference: PresentationThemeReference, animated: Bool) { + var resultNode: ThemeSettingsThemeItemIconNode? + listNode.forEachItemNode { node in + if resultNode == nil, let node = node as? ThemeSettingsThemeItemIconNode { + if node.item?.themeReference.index == themeReference.index { + resultNode = node + } + } + } + if let resultNode = resultNode { + listNode.ensureItemNodeVisible(resultNode, animated: animated, overflow: 56.0) + } +} class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { private let backgroundNode: ASDisplayNode private let topStripeNode: ASDisplayNode private let bottomStripeNode: ASDisplayNode private let maskNode: ASImageNode - - private let scrollNode: ASScrollNode - private var nodes: [ThemeSettingsThemeItemIconNode] = [] - + + private let listNode: ListView + private var entries: [ThemeSettingsThemeEntry]? + private var enqueuedTransitions: [ThemeSettingsThemeItemNodeTransition] = [] + private var initialized = false + private var item: ThemeSettingsThemeItem? private var layoutParams: ListViewItemLayoutParams? - + var tag: ItemListItemTag? { return self.item?.tag } - + init() { self.backgroundNode = ASDisplayNode() self.backgroundNode.isLayerBacked = true - + self.topStripeNode = ASDisplayNode() self.topStripeNode.isLayerBacked = true - + self.bottomStripeNode = ASDisplayNode() self.bottomStripeNode.isLayerBacked = true - + self.maskNode = ASImageNode() - - self.scrollNode = ASScrollNode() - + + self.listNode = ListView() + self.listNode.transform = CATransform3DMakeRotation(-CGFloat.pi / 2.0, 0.0, 0.0, 1.0) + super.init(layerBacked: false, dynamicBounce: false) - - self.addSubnode(self.scrollNode) + + self.addSubnode(self.listNode) } - + override func didLoad() { super.didLoad() - self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true - self.scrollNode.view.showsHorizontalScrollIndicator = false + self.listNode.view.disablesInteractiveTransitionGestureRecognizer = true } - private func scrollToNode(_ node: ThemeSettingsThemeItemIconNode, animated: Bool) { - let bounds = self.scrollNode.view.bounds - let frame = node.frame.insetBy(dx: -48.0, dy: 0.0) + private func enqueueTransition(_ transition: ThemeSettingsThemeItemNodeTransition) { + self.enqueuedTransitions.append(transition) - if frame.minX < bounds.minX || frame.maxX > bounds.maxX { - self.scrollNode.view.scrollRectToVisible(frame, animated: animated) + if let _ = self.item { + while !self.enqueuedTransitions.isEmpty { + self.dequeueTransition() + } } } + private func dequeueTransition() { + guard let _ = self.item, let transition = self.enqueuedTransitions.first else { + return + } + self.enqueuedTransitions.remove(at: 0) + + var options = ListViewDeleteAndInsertOptions() + + self.listNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { [weak self] _ in + if let strongSelf = self, let item = strongSelf.item { + if !strongSelf.initialized { + strongSelf.initialized = true + ensureThemeVisible(listNode: strongSelf.listNode, themeReference: item.currentTheme, animated: false) + } + } + }) + } + func asyncLayout() -> (_ item: ThemeSettingsThemeItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { + let currentItem = self.item + return { item, params, neighbors in let contentSize: CGSize let insets: UIEdgeInsets let separatorHeight = UIScreenPixel - + contentSize = CGSize(width: params.width, height: 116.0) insets = itemListNeighborsGroupedInsets(neighbors) - + let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size - + return (layout, { [weak self] in if let strongSelf = self { + let isFirstLayout = currentItem == nil + strongSelf.item = item strongSelf.layoutParams = params - - strongSelf.scrollNode.view.contentInset = UIEdgeInsets(top: 0.0, left: params.leftInset, bottom: 0.0, right: params.rightInset) + strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor - + if strongSelf.backgroundNode.supernode == nil { strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0) } @@ -359,7 +520,7 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { if strongSelf.maskNode.supernode == nil { strongSelf.insertSubnode(strongSelf.maskNode, at: 3) } - + let hasCorners = itemListHasRoundedBlockLayout(params) var hasTopCorners = false var hasBottomCorners = false @@ -382,88 +543,53 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { hasBottomCorners = true strongSelf.bottomStripeNode.isHidden = hasCorners } - + strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil - + strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight))) strongSelf.maskNode.frame = strongSelf.backgroundNode.frame.insetBy(dx: params.leftInset, dy: 0.0) strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight)) strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height + bottomStripeOffset), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight)) + + var listInsets = UIEdgeInsets() + listInsets.top += params.leftInset + 4.0 + listInsets.bottom += params.rightInset + 4.0 - strongSelf.scrollNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 2.0), size: CGSize(width: layoutSize.width, height: layoutSize.height)) + strongSelf.listNode.bounds = CGRect(x: 0.0, y: 0.0, width: layoutSize.height, height: layoutSize.width) + strongSelf.listNode.position = CGPoint(x: layoutSize.width / 2.0, y: layoutSize.height / 2.0) + strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: CGSize(width: layoutSize.height, height: layoutSize.width), insets: listInsets, duration: 0.0, curve: .Default(duration: nil)), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) - let nodeInset: CGFloat = 4.0 - let nodeSize = CGSize(width: 116.0, height: 112.0) - var nodeOffset = nodeInset - - var updated = false - var selectedNode: ThemeSettingsThemeItemIconNode? - - var i = 0 + var entries: [ThemeSettingsThemeEntry] = [] + var index: Int = 0 for theme in item.themes { if !item.displayUnsupported, case let .cloud(theme) = theme, theme.theme.file == nil { continue } - - let imageNode: ThemeSettingsThemeItemIconNode - if strongSelf.nodes.count > i { - imageNode = strongSelf.nodes[i] - } else { - imageNode = ThemeSettingsThemeItemIconNode() - strongSelf.nodes.append(imageNode) - strongSelf.scrollNode.addSubnode(imageNode) - updated = true - } - - let selected = theme.index == item.currentTheme.index - if selected { - selectedNode = imageNode - } - - let name = themeDisplayName(strings: item.strings, reference: theme) - imageNode.setup(context: item.context, theme: theme, accentColor: item.themeSpecificAccentColors[theme.index]?.color, bubbleColors: item.themeSpecificAccentColors[theme.index]?.plainBubbleColors, currentTheme: item.theme, title: NSAttributedString(string: name, font: selected ? selectedTextFont : textFont, textColor: selected ? item.theme.list.itemAccentColor : item.theme.list.itemPrimaryTextColor, paragraphAlignment: .center), bordered: true, selected: selected, action: { [weak self, weak imageNode] in - item.updatedTheme(theme) - if let imageNode = imageNode { - self?.scrollToNode(imageNode, animated: true) - } - }, contextAction: item.contextAction.flatMap { - contextAction in - return { node, gesture in - contextAction(theme, node, gesture) - } - }) - - imageNode.frame = CGRect(origin: CGPoint(x: nodeOffset, y: 0.0), size: nodeSize) - nodeOffset += nodeSize.width + 2.0 - - i += 1 + let title = themeDisplayName(strings: item.strings, reference: theme) + let accentColor = item.themeSpecificAccentColors[theme.index] + entries.append(ThemeSettingsThemeEntry(index: index, themeReference: theme, title: title, accentColor: accentColor, selected: item.currentTheme.index == theme.index, theme: item.theme)) + index += 1 } - for k in (i ..< strongSelf.nodes.count).reversed() { - let node = strongSelf.nodes[k] - strongSelf.nodes.remove(at: k) - node.removeFromSupernode() - } - - if let lastNode = strongSelf.nodes.last { - let contentSize = CGSize(width: lastNode.frame.maxX + nodeInset, height: strongSelf.scrollNode.frame.height) - if strongSelf.scrollNode.view.contentSize != contentSize { - strongSelf.scrollNode.view.contentSize = contentSize + let action: (PresentationThemeReference) -> Void = { [weak self, weak item] themeReference in + if let strongSelf = self { + strongSelf.item?.updatedTheme(themeReference) + ensureThemeVisible(listNode: strongSelf.listNode, themeReference: themeReference, animated: true) } } + let transition = preparedTransition(context: item.context, action: action, contextAction: item.contextAction, from: strongSelf.entries ?? [], to: entries) + strongSelf.enqueueTransition(transition) - if updated, let selectedNode = selectedNode { - strongSelf.scrollToNode(selectedNode, animated: false) - } + strongSelf.entries = entries } }) } } - + override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) { self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4) } - + override func animateRemoved(_ currentTimestamp: Double, duration: Double) { self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false) } diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift index 2e1e633876..eb9c41287b 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift @@ -325,6 +325,7 @@ struct WallpaperColorPanelNodeState { var defaultColor: UIColor? var secondColor: UIColor? var secondColorAvailable: Bool + var preview: Bool } final class WallpaperColorPanelNode: ASDisplayNode { @@ -365,14 +366,14 @@ final class WallpaperColorPanelNode: ASDisplayNode { self.colorPickerNode = WallpaperColorPickerNode(strings: strings) self.swapButton = HighlightableButtonNode() - self.swapButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeColorSwapIcon"), color: theme.chat.inputPanel.panelControlColor), for: .normal) + self.swapButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeColorRotateIcon"), color: theme.chat.inputPanel.panelControlColor), for: .normal) self.addButton = HighlightableButtonNode() self.addButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeColorAddIcon"), color: theme.chat.inputPanel.panelControlColor), for: .normal) self.firstColorFieldNode = ColorInputFieldNode(theme: theme) self.secondColorFieldNode = ColorInputFieldNode(theme: theme) - self.state = WallpaperColorPanelNodeState(selection: .first, firstColor: nil, secondColor: nil, secondColorAvailable: false) + self.state = WallpaperColorPanelNodeState(selection: .first, firstColor: nil, secondColor: nil, secondColorAvailable: false, preview: false) super.init() @@ -467,6 +468,7 @@ final class WallpaperColorPanelNode: ASDisplayNode { if let strongSelf = self { strongSelf.updateState({ current in var updated = current + updated.preview = true switch strongSelf.state.selection { case .first: updated.firstColor = color @@ -483,6 +485,7 @@ final class WallpaperColorPanelNode: ASDisplayNode { if let strongSelf = self { strongSelf.updateState({ current in var updated = current + updated.preview = false switch strongSelf.state.selection { case .first: updated.firstColor = color @@ -510,6 +513,7 @@ final class WallpaperColorPanelNode: ASDisplayNode { var updateLayout = updateLayout let previousFirstColor = self.state.firstColor let previousSecondColor = self.state.secondColor + let previousPreview = self.state.preview self.state = f(self.state) let firstColor: UIColor @@ -554,8 +558,8 @@ final class WallpaperColorPanelNode: ASDisplayNode { self.updateLayout(size: size, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate) } - if self.state.firstColor?.rgb != previousFirstColor?.rgb || self.state.secondColor?.rgb != previousSecondColor?.rgb { - self.colorsChanged?(firstColorIsDefault ? nil : firstColor, secondColor, updateLayout) + if self.state.firstColor?.rgb != previousFirstColor?.rgb || self.state.secondColor?.rgb != previousSecondColor?.rgb || self.state.preview != previousPreview { + self.colorsChanged?(firstColorIsDefault ? nil : firstColor, secondColor, !self.state.preview) } } @@ -679,14 +683,15 @@ final class WallpaperColorPanelNode: ASDisplayNode { } @objc private func swapPressed() { - self.updateState({ current in - var updated = current - if let secondColor = current.secondColor { - updated.firstColor = secondColor - updated.secondColor = current.firstColor - } - return updated - }) + self.rotate?() +// self.updateState({ current in +// var updated = current +// if let secondColor = current.secondColor { +// updated.firstColor = secondColor +// updated.secondColor = current.firstColor +// } +// return updated +// }) } @objc private func addPressed() { diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift index 02bad5d901..0563302b6f 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift @@ -358,8 +358,10 @@ public class WallpaperGalleryController: ViewController { toolbarNode.cancel = { [weak self] in self?.dismiss(forceAway: true) } + var dismissed = false toolbarNode.done = { [weak self] in - if let strongSelf = self { + if let strongSelf = self, !dismissed { + dismissed = true if let centralItemNode = strongSelf.galleryNode.pager.centralItemNode() as? WallpaperGalleryItemNode { let options = centralItemNode.options if !strongSelf.entries.isEmpty { @@ -380,7 +382,7 @@ public class WallpaperGalleryController: ViewController { let completion: (TelegramWallpaper) -> Void = { wallpaper in let baseSettings = wallpaper.settings - let updatedSettings = WallpaperSettings(blur: options.contains(.blur), motion: options.contains(.motion), color: baseSettings?.color, intensity: baseSettings?.intensity) + let updatedSettings = WallpaperSettings(blur: options.contains(.blur), motion: options.contains(.motion), color: baseSettings?.color, bottomColor: baseSettings?.bottomColor, intensity: baseSettings?.intensity) let wallpaper = wallpaper.withUpdatedSettings(updatedSettings) let autoNightModeTriggered = strongSelf.presentationData.autoNightModeTriggered @@ -430,7 +432,7 @@ public class WallpaperGalleryController: ViewController { } } else if case let .file(file) = wallpaper, let resource = resource { if file.isPattern, let color = file.settings.color, let intensity = file.settings.intensity { - let representation = CachedPatternWallpaperRepresentation(color: color, intensity: intensity) + let representation = CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation) var data: Data? if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) { diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift index 7592066231..7abc84af85 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift @@ -200,7 +200,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { let subtitleSignal: Signal var actionSignal: Signal = .single(nil) var colorSignal: Signal = serviceColor(from: imagePromise.get()) - var color: UIColor? + var patternArguments: PatternWallpaperArguments? let displaySize: CGSize let contentSize: CGSize @@ -255,14 +255,23 @@ final class WallpaperGalleryItemNode: GalleryItemNode { convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource), reference: reference(for: file.file.resource, media: file.file, message: message))) if file.isPattern { + var patternColors: [UIColor] = [] var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5) var patternIntensity: CGFloat = 0.5 + if let color = file.settings.color { if let intensity = file.settings.intensity { patternIntensity = CGFloat(intensity) / 100.0 } patternColor = UIColor(rgb: UInt32(bitPattern: color), alpha: patternIntensity) + patternColors.append(patternColor) + + if let bottomColor = file.settings.bottomColor { + patternColors.append(UIColor(rgb: UInt32(bitPattern: bottomColor), alpha: patternIntensity)) + } } + + patternArguments = PatternWallpaperArguments(colors: patternColors, rotation: file.settings.rotation) self.backgroundColor = patternColor.withAlphaComponent(1.0) @@ -270,7 +279,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { let makeImageLayout = self.imageNode.asyncLayout() Queue.concurrentDefaultQueue().async { - let apply = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), emptyColor: patternColor)) + let apply = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), custom: patternArguments)) Queue.mainQueue().async { if self.colorPreview { apply() @@ -280,9 +289,8 @@ final class WallpaperGalleryItemNode: GalleryItemNode { return } else if let offset = self.validOffset, self.arguments.colorPreview && abs(offset) > 0.0 { return - } - else { - color = patternColor + } else { + patternArguments = PatternWallpaperArguments(colors: patternColors, rotation: file.settings.rotation) } self.colorPreview = self.arguments.colorPreview @@ -443,7 +451,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { } self.imageNode.setSignal(signal, dispatchOnDisplayLink: false) - self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), emptyColor: color))() + self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), custom: patternArguments))() self.imageNode.imageUpdated = { [weak self] image in if let strongSelf = self { var image = isBlurrable ? image : nil @@ -597,7 +605,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { } } - @objc func toggleMotion() { + @objc private func toggleMotion() { let value = !self.motionButtonNode.isSelected self.motionButtonNode.setSelected(value, animated: true) self.setMotionEnabled(value, animated: true) @@ -607,7 +615,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { return self.patternButtonNode.isSelected } - @objc func togglePattern() { + @objc private func togglePattern() { let value = !self.patternButtonNode.isSelected self.patternButtonNode.setSelected(value, animated: true) diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift index d455b3686a..b3f22d94dc 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift @@ -4,14 +4,31 @@ import AsyncDisplayKit import Display import TelegramPresentationData +enum WallpaperGalleryToolbarCancelButtonType { + case cancel + case discard +} + enum WallpaperGalleryToolbarDoneButtonType { case set case proceed + case apply } final class WallpaperGalleryToolbarNode: ASDisplayNode { private var theme: PresentationTheme - private let doneButtonType: WallpaperGalleryToolbarDoneButtonType + private let strings: PresentationStrings + + var cancelButtonType: WallpaperGalleryToolbarCancelButtonType { + didSet { + self.updateThemeAndStrings(theme: self.theme, strings: self.strings) + } + } + var doneButtonType: WallpaperGalleryToolbarDoneButtonType { + didSet { + self.updateThemeAndStrings(theme: self.theme, strings: self.strings) + } + } private let cancelButton = HighlightableButtonNode() private let doneButton = HighlightableButtonNode() @@ -21,8 +38,10 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode { var cancel: (() -> Void)? var done: (() -> Void)? - init(theme: PresentationTheme, strings: PresentationStrings, doneButtonType: WallpaperGalleryToolbarDoneButtonType) { + init(theme: PresentationTheme, strings: PresentationStrings, cancelButtonType: WallpaperGalleryToolbarCancelButtonType = .cancel, doneButtonType: WallpaperGalleryToolbarDoneButtonType = .set) { self.theme = theme + self.strings = strings + self.cancelButtonType = cancelButtonType self.doneButtonType = doneButtonType super.init() @@ -73,8 +92,24 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode { self.separatorNode.backgroundColor = theme.rootController.tabBar.separatorColor self.topSeparatorNode.backgroundColor = theme.rootController.tabBar.separatorColor - self.cancelButton.setTitle(strings.Common_Cancel, with: Font.regular(17.0), with: theme.list.itemPrimaryTextColor, for: []) - self.doneButton.setTitle(self.doneButtonType == .set ? strings.Wallpaper_Set : strings.Theme_Colors_Proceed, with: Font.regular(17.0), with: theme.list.itemPrimaryTextColor, for: []) + let cancelTitle: String + switch self.cancelButtonType { + case .cancel: + cancelTitle = strings.Common_Cancel + case .discard: + cancelTitle = strings.WallpaperPreview_PatternPaternDiscard + } + let doneTitle: String + switch self.doneButtonType { + case .set: + doneTitle = strings.Wallpaper_Set + case .proceed: + doneTitle = strings.Theme_Colors_Proceed + case .apply: + doneTitle = strings.WallpaperPreview_PatternPaternApply + } + self.cancelButton.setTitle(cancelTitle, with: Font.regular(17.0), with: theme.list.itemPrimaryTextColor, for: []) + self.doneButton.setTitle(doneTitle, with: Font.regular(17.0), with: theme.list.itemPrimaryTextColor, for: []) } func updateLayout(size: CGSize, layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { @@ -89,7 +124,6 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode { } @objc func donePressed() { - self.doneButton.isUserInteractionEnabled = false self.done?() } } diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryDecorationNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift similarity index 80% rename from submodules/SettingsUI/Sources/Themes/WallpaperGalleryDecorationNode.swift rename to submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift index ec1a347b00..18bd92880a 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryDecorationNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift @@ -43,7 +43,7 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode { self.backgroundNode = ASDisplayNode() self.backgroundNode.backgroundColor = UIColor(rgb: 0x000000, alpha: 0.3) - self.backgroundNode.cornerRadius = 6.0 + self.backgroundNode.cornerRadius = 14.0 self.checkNode = ModernCheckNode(theme: CheckNodeTheme(backgroundColor: .white, strokeColor: .clear, borderColor: .white, hasShadow: false)) self.checkNode.isUserInteractionEnabled = false @@ -147,7 +147,7 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode { override func measure(_ constrainedSize: CGSize) -> CGSize { let size = self.textNode.measure(constrainedSize) self.textSize = size - return CGSize(width: ceil(size.width) + 52.0, height: 30.0) + return CGSize(width: ceil(size.width) + 48.0, height: 30.0) } override func layout() { @@ -159,42 +159,15 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode { return } - let checkSize = CGSize(width: 18.0, height: 18.0) + let padding: CGFloat = 6.0 let spacing: CGFloat = 9.0 - let totalWidth = checkSize.width + spacing + textSize.width - let origin = floor((self.bounds.width - totalWidth) / 2.0) + let checkSize = CGSize(width: 18.0, height: 18.0) - self.checkNode.frame = CGRect(origin: CGPoint(x: origin, y: 6.0), size: checkSize) - self.colorNode.frame = CGRect(origin: CGPoint(x: origin, y: 6.0), size: checkSize) + self.checkNode.frame = CGRect(origin: CGPoint(x: padding, y: padding), size: checkSize) + self.colorNode.frame = CGRect(origin: CGPoint(x: padding, y: padding), size: checkSize) if let textSize = self.textSize { - self.textNode.frame = CGRect(x: origin + checkSize.width + spacing, y: 6.0 + UIScreenPixel, width: textSize.width, height: textSize.height) - } - } -} - -final class WallpaperGalleryDecorationNode: ASDisplayNode { - private let dismiss: () -> Void - private let apply: () -> Void - -// private var messageNodes: [ListViewItemNode]? -// private var blurredButtonNode: WallpaperOptionButtonNode? -// private var motionButtonNode: WallpaperOptionButtonNode? -// private var toolbarNode: WallpaperGalleryToolbarNode? - - init(source: WallpaperListSource, dismiss: @escaping () -> Void, apply: @escaping () -> Void) { - self.dismiss = dismiss - self.apply = apply - - super.init() - } - - 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 + self.textNode.frame = CGRect(x: max(padding + checkSize.width + spacing, padding + checkSize.width + floor((self.bounds.width - padding - checkSize.width - textSize.width) / 2.0) - 2.0), y: 6.0 + UIScreenPixel, width: textSize.width, height: textSize.height) } } } diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift index d06b8e1f35..d0e7ba4b90 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift @@ -13,42 +13,64 @@ private let itemSize = CGSize(width: 88.0, height: 88.0) private let inset: CGFloat = 12.0 final class WallpaperPatternPanelNode: ASDisplayNode { - private let theme: PresentationTheme + private let context: AccountContext + private var theme: PresentationTheme private let backgroundNode: ASDisplayNode private let topSeparatorNode: ASDisplayNode private let scrollNode: ASScrollNode - private let labelNode: ASTextNode + private let titleNode: ImmediateTextNode + private let labelNode: ImmediateTextNode private var sliderView: TGPhotoEditorSliderView? private var disposable: Disposable? - private var wallpapers: [TelegramWallpaper] = [] + var wallpapers: [TelegramWallpaper] = [] private var currentWallpaper: TelegramWallpaper? - var patternChanged: ((TelegramWallpaper, Int32?, Bool) -> Void)? + var serviceBackgroundColor: UIColor = UIColor(rgb: 0x748698) { + didSet { + guard let nodes = self.scrollNode.subnodes else { + return + } + for case let node as SettingsThemeWallpaperNode in nodes { + node.setOverlayBackgroundColor(self.serviceBackgroundColor.withAlphaComponent(0.4)) + } + } + } + + private var validLayout: CGSize? + + var patternChanged: ((TelegramWallpaper?, Int32?, Bool) -> Void)? init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) { + self.context = context self.theme = theme self.backgroundNode = ASDisplayNode() - self.backgroundNode.backgroundColor = theme.chat.inputPanel.panelBackgroundColor + self.backgroundNode.backgroundColor = self.theme.chat.inputPanel.panelBackgroundColor self.topSeparatorNode = ASDisplayNode() - self.topSeparatorNode.backgroundColor = theme.chat.inputPanel.panelSeparatorColor + self.topSeparatorNode.backgroundColor = self.theme.chat.inputPanel.panelSeparatorColor self.scrollNode = ASScrollNode() - self.labelNode = ASTextNode() + self.titleNode = ImmediateTextNode() + self.titleNode.attributedText = NSAttributedString(string: strings.WallpaperPreview_PatternTitle, font: Font.bold(17.0), textColor: theme.rootController.navigationBar.primaryTextColor) + + self.labelNode = ImmediateTextNode() self.labelNode.attributedText = NSAttributedString(string: strings.WallpaperPreview_PatternIntensity, font: Font.regular(14.0), textColor: theme.rootController.navigationBar.primaryTextColor) super.init() + self.allowsGroupOpacity = true + self.addSubnode(self.backgroundNode) self.addSubnode(self.topSeparatorNode) self.addSubnode(self.scrollNode) + self.addSubnode(self.titleNode) self.addSubnode(self.labelNode) self.disposable = ((telegramWallpapers(postbox: context.account.postbox, network: context.account.network) @@ -63,46 +85,8 @@ final class WallpaperPatternPanelNode: ASDisplayNode { } |> deliverOnMainQueue).start(next: { [weak self] wallpapers in if let strongSelf = self { - if let subnodes = strongSelf.scrollNode.subnodes { - for node in subnodes { - node.removeFromSupernode() - } - } - - var selected = true - for wallpaper in wallpapers { - let node = SettingsThemeWallpaperNode(overlayBackgroundColor: UIColor(rgb: 0x748698, alpha: 0.4)) - node.clipsToBounds = true - node.cornerRadius = 5.0 - - var updatedWallpaper = wallpaper - if case let .file(file) = updatedWallpaper { - let settings = WallpaperSettings(blur: false, motion: false, color: 0xd6e2ee, intensity: 100) - updatedWallpaper = .file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: file.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: settings) - } - - node.setWallpaper(context: context, wallpaper: updatedWallpaper, selected: selected, size: itemSize) - node.pressed = { [weak self, weak node] in - if let strongSelf = self { - strongSelf.currentWallpaper = updatedWallpaper - if let sliderView = strongSelf.sliderView { - strongSelf.patternChanged?(updatedWallpaper, Int32(sliderView.value), false) - } - if let subnodes = strongSelf.scrollNode.subnodes { - for case let subnode as SettingsThemeWallpaperNode in subnodes { - subnode.setSelected(node === subnode, animated: true) - } - } - } - } - strongSelf.scrollNode.addSubnode(node) - - selected = false - } - strongSelf.scrollNode.view.contentSize = CGSize(width: (itemSize.width + inset) * CGFloat(wallpapers.count) + inset, height: 112.0) - strongSelf.layoutItemNodes(transition: .immediate) - strongSelf.wallpapers = wallpapers + strongSelf.updateWallpapers() } })) } @@ -135,6 +119,66 @@ final class WallpaperPatternPanelNode: ASDisplayNode { self.sliderView = sliderView } + func updateWallpapers() { + guard let subnodes = self.scrollNode.subnodes else { + return + } + + for node in subnodes { + node.removeFromSupernode() + } + + var selected = true + for wallpaper in wallpapers { + let node = SettingsThemeWallpaperNode(overlayBackgroundColor: UIColor(rgb: 0x748698, alpha: 0.4)) + node.clipsToBounds = true + node.cornerRadius = 5.0 + + var updatedWallpaper = wallpaper + if case let .file(file) = updatedWallpaper { + let settings = WallpaperSettings(blur: false, motion: false, color: 0xd6e2ee, intensity: 100) + updatedWallpaper = .file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: file.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: settings) + } + + node.setWallpaper(context: self.context, wallpaper: updatedWallpaper, selected: selected, size: itemSize) + node.pressed = { [weak self, weak node] in + if let strongSelf = self { + strongSelf.currentWallpaper = updatedWallpaper + if let sliderView = strongSelf.sliderView { + strongSelf.patternChanged?(updatedWallpaper, Int32(sliderView.value), false) + } + if let subnodes = strongSelf.scrollNode.subnodes { + for case let subnode as SettingsThemeWallpaperNode in subnodes { + subnode.setSelected(node === subnode, animated: true) + } + } + } + } + self.scrollNode.addSubnode(node) + + selected = false + } + + self.scrollNode.view.contentSize = CGSize(width: (itemSize.width + inset) * CGFloat(wallpapers.count) + inset, height: 112.0) + self.layoutItemNodes(transition: .immediate) + } + + func updateTheme(_ theme: PresentationTheme) { + self.theme = theme + + self.backgroundNode.backgroundColor = self.theme.chat.inputPanel.panelBackgroundColor + self.topSeparatorNode.backgroundColor = self.theme.chat.inputPanel.panelSeparatorColor + + self.sliderView?.backColor = self.theme.list.disclosureArrowColor + self.sliderView?.trackColor = self.theme.list.itemAccentColor + self.titleNode.attributedText = NSAttributedString(string: self.labelNode.attributedText?.string ?? "", font: Font.bold(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor) + self.labelNode.attributedText = NSAttributedString(string: self.labelNode.attributedText?.string ?? "", font: Font.regular(14.0), textColor: self.theme.rootController.navigationBar.primaryTextColor) + + if let size = self.validLayout { + self.updateLayout(size: size, transition: .immediate) + } + } + @objc func sliderValueChanged() { guard let sliderView = self.sliderView else { return @@ -145,37 +189,46 @@ final class WallpaperPatternPanelNode: ASDisplayNode { } } - func didAppear() { - if let wallpaper = self.wallpapers.first { + func didAppear(initialWallpaper: TelegramWallpaper? = nil) { + var wallpaper = initialWallpaper ?? self.wallpapers.first + + if let wallpaper = wallpaper { self.currentWallpaper = wallpaper self.sliderView?.value = 40.0 self.scrollNode.view.contentOffset = CGPoint() - var selected = true if let subnodes = self.scrollNode.subnodes { for case let subnode as SettingsThemeWallpaperNode in subnodes { - subnode.setSelected(selected, animated: false) - selected = false + subnode.setSelected(wallpaper == subnode.wallpaper, animated: false) } } - if let wallpaper = self.currentWallpaper, let sliderView = self.sliderView { + if initialWallpaper == nil, let wallpaper = self.currentWallpaper, let sliderView = self.sliderView { self.patternChanged?(wallpaper, Int32(sliderView.value), false) } } } func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) { - let separatorHeight = UIScreenPixel + self.validLayout = size + transition.updateFrame(node: self.backgroundNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height)) - transition.updateFrame(node: self.topSeparatorNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: separatorHeight)) - transition.updateFrame(node: self.scrollNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: 114.0)) + transition.updateFrame(node: self.topSeparatorNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: UIScreenPixel)) - let labelSize = self.labelNode.measure(self.bounds.size) - transition.updateFrame(node: labelNode, frame: CGRect(origin: CGPoint(x: 14.0, y: 128.0), size: labelSize)) + let titleSize = self.titleNode.updateLayout(self.bounds.size) + transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: floor((self.bounds.width - titleSize.width) / 2.0), y: 19.0), size: titleSize)) - self.sliderView?.frame = CGRect(origin: CGPoint(x: 15.0, y: 136.0), size: CGSize(width: size.width - 15.0 * 2.0, height: 44.0)) + let scrollViewFrame = CGRect(x: 0.0, y: 52.0, width: size.width, height: 114.0) + transition.updateFrame(node: self.scrollNode, frame: scrollViewFrame) + + let labelSize = self.labelNode.updateLayout(self.bounds.size) + var combinedHeight = labelSize.height + 34.0 + + var originY: CGFloat = scrollViewFrame.maxY + floor((size.height - scrollViewFrame.maxY - combinedHeight) / 2.0) + transition.updateFrame(node: self.labelNode, frame: CGRect(origin: CGPoint(x: 14.0, y: originY), size: labelSize)) + + self.sliderView?.frame = CGRect(origin: CGPoint(x: 15.0, y: originY + 8.0), size: CGSize(width: size.width - 15.0 * 2.0, height: 44.0)) self.layoutItemNodes(transition: transition) } diff --git a/submodules/SyncCore/Sources/TelegramWallpaper.swift b/submodules/SyncCore/Sources/TelegramWallpaper.swift index 47015e2362..8072f707d8 100644 --- a/submodules/SyncCore/Sources/TelegramWallpaper.swift +++ b/submodules/SyncCore/Sources/TelegramWallpaper.swift @@ -4,13 +4,15 @@ public struct WallpaperSettings: PostboxCoding, Equatable { public let blur: Bool public let motion: Bool public let color: Int32? + public let bottomColor: Int32? public let intensity: Int32? public let rotation: Int32? - public init(blur: Bool = false, motion: Bool = false, color: Int32? = nil, intensity: Int32? = nil, rotation: Int32? = nil) { + public init(blur: Bool = false, motion: Bool = false, color: Int32? = nil, bottomColor: Int32? = nil, intensity: Int32? = nil, rotation: Int32? = nil) { self.blur = blur self.motion = motion self.color = color + self.bottomColor = bottomColor self.intensity = intensity self.rotation = rotation } @@ -19,6 +21,7 @@ public struct WallpaperSettings: PostboxCoding, Equatable { self.blur = decoder.decodeInt32ForKey("b", orElse: 0) != 0 self.motion = decoder.decodeInt32ForKey("m", orElse: 0) != 0 self.color = decoder.decodeOptionalInt32ForKey("c") + self.bottomColor = decoder.decodeOptionalInt32ForKey("bc") self.intensity = decoder.decodeOptionalInt32ForKey("i") self.rotation = decoder.decodeOptionalInt32ForKey("r") } @@ -31,6 +34,11 @@ public struct WallpaperSettings: PostboxCoding, Equatable { } else { encoder.encodeNil(forKey: "c") } + if let bottomColor = self.bottomColor { + encoder.encodeInt32(bottomColor, forKey: "bc") + } else { + encoder.encodeNil(forKey: "bc") + } if let intensity = self.intensity { encoder.encodeInt32(intensity, forKey: "i") } else { @@ -42,6 +50,28 @@ public struct WallpaperSettings: PostboxCoding, Equatable { encoder.encodeNil(forKey: "r") } } + + public static func ==(lhs: WallpaperSettings, rhs: WallpaperSettings) -> Bool { + if lhs.blur != rhs.blur { + return false + } + if lhs.motion != rhs.motion { + return false + } + if lhs.color != rhs.color { + return false + } + if lhs.bottomColor != rhs.bottomColor { + return false + } + if lhs.intensity != rhs.intensity { + return false + } + if lhs.rotation != rhs.rotation { + return false + } + return true + } } public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable { @@ -144,7 +174,7 @@ public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable { return false } case let .file(lhsId, _, lhsIsCreator, lhsIsDefault, lhsIsPattern, lhsIsDark, lhsSlug, lhsFile, lhsSettings): - if case let .file(rhsId, _, rhsIsCreator, rhsIsDefault, rhsIsPattern, rhsIsDark, rhsSlug, rhsFile, rhsSettings) = rhs, lhsId == rhsId, lhsIsCreator == rhsIsCreator, lhsIsDefault == rhsIsDefault, lhsIsPattern == rhsIsPattern, lhsIsDark == rhsIsDark, lhsSlug == rhsSlug, lhsFile == rhsFile, lhsSettings == rhsSettings { + if case let .file(rhsId, _, rhsIsCreator, rhsIsDefault, rhsIsPattern, rhsIsDark, rhsSlug, rhsFile, rhsSettings) = rhs, lhsId == rhsId, lhsIsCreator == rhsIsCreator, lhsIsDefault == rhsIsDefault, lhsIsPattern == rhsIsPattern, lhsIsDark == rhsIsDark, lhsSlug == rhsSlug, lhsFile.id == rhsFile.id, lhsSettings == rhsSettings { return true } else { return false diff --git a/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift b/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift index b698255fc5..6d231719cf 100644 --- a/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift +++ b/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift @@ -11,7 +11,7 @@ import AppBundle private var backgroundImageForWallpaper: (TelegramWallpaper, Bool, UIImage)? -public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper initialWallpaper: TelegramWallpaper, mediaBox: MediaBox, composed: Bool = true, knockoutMode: Bool) -> UIImage? { +public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper initialWallpaper: TelegramWallpaper, mediaBox: MediaBox, composed: Bool = true, knockoutMode: Bool, cached: Bool = true) -> UIImage? { var wallpaper = initialWallpaper if knockoutMode, let theme = theme { switch theme.name { @@ -28,9 +28,10 @@ public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper i } var backgroundImage: UIImage? - if composed && wallpaper == backgroundImageForWallpaper?.0, (wallpaper.settings?.blur ?? false) == backgroundImageForWallpaper?.1 { + if cached && composed && wallpaper == backgroundImageForWallpaper?.0, (wallpaper.settings?.blur ?? false) == backgroundImageForWallpaper?.1 { backgroundImage = backgroundImageForWallpaper?.2 } else { + var succeed = true switch wallpaper { case .builtin: if let filePath = getAppBundle().path(forResource: "ChatWallpaperBuiltin0", ofType: "jpg") { @@ -41,14 +42,18 @@ public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper i context.setFillColor(UIColor(rgb: UInt32(bitPattern: color)).withAlphaComponent(1.0).cgColor) context.fill(CGRect(origin: CGPoint(), size: size)) }) - case let .gradient(topColor, bottomColor, _): - backgroundImage = generateImage(CGSize(width: 1.0, height: 1280.0), rotatedContext: { size, context in + case let .gradient(topColor, bottomColor, settings): + backgroundImage = generateImage(CGSize(width: 640.0, height: 1280.0), rotatedContext: { size, context in let gradientColors = [UIColor(rgb: UInt32(bitPattern: topColor)).cgColor, UIColor(rgb: UInt32(bitPattern: bottomColor)).cgColor] as CFArray var locations: [CGFloat] = [0.0, 1.0] let colorSpace = CGColorSpaceCreateDeviceRGB() let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! + context.translateBy(x: 320.0, y: 640.0) + context.rotate(by: CGFloat(settings.rotation ?? 0) * CGFloat.pi / 180.0) + context.translateBy(x: -320.0, y: -640.0) + context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions()) }) case let .image(representations, settings): @@ -63,13 +68,14 @@ public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper i backgroundImage = image } if backgroundImage == nil, let path = mediaBox.completedResourcePath(largest.resource) { + succeed = false backgroundImage = UIImage(contentsOfFile: path)?.precomposed() } } case let .file(file): if file.isPattern, let color = file.settings.color, let intensity = file.settings.intensity { var image: UIImage? - let _ = mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, intensity: intensity), complete: true, fetch: true, attemptSynchronously: true).start(next: { data in + let _ = mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation), complete: true, fetch: true, attemptSynchronously: true).start(next: { data in if data.complete { image = UIImage(contentsOfFile: data.path)?.precomposed() } @@ -86,11 +92,12 @@ public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper i backgroundImage = image } if backgroundImage == nil, let path = mediaBox.completedResourcePath(file.file.resource) { + succeed = false backgroundImage = UIImage(contentsOfFile: path)?.precomposed() } } } - if let backgroundImage = backgroundImage, composed { + if let backgroundImage = backgroundImage, composed && succeed { backgroundImageForWallpaper = (wallpaper, (wallpaper.settings?.blur ?? false), backgroundImage) } } diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index 5261520510..9e62e708a8 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -190,6 +190,7 @@ public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, ac accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, + fileTitleColor: accentColor, polls: chat.message.incoming.polls.withUpdated( radioProgress: accentColor, highlight: accentColor?.withAlphaComponent(0.12), @@ -229,7 +230,7 @@ public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, ac fileTitleColor: outgoingFileTitleColor, fileDescriptionColor: outgoingFileDescriptionColor, fileDurationColor: outgoingFileDurationColor, - mediaPlaceholderColor: day ? accentColor?.withMultipliedBrightnessBy(0.95) : nil, + mediaPlaceholderColor: day ? accentColor?.withMultipliedBrightnessBy(0.95) : outgoingMediaPlaceholderColor, polls: chat.message.outgoing.polls.withUpdated(radioButton: outgoingPollsButtonColor, radioProgress: outgoingPollsProgressColor, highlight: outgoingPollsProgressColor?.withAlphaComponent(0.12), separator: outgoingPollsButtonColor, bar: outgoingPollsProgressColor), actionButtonsFillColor: chat.message.outgoing.actionButtonsFillColor.withUpdated(withWallpaper: serviceBackgroundColor), actionButtonsStrokeColor: day ? chat.message.outgoing.actionButtonsStrokeColor.withUpdated(withoutWallpaper: accentColor) : nil, diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift index c12775dcbb..eba72b32b7 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationData.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift @@ -396,8 +396,18 @@ public func serviceColor(for wallpaper: (TelegramWallpaper, UIImage?)) -> UIColo } else { return UIColor(rgb: 0x000000, alpha: 0.3) } - case .file: - if let image = wallpaper.1 { + case let .file(file): + if file.isPattern { + if let color = file.settings.color { + var mixedColor = UIColor(rgb: UInt32(bitPattern: color)) + if let bottomColor = file.settings.bottomColor { + mixedColor = mixedColor.mixedWith(UIColor(rgb: UInt32(bitPattern: bottomColor)), alpha: 0.5) + } + return serviceColor(with: mixedColor) + } else { + return UIColor(rgb: 0x000000, alpha: 0.3) + } + } else if let image = wallpaper.1 { return serviceColor(with: averageColor(from: image)) } else { return UIColor(rgb: 0x000000, alpha: 0.3) @@ -458,7 +468,11 @@ public func chatServiceBackgroundColor(wallpaper: TelegramWallpaper, mediaBox: M case let .file(file): if file.isPattern { if let color = file.settings.color { - return .single(serviceColor(with: UIColor(rgb: UInt32(bitPattern: color)))) + var mixedColor = UIColor(rgb: UInt32(bitPattern: color)) + if let bottomColor = file.settings.bottomColor { + mixedColor = mixedColor.mixedWith(UIColor(rgb: UInt32(bitPattern: bottomColor)), alpha: 0.5) + } + return .single(serviceColor(with: mixedColor)) } else { return .single(UIColor(rgb: 0x000000, alpha: 0.3)) } diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index aa9a06fb69..018ba7727d 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -2072,3130 +2072,3134 @@ public final class PresentationStrings: Equatable { public var Passport_Identity_EditIdentityCard: String { return self._s[1735]! } public var Contacts_PermissionsTitle: String { return self._s[1736]! } public var Conversation_RestrictedInline: String { return self._s[1737]! } - public var StickerPack_ViewPack: String { return self._s[1739]! } - public var Wallet_UnknownError: String { return self._s[1740]! } + public var Appearance_RemoveThemeColor: String { return self._s[1739]! } + public var StickerPack_ViewPack: String { return self._s[1740]! } + public var Wallet_UnknownError: String { return self._s[1741]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1741]!, self._r[1741]!, [_0]) + return formatWithArgumentRanges(self._s[1742]!, self._r[1742]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1743]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1746]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1748]! } - public var Channel_Info_Stickers: String { return self._s[1749]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1750]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1751]! } - public var Passport_DeletePersonalDetails: String { return self._s[1752]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1753]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1754]! } - public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1755]! } - public var Conversation_SearchNoResults: String { return self._s[1758]! } - public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1759]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1760]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1761]! } - public var Login_Code: String { return self._s[1762]! } - public var EditTheme_Create_BottomInfo: String { return self._s[1763]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1764]! } - public var Weekday_ShortThursday: String { return self._s[1765]! } - public var Resolve_ErrorNotFound: String { return self._s[1767]! } - public var LastSeen_Offline: String { return self._s[1768]! } - public var PeopleNearby_NoMembers: String { return self._s[1769]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1770]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1771]! } - public var GroupInfo_Title: String { return self._s[1773]! } - public var NotificationsSound_Note: String { return self._s[1774]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1775]! } - public var Watch_Message_Poll: String { return self._s[1776]! } - public var Privacy_Calls: String { return self._s[1777]! } + public var Compose_NewChannel: String { return self._s[1744]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1747]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1749]! } + public var Channel_Info_Stickers: String { return self._s[1750]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1751]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1752]! } + public var Passport_DeletePersonalDetails: String { return self._s[1753]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1754]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1755]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1756]! } + public var Conversation_SearchNoResults: String { return self._s[1759]! } + public var Wallet_Configuration_ApplyErrorTextURLInvalid: String { return self._s[1760]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1761]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1762]! } + public var Login_Code: String { return self._s[1763]! } + public var EditTheme_Create_BottomInfo: String { return self._s[1764]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1765]! } + public var Weekday_ShortThursday: String { return self._s[1766]! } + public var Resolve_ErrorNotFound: String { return self._s[1768]! } + public var LastSeen_Offline: String { return self._s[1769]! } + public var PeopleNearby_NoMembers: String { return self._s[1770]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1771]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1772]! } + public var GroupInfo_Title: String { return self._s[1774]! } + public var NotificationsSound_Note: String { return self._s[1775]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1776]! } + public var Watch_Message_Poll: String { return self._s[1777]! } + public var Privacy_Calls: String { return self._s[1778]! } public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1778]!, self._r[1778]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1779]!, self._r[1779]!, [_1, _2, _3]) } - public var Month_ShortAugust: String { return self._s[1779]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1780]! } - public var Notifications_Reset: String { return self._s[1781]! } - public var Conversation_Pin: String { return self._s[1782]! } - public var Passport_Language_lv: String { return self._s[1783]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1784]! } - public var BlockedUsers_Info: String { return self._s[1785]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1787]! } - public var Watch_Conversation_Unblock: String { return self._s[1789]! } + public var Month_ShortAugust: String { return self._s[1780]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1781]! } + public var Notifications_Reset: String { return self._s[1782]! } + public var Conversation_Pin: String { return self._s[1783]! } + public var Passport_Language_lv: String { return self._s[1784]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1785]! } + public var BlockedUsers_Info: String { return self._s[1786]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1788]! } + public var Watch_Conversation_Unblock: String { return self._s[1790]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1790]!, self._r[1790]!, [_0]) + return formatWithArgumentRanges(self._s[1791]!, self._r[1791]!, [_0]) } - public var CloudStorage_Title: String { return self._s[1791]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1792]! } + public var CloudStorage_Title: String { return self._s[1792]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1793]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1793]!, self._r[1793]!, [_0]) + return formatWithArgumentRanges(self._s[1794]!, self._r[1794]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1794]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1795]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1796]! } - public var Passport_Address_EditBankStatement: String { return self._s[1797]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1795]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1796]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1797]! } + public var Passport_Address_EditBankStatement: String { return self._s[1798]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1798]!, self._r[1798]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1799]!, self._r[1799]!, [_1, _2]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1799]! } - public var ShareMenu_Comment: String { return self._s[1800]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1801]! } - public var Notifications_PermissionsTitle: String { return self._s[1802]! } - public var GroupPermission_NoSendLinks: String { return self._s[1803]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1804]! } - public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1805]! } - public var Settings_Support: String { return self._s[1806]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1807]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1808]! } - public var Privacy_Forwards_Preview: String { return self._s[1809]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1810]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1811]! } - public var Common_Select: String { return self._s[1813]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1814]! } - public var WallpaperSearch_ColorGray: String { return self._s[1817]! } - public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1818]! } - public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1819]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1820]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1821]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1822]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1823]! } - public var Widget_AuthRequired: String { return self._s[1824]! } - public var Camera_FlashOn: String { return self._s[1825]! } - public var Conversation_ContextMenuLookUp: String { return self._s[1826]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1827]! } - public var Watch_Suggestion_OK: String { return self._s[1828]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1800]! } + public var ShareMenu_Comment: String { return self._s[1801]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1802]! } + public var Notifications_PermissionsTitle: String { return self._s[1803]! } + public var GroupPermission_NoSendLinks: String { return self._s[1804]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1805]! } + public var Wallet_SecureStorageChanged_ImportWallet: String { return self._s[1806]! } + public var Settings_Support: String { return self._s[1807]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1808]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1809]! } + public var Privacy_Forwards_Preview: String { return self._s[1810]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1811]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1812]! } + public var Common_Select: String { return self._s[1814]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1815]! } + public var WallpaperSearch_ColorGray: String { return self._s[1818]! } + public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[1819]! } + public var TwoFactorSetup_Hint_SkipAction: String { return self._s[1820]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1821]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1822]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1823]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1824]! } + public var Widget_AuthRequired: String { return self._s[1825]! } + public var Camera_FlashOn: String { return self._s[1826]! } + public var Conversation_ContextMenuLookUp: String { return self._s[1827]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1828]! } + public var Watch_Suggestion_OK: String { return self._s[1829]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1830]!, self._r[1830]!, [_0]) + return formatWithArgumentRanges(self._s[1831]!, self._r[1831]!, [_0]) } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1832]!, self._r[1832]!, [_0]) + return formatWithArgumentRanges(self._s[1833]!, self._r[1833]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[1833]! } - public var DialogList_AdLabel: String { return self._s[1834]! } - public var WatchRemote_NotificationText: String { return self._s[1835]! } - public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1836]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1837]! } - public var Conversation_ReportSpam: String { return self._s[1838]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1839]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1841]! } - public var PhoneLabel_Title: String { return self._s[1842]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1843]! } - public var Settings_ChangePhoneNumber: String { return self._s[1844]! } - public var Notifications_ExceptionsTitle: String { return self._s[1845]! } - public var Notifications_AlertTones: String { return self._s[1846]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1847]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1848]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1849]! } - public var VoiceOver_Chat_Photo: String { return self._s[1851]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1852]! } - public var ReportPeer_ReasonOther: String { return self._s[1853]! } - public var ChatList_Context_JoinChannel: String { return self._s[1854]! } - public var KeyCommand_ScrollDown: String { return self._s[1856]! } - public var Conversation_ScheduleMessage_Title: String { return self._s[1857]! } + public var TextFormat_Strikethrough: String { return self._s[1834]! } + public var DialogList_AdLabel: String { return self._s[1835]! } + public var WatchRemote_NotificationText: String { return self._s[1836]! } + public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1837]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1838]! } + public var Conversation_ReportSpam: String { return self._s[1839]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1840]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1842]! } + public var PhoneLabel_Title: String { return self._s[1843]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1844]! } + public var Settings_ChangePhoneNumber: String { return self._s[1845]! } + public var Notifications_ExceptionsTitle: String { return self._s[1846]! } + public var Notifications_AlertTones: String { return self._s[1847]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1848]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1849]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1850]! } + public var VoiceOver_Chat_Photo: String { return self._s[1852]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1853]! } + public var ReportPeer_ReasonOther: String { return self._s[1854]! } + public var ChatList_Context_JoinChannel: String { return self._s[1855]! } + public var KeyCommand_ScrollDown: String { return self._s[1857]! } + public var Conversation_ScheduleMessage_Title: String { return self._s[1858]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1858]!, self._r[1858]!, [_0]) + return formatWithArgumentRanges(self._s[1859]!, self._r[1859]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1859]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1860]! } - public var AuthSessions_LogOut: String { return self._s[1861]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1862]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1863]! } - public var Passport_Phone_Title: String { return self._s[1864]! } - public var ContactList_Context_StartSecretChat: String { return self._s[1865]! } - public var Settings_PhoneNumber: String { return self._s[1866]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1860]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1861]! } + public var AuthSessions_LogOut: String { return self._s[1862]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1863]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1864]! } + public var Passport_Phone_Title: String { return self._s[1865]! } + public var ContactList_Context_StartSecretChat: String { return self._s[1866]! } + public var Settings_PhoneNumber: String { return self._s[1867]! } public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1867]!, self._r[1867]!, [_0]) + return formatWithArgumentRanges(self._s[1868]!, self._r[1868]!, [_0]) } - public var NotificationsSound_Alert: String { return self._s[1869]! } - public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1870]! } - public var WebSearch_SearchNoResults: String { return self._s[1871]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1873]! } - public var Wallet_Configuration_SourceInfo: String { return self._s[1874]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1875]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1876]! } - public var PhotoEditor_CurvesTool: String { return self._s[1877]! } - public var Checkout_PaymentMethod: String { return self._s[1879]! } + public var NotificationsSound_Alert: String { return self._s[1870]! } + public var Wallet_SecureStorageChanged_CreateWallet: String { return self._s[1871]! } + public var WebSearch_SearchNoResults: String { return self._s[1872]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1874]! } + public var Wallet_Configuration_SourceInfo: String { return self._s[1875]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1876]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1877]! } + public var PhotoEditor_CurvesTool: String { return self._s[1878]! } + public var Checkout_PaymentMethod: String { return self._s[1880]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1880]!, self._r[1880]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1881]!, self._r[1881]!, [_1, _2]) } - public var Contacts_AccessDeniedError: String { return self._s[1881]! } - public var Camera_PhotoMode: String { return self._s[1884]! } - public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1885]! } - public var Appearance_TextSize_Apply: String { return self._s[1886]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1888]! } - public var CallSettings_OnMobile: String { return self._s[1889]! } - public var Tour_Text2: String { return self._s[1890]! } + public var Contacts_AccessDeniedError: String { return self._s[1882]! } + public var Camera_PhotoMode: String { return self._s[1885]! } + public var EditTheme_Expand_Preview_IncomingText: String { return self._s[1886]! } + public var Appearance_TextSize_Apply: String { return self._s[1887]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1889]! } + public var CallSettings_OnMobile: String { return self._s[1890]! } + public var Tour_Text2: String { return self._s[1891]! } public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1891]!, self._r[1891]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1892]!, self._r[1892]!, [_1, _2]) } - public var DialogList_EncryptionProcessing: String { return self._s[1893]! } - public var Permissions_Skip: String { return self._s[1894]! } - public var Wallet_Words_NotDoneOk: String { return self._s[1895]! } - public var SecretImage_Title: String { return self._s[1896]! } - public var Watch_MessageView_Title: String { return self._s[1897]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1898]! } - public var AttachmentMenu_Poll: String { return self._s[1899]! } + public var DialogList_EncryptionProcessing: String { return self._s[1894]! } + public var Permissions_Skip: String { return self._s[1895]! } + public var Wallet_Words_NotDoneOk: String { return self._s[1896]! } + public var SecretImage_Title: String { return self._s[1897]! } + public var Watch_MessageView_Title: String { return self._s[1898]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1899]! } + public var AttachmentMenu_Poll: String { return self._s[1900]! } public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1900]!, self._r[1900]!, [_0]) + return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_0]) } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1902]!, self._r[1902]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1902]! } - public var WallpaperPreview_Title: String { return self._s[1903]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1904]! } - public var Settings_ProxyConnecting: String { return self._s[1905]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1907]! } - public var VoiceOver_Chat_YourVideo: String { return self._s[1908]! } - public var Wallet_Intro_Title: String { return self._s[1909]! } - public var TwoFactorSetup_Password_Action: String { return self._s[1910]! } - public var Profile_MessageLifetime5s: String { return self._s[1911]! } - public var Username_InvalidCharacters: String { return self._s[1912]! } - public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1913]! } - public var ScheduledMessages_ClearAll: String { return self._s[1914]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1915]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1916]! } - public var Settings_AddAccount: String { return self._s[1917]! } - public var Notification_CreatedChannel: String { return self._s[1920]! } + public var Notification_CallCanceled: String { return self._s[1903]! } + public var WallpaperPreview_Title: String { return self._s[1904]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1905]! } + public var Settings_ProxyConnecting: String { return self._s[1906]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1908]! } + public var VoiceOver_Chat_YourVideo: String { return self._s[1909]! } + public var Wallet_Intro_Title: String { return self._s[1910]! } + public var TwoFactorSetup_Password_Action: String { return self._s[1911]! } + public var Profile_MessageLifetime5s: String { return self._s[1912]! } + public var Username_InvalidCharacters: String { return self._s[1913]! } + public var VoiceOver_Media_PlaybackRateFast: String { return self._s[1914]! } + public var ScheduledMessages_ClearAll: String { return self._s[1915]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1916]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1917]! } + public var Settings_AddAccount: String { return self._s[1918]! } + public var Notification_CreatedChannel: String { return self._s[1921]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1921]!, self._r[1921]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1922]!, self._r[1922]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1923]! } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1924]! } - public var VoiceOver_Media_PlaybackStop: String { return self._s[1925]! } - public var Contacts_TopSection: String { return self._s[1926]! } - public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1927]! } + public var Passcode_AppLockedAlert: String { return self._s[1924]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1925]! } + public var VoiceOver_Media_PlaybackStop: String { return self._s[1926]! } + public var Contacts_TopSection: String { return self._s[1927]! } + public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[1928]! } public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1928]!, self._r[1928]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1929]!, self._r[1929]!, [_0, _1]) } - public var Wallet_Info_Receive: String { return self._s[1929]! } - public var Wallet_Completed_ViewWallet: String { return self._s[1930]! } + public var Wallet_Info_Receive: String { return self._s[1930]! } + public var Wallet_Completed_ViewWallet: String { return self._s[1931]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1931]!, self._r[1931]!, [_0]) + return formatWithArgumentRanges(self._s[1932]!, self._r[1932]!, [_0]) } - public var ReportPeer_ReasonSpam: String { return self._s[1932]! } - public var UserInfo_TapToCall: String { return self._s[1933]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1935]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1936]! } - public var Common_Search: String { return self._s[1937]! } - public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1938]! } + public var ReportPeer_ReasonSpam: String { return self._s[1933]! } + public var UserInfo_TapToCall: String { return self._s[1934]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1936]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1937]! } + public var Common_Search: String { return self._s[1938]! } + public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1939]! } public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1939]!, self._r[1939]!, [_0]) + return formatWithArgumentRanges(self._s[1940]!, self._r[1940]!, [_0]) } - public var Wallet_Month_ShortJuly: String { return self._s[1940]! } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1942]! } - public var Message_InvoiceLabel: String { return self._s[1943]! } - public var Conversation_InputTextPlaceholder: String { return self._s[1944]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1945]! } + public var Wallet_Month_ShortJuly: String { return self._s[1941]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1943]! } + public var Message_InvoiceLabel: String { return self._s[1944]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1945]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1946]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1946]!, self._r[1946]!, [_0]) + return formatWithArgumentRanges(self._s[1947]!, self._r[1947]!, [_0]) } - public var IntentsSettings_Reset: String { return self._s[1947]! } - public var Conversation_Info: String { return self._s[1948]! } - public var Login_InfoDeletePhoto: String { return self._s[1949]! } - public var Passport_Language_vi: String { return self._s[1951]! } - public var UserInfo_ScamUserWarning: String { return self._s[1952]! } - public var Conversation_Search: String { return self._s[1953]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1955]! } - public var ReportPeer_ReasonPornography: String { return self._s[1956]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1957]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1958]! } - public var Map_LiveLocationGroupDescription: String { return self._s[1959]! } - public var Channel_Setup_TypeHeader: String { return self._s[1960]! } - public var AuthSessions_LoggedIn: String { return self._s[1961]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1962]! } - public var Login_SmsRequestState3: String { return self._s[1963]! } - public var Passport_Address_EditUtilityBill: String { return self._s[1964]! } - public var Appearance_ReduceMotionInfo: String { return self._s[1965]! } - public var Join_ChannelsTooMuch: String { return self._s[1966]! } - public var Channel_Edit_LinkItem: String { return self._s[1967]! } - public var Privacy_Calls_P2PNever: String { return self._s[1968]! } - public var Conversation_AddToReadingList: String { return self._s[1970]! } - public var Share_MultipleMessagesDisabled: String { return self._s[1971]! } - public var Message_Animation: String { return self._s[1972]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[1973]! } - public var Map_Unknown: String { return self._s[1974]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[1975]! } + public var IntentsSettings_Reset: String { return self._s[1948]! } + public var Conversation_Info: String { return self._s[1949]! } + public var Login_InfoDeletePhoto: String { return self._s[1950]! } + public var Passport_Language_vi: String { return self._s[1952]! } + public var UserInfo_ScamUserWarning: String { return self._s[1953]! } + public var Conversation_Search: String { return self._s[1954]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1956]! } + public var ReportPeer_ReasonPornography: String { return self._s[1957]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[1958]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1959]! } + public var Map_LiveLocationGroupDescription: String { return self._s[1960]! } + public var Channel_Setup_TypeHeader: String { return self._s[1961]! } + public var AuthSessions_LoggedIn: String { return self._s[1962]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1963]! } + public var Login_SmsRequestState3: String { return self._s[1964]! } + public var Passport_Address_EditUtilityBill: String { return self._s[1965]! } + public var Appearance_ReduceMotionInfo: String { return self._s[1966]! } + public var Join_ChannelsTooMuch: String { return self._s[1967]! } + public var Channel_Edit_LinkItem: String { return self._s[1968]! } + public var Privacy_Calls_P2PNever: String { return self._s[1969]! } + public var Conversation_AddToReadingList: String { return self._s[1971]! } + public var Share_MultipleMessagesDisabled: String { return self._s[1972]! } + public var Message_Animation: String { return self._s[1973]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[1974]! } + public var Map_Unknown: String { return self._s[1975]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[1976]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1976]!, self._r[1976]!, [_1, _2]) - } - public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1977]!, self._r[1977]!, [_1, _2]) } - public var Call_StatusRequesting: String { return self._s[1978]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[1979]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1980]! } + public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1978]!, self._r[1978]!, [_1, _2]) + } + public var Call_StatusRequesting: String { return self._s[1979]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[1980]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1981]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1981]!, self._r[1981]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1982]!, self._r[1982]!, [_1, _2]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1982]!, self._r[1982]!, [_0]) + return formatWithArgumentRanges(self._s[1983]!, self._r[1983]!, [_0]) } - public var Update_Skip: String { return self._s[1983]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1984]! } - public var Message_PinnedPollMessage: String { return self._s[1985]! } - public var BlockedUsers_Title: String { return self._s[1986]! } + public var Update_Skip: String { return self._s[1984]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1985]! } + public var Message_PinnedPollMessage: String { return self._s[1986]! } + public var BlockedUsers_Title: String { return self._s[1987]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1987]!, self._r[1987]!, [_1]) + return formatWithArgumentRanges(self._s[1988]!, self._r[1988]!, [_1]) } - public var Username_CheckingUsername: String { return self._s[1988]! } - public var NotificationsSound_Bell: String { return self._s[1989]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[1990]! } - public var Weekday_Monday: String { return self._s[1991]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1992]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1993]! } - public var ChatSettings_Groups: String { return self._s[1994]! } + public var Username_CheckingUsername: String { return self._s[1989]! } + public var NotificationsSound_Bell: String { return self._s[1990]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[1991]! } + public var Weekday_Monday: String { return self._s[1992]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1993]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1994]! } + public var ChatSettings_Groups: String { return self._s[1995]! } + public var WallpaperPreview_PatternPaternDiscard: String { return self._s[1996]! } public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1995]!, self._r[1995]!, [_0]) + return formatWithArgumentRanges(self._s[1997]!, self._r[1997]!, [_0]) } - public var Your_card_was_declined: String { return self._s[1996]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1998]! } - public var Wallet_Month_ShortApril: String { return self._s[1999]! } - public var ChatList_Unmute: String { return self._s[2000]! } - public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2001]! } - public var PhotoEditor_CurvesAll: String { return self._s[2002]! } - public var Weekday_ShortTuesday: String { return self._s[2003]! } - public var DialogList_Read: String { return self._s[2004]! } - public var Appearance_AppIconClassic: String { return self._s[2005]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2006]! } - public var Passport_Identity_Gender: String { return self._s[2007]! } + public var Your_card_was_declined: String { return self._s[1998]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[2000]! } + public var Wallet_Month_ShortApril: String { return self._s[2001]! } + public var ChatList_Unmute: String { return self._s[2002]! } + public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2003]! } + public var PhotoEditor_CurvesAll: String { return self._s[2004]! } + public var Weekday_ShortTuesday: String { return self._s[2005]! } + public var DialogList_Read: String { return self._s[2006]! } + public var Appearance_AppIconClassic: String { return self._s[2007]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[2008]! } + public var Passport_Identity_Gender: String { return self._s[2009]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2008]!, self._r[2008]!, [_0]) + return formatWithArgumentRanges(self._s[2010]!, self._r[2010]!, [_0]) } - public var Target_SelectGroup: String { return self._s[2009]! } - public var Map_HomeAndWorkInfo: String { return self._s[2011]! } + public var Target_SelectGroup: String { return self._s[2011]! } + public var Map_HomeAndWorkInfo: String { return self._s[2013]! } public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2012]!, self._r[2012]!, [_0]) + return formatWithArgumentRanges(self._s[2014]!, self._r[2014]!, [_0]) } - public var Passport_Language_en: String { return self._s[2013]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2014]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2015]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[2016]! } - public var ScheduledMessages_SendNow: String { return self._s[2017]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[2019]! } - public var Login_InfoHelp: String { return self._s[2020]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2021]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2022]! } + public var Passport_Language_en: String { return self._s[2015]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[2016]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[2017]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[2018]! } + public var ScheduledMessages_SendNow: String { return self._s[2019]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[2021]! } + public var Login_InfoHelp: String { return self._s[2022]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2023]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2024]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2023]!, self._r[2023]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2025]!, self._r[2025]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[2026]! } - public var CreatePoll_Title: String { return self._s[2027]! } - public var Conversation_ViewTheme: String { return self._s[2028]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2029]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2030]! } - public var TwoFactorSetup_Intro_Text: String { return self._s[2031]! } - public var UserInfo_GroupsInCommon: String { return self._s[2032]! } - public var TelegramWallet_Intro_TermsUrl: String { return self._s[2033]! } - public var Call_AudioRouteHide: String { return self._s[2034]! } + public var SocksProxySetup_AddProxy: String { return self._s[2028]! } + public var CreatePoll_Title: String { return self._s[2029]! } + public var Conversation_ViewTheme: String { return self._s[2030]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2031]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2032]! } + public var TwoFactorSetup_Intro_Text: String { return self._s[2033]! } + public var UserInfo_GroupsInCommon: String { return self._s[2034]! } + public var TelegramWallet_Intro_TermsUrl: String { return self._s[2035]! } + public var Call_AudioRouteHide: String { return self._s[2036]! } public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2036]!, self._r[2036]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2038]!, self._r[2038]!, [_1, _2]) } - public var ContactInfo_PhoneLabelMobile: String { return self._s[2037]! } - public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2038]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[2039]! } + public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2040]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2039]!, self._r[2039]!, [_0]) + return formatWithArgumentRanges(self._s[2041]!, self._r[2041]!, [_0]) } - public var TextFormat_Bold: String { return self._s[2040]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[2041]! } - public var Notifications_Title: String { return self._s[2042]! } - public var Group_Username_InvalidTooShort: String { return self._s[2043]! } - public var Channel_ErrorAddTooMuch: String { return self._s[2044]! } + public var TextFormat_Bold: String { return self._s[2042]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[2043]! } + public var Notifications_Title: String { return self._s[2044]! } + public var Group_Username_InvalidTooShort: String { return self._s[2045]! } + public var Channel_ErrorAddTooMuch: String { return self._s[2046]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2045]!, self._r[2045]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2047]!, self._r[2047]!, ["\(_0)"]) } - public var VoiceOver_DiscardPreparedContent: String { return self._s[2047]! } - public var Stickers_SuggestAdded: String { return self._s[2048]! } - public var Login_CountryCode: String { return self._s[2049]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[2050]! } - public var Map_GetDirections: String { return self._s[2051]! } - public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2052]! } - public var Login_PhoneFloodError: String { return self._s[2053]! } + public var VoiceOver_DiscardPreparedContent: String { return self._s[2049]! } + public var Stickers_SuggestAdded: String { return self._s[2050]! } + public var Login_CountryCode: String { return self._s[2051]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[2052]! } + public var Map_GetDirections: String { return self._s[2053]! } + public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2054]! } + public var Login_PhoneFloodError: String { return self._s[2055]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2054]!, self._r[2054]!, [_0]) + return formatWithArgumentRanges(self._s[2056]!, self._r[2056]!, [_0]) } public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2055]!, self._r[2055]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2057]!, self._r[2057]!, [_1, _2, _3]) } - public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2056]! } - public var Settings_SetUsername: String { return self._s[2058]! } - public var Group_Location_ChangeLocation: String { return self._s[2059]! } - public var Notification_GroupInviterSelf: String { return self._s[2060]! } - public var InstantPage_TapToOpenLink: String { return self._s[2061]! } + public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2058]! } + public var Settings_SetUsername: String { return self._s[2060]! } + public var Group_Location_ChangeLocation: String { return self._s[2061]! } + public var Notification_GroupInviterSelf: String { return self._s[2062]! } + public var InstantPage_TapToOpenLink: String { return self._s[2063]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2062]!, self._r[2062]!, [_0]) + return formatWithArgumentRanges(self._s[2064]!, self._r[2064]!, [_0]) } - public var Watch_Suggestion_TalkLater: String { return self._s[2063]! } - public var SecretChat_Title: String { return self._s[2064]! } - public var Group_UpgradeNoticeText1: String { return self._s[2065]! } - public var AuthSessions_Title: String { return self._s[2066]! } + public var Watch_Suggestion_TalkLater: String { return self._s[2065]! } + public var SecretChat_Title: String { return self._s[2066]! } + public var Group_UpgradeNoticeText1: String { return self._s[2067]! } + public var AuthSessions_Title: String { return self._s[2068]! } public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2067]!, self._r[2067]!, [_0]) + return formatWithArgumentRanges(self._s[2069]!, self._r[2069]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[2068]! } - public var Channel_About_Title: String { return self._s[2069]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[2070]! } + public var PhotoEditor_CropAuto: String { return self._s[2070]! } + public var Channel_About_Title: String { return self._s[2071]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[2072]! } public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2072]!, self._r[2072]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2074]!, self._r[2074]!, ["\(_0)"]) } - public var VoiceOver_MessageContextReport: String { return self._s[2073]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2075]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[2076]! } + public var VoiceOver_MessageContextReport: String { return self._s[2075]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2077]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[2078]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2077]!, self._r[2077]!, [_1]) + return formatWithArgumentRanges(self._s[2079]!, self._r[2079]!, [_1]) } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2079]!, self._r[2079]!, [_0]) + return formatWithArgumentRanges(self._s[2081]!, self._r[2081]!, [_0]) } public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2080]!, self._r[2080]!, [_0]) + return formatWithArgumentRanges(self._s[2082]!, self._r[2082]!, [_0]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[2081]! } - public var Presence_online: String { return self._s[2084]! } - public var PasscodeSettings_Title: String { return self._s[2085]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2086]! } - public var Web_OpenExternal: String { return self._s[2087]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[2089]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2090]! } - public var LocalGroup_Title: String { return self._s[2091]! } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[2083]! } + public var Presence_online: String { return self._s[2086]! } + public var PasscodeSettings_Title: String { return self._s[2087]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2088]! } + public var Web_OpenExternal: String { return self._s[2089]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[2091]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2092]! } + public var LocalGroup_Title: String { return self._s[2093]! } public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2092]!, self._r[2092]!, [_0]) + return formatWithArgumentRanges(self._s[2094]!, self._r[2094]!, [_0]) } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2093]! } - public var Map_YouAreHere: String { return self._s[2094]! } + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2095]! } + public var Map_YouAreHere: String { return self._s[2096]! } public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2095]!, self._r[2095]!, [_0]) + return formatWithArgumentRanges(self._s[2097]!, self._r[2097]!, [_0]) } public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2096]!, self._r[2096]!, [_0]) + return formatWithArgumentRanges(self._s[2098]!, self._r[2098]!, [_0]) } - public var Theme_Context_ChangeColors: String { return self._s[2097]! } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2098]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2099]! } + public var Theme_Context_ChangeColors: String { return self._s[2099]! } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2100]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2101]! } public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2100]!, self._r[2100]!, [_0]) + return formatWithArgumentRanges(self._s[2102]!, self._r[2102]!, [_0]) } public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2101]!, self._r[2101]!, [_0]) + return formatWithArgumentRanges(self._s[2103]!, self._r[2103]!, [_0]) } - public var SocksProxySetup_Username: String { return self._s[2102]! } - public var Bot_Start: String { return self._s[2103]! } + public var SocksProxySetup_Username: String { return self._s[2104]! } + public var Bot_Start: String { return self._s[2105]! } public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2104]!, self._r[2104]!, [_0]) + return formatWithArgumentRanges(self._s[2106]!, self._r[2106]!, [_0]) } public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2105]!, self._r[2105]!, [_0]) + return formatWithArgumentRanges(self._s[2107]!, self._r[2107]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[2106]! } - public var AccentColor_Title: String { return self._s[2108]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2109]! } + public var Contacts_SortByPresence: String { return self._s[2108]! } + public var AccentColor_Title: String { return self._s[2110]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2111]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2110]!, self._r[2110]!, [_1, _2]) - } - public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2111]!, self._r[2111]!, [_0]) - } - public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2112]!, self._r[2112]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[2113]! } - public var Login_InfoAvatarPhoto: String { return self._s[2114]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2115]! } - public var Tour_Title4: String { return self._s[2116]! } - public var Passport_Identity_Translation: String { return self._s[2117]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2118]! } - public var Login_TermsOfServiceLabel: String { return self._s[2120]! } - public var Passport_Language_it: String { return self._s[2121]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2122]! } - public var Passport_Identity_SelfieHelp: String { return self._s[2123]! } - public var Conversation_ClearAll: String { return self._s[2125]! } - public var Wallet_Send_UninitializedText: String { return self._s[2127]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[2128]! } - public var TwoStepAuth_FloodError: String { return self._s[2129]! } + public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2113]!, self._r[2113]!, [_0]) + } + public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2114]!, self._r[2114]!, [_1, _2]) + } + public var Passport_Email_EnterOtherEmail: String { return self._s[2115]! } + public var Login_InfoAvatarPhoto: String { return self._s[2116]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2117]! } + public var Tour_Title4: String { return self._s[2118]! } + public var Passport_Identity_Translation: String { return self._s[2119]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2120]! } + public var Login_TermsOfServiceLabel: String { return self._s[2122]! } + public var Passport_Language_it: String { return self._s[2123]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2124]! } + public var Passport_Identity_SelfieHelp: String { return self._s[2125]! } + public var Conversation_ClearAll: String { return self._s[2127]! } + public var Wallet_Send_UninitializedText: String { return self._s[2129]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[2130]! } + public var TwoStepAuth_FloodError: String { return self._s[2131]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_1]) + return formatWithArgumentRanges(self._s[2132]!, self._r[2132]!, [_1]) } - public var Paint_Delete: String { return self._s[2131]! } + public var Paint_Delete: String { return self._s[2133]! } public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2132]!, self._r[2132]!, [_0]) + return formatWithArgumentRanges(self._s[2134]!, self._r[2134]!, [_0]) } - public var Privacy_AddNewPeer: String { return self._s[2133]! } + public var Privacy_AddNewPeer: String { return self._s[2135]! } public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2134]!, self._r[2134]!, [_1]) + return formatWithArgumentRanges(self._s[2136]!, self._r[2136]!, [_1]) } - public var LogoutOptions_SetPasscodeText: String { return self._s[2135]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[2137]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2136]!, self._r[2136]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2138]!, self._r[2138]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[2137]! } + public var Message_PinnedAudioMessage: String { return self._s[2139]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2138]!, self._r[2138]!, [_0]) + return formatWithArgumentRanges(self._s[2140]!, self._r[2140]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[2139]! } - public var Notifications_GroupNotificationsSound: String { return self._s[2140]! } - public var Wallet_Month_GenNovember: String { return self._s[2141]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[2142]! } - public var Conversation_MessageEditedLabel: String { return self._s[2143]! } + public var Notification_Mute1hMin: String { return self._s[2141]! } + public var Notifications_GroupNotificationsSound: String { return self._s[2142]! } + public var Wallet_Month_GenNovember: String { return self._s[2143]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[2144]! } + public var Conversation_MessageEditedLabel: String { return self._s[2145]! } public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2144]!, self._r[2144]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2146]!, self._r[2146]!, [_0, _1]) } - public var Notification_Exceptions_AlwaysOff: String { return self._s[2145]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2146]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[2147]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2148]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2147]!, self._r[2147]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[2149]!, self._r[2149]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[2148]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[2150]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2149]!, self._r[2149]!, [_1]) + return formatWithArgumentRanges(self._s[2151]!, self._r[2151]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[2150]! } - public var Month_GenOctober: String { return self._s[2151]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2152]! } - public var EnterPasscode_EnterPasscode: String { return self._s[2153]! } - public var MediaPicker_TimerTooltip: String { return self._s[2155]! } - public var SharedMedia_TitleAll: String { return self._s[2156]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2159]! } - public var Conversation_RestrictedMedia: String { return self._s[2160]! } - public var AccessDenied_PhotosRestricted: String { return self._s[2161]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[2163]! } - public var ChangePhoneNumberCode_Called: String { return self._s[2164]! } + public var AccessDenied_LocationTracking: String { return self._s[2152]! } + public var Month_GenOctober: String { return self._s[2153]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2154]! } + public var EnterPasscode_EnterPasscode: String { return self._s[2155]! } + public var MediaPicker_TimerTooltip: String { return self._s[2157]! } + public var SharedMedia_TitleAll: String { return self._s[2158]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2161]! } + public var Conversation_RestrictedMedia: String { return self._s[2162]! } + public var AccessDenied_PhotosRestricted: String { return self._s[2163]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[2165]! } + public var ChangePhoneNumberCode_Called: String { return self._s[2166]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2165]!, self._r[2165]!, [_0]) + return formatWithArgumentRanges(self._s[2167]!, self._r[2167]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[2168]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[2170]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2171]! } + public var Conversation_SavedMessages: String { return self._s[2170]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[2172]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2173]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2173]!, self._r[2173]!, [_0]) - } - public var VoiceOver_Chat_YourMessage: String { return self._s[2174]! } - public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2175]!, self._r[2175]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[2176]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2177]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[2176]! } + public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2177]!, self._r[2177]!, [_0]) + } + public var ReportPeer_AlertSuccess: String { return self._s[2178]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2179]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2178]!, self._r[2178]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2180]!, self._r[2180]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[2179]! } - public var PhotoEditor_FadeTool: String { return self._s[2180]! } - public var Privacy_ContactsReset: String { return self._s[2181]! } + public var Checkout_PasswordEntry_Title: String { return self._s[2181]! } + public var PhotoEditor_FadeTool: String { return self._s[2182]! } + public var Privacy_ContactsReset: String { return self._s[2183]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2183]!, self._r[2183]!, [_0]) + return formatWithArgumentRanges(self._s[2185]!, self._r[2185]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[2184]! } - public var ChatList_Mute: String { return self._s[2185]! } + public var Message_PinnedVideoMessage: String { return self._s[2186]! } + public var ChatList_Mute: String { return self._s[2187]! } public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2186]!, self._r[2186]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2188]!, self._r[2188]!, [_1, _2, _3]) } - public var Permissions_CellularDataText_v0: String { return self._s[2187]! } - public var ShareMenu_SelectChats: String { return self._s[2190]! } - public var ChatList_Context_Unarchive: String { return self._s[2191]! } - public var MusicPlayer_VoiceNote: String { return self._s[2192]! } - public var Conversation_RestrictedText: String { return self._s[2193]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2194]! } - public var Wallet_Month_GenApril: String { return self._s[2195]! } - public var Wallet_Month_ShortMarch: String { return self._s[2196]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[2197]! } - public var Cache_Videos: String { return self._s[2198]! } - public var PrivacySettings_PhoneNumber: String { return self._s[2199]! } - public var Wallet_Month_GenFebruary: String { return self._s[2200]! } - public var FeatureDisabled_Oops: String { return self._s[2202]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[2203]! } + public var Permissions_CellularDataText_v0: String { return self._s[2189]! } + public var ShareMenu_SelectChats: String { return self._s[2192]! } + public var ChatList_Context_Unarchive: String { return self._s[2193]! } + public var MusicPlayer_VoiceNote: String { return self._s[2194]! } + public var Conversation_RestrictedText: String { return self._s[2195]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2196]! } + public var Wallet_Month_GenApril: String { return self._s[2197]! } + public var Wallet_Month_ShortMarch: String { return self._s[2198]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[2199]! } + public var Cache_Videos: String { return self._s[2200]! } + public var PrivacySettings_PhoneNumber: String { return self._s[2201]! } + public var Wallet_Month_GenFebruary: String { return self._s[2202]! } + public var FeatureDisabled_Oops: String { return self._s[2204]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[2205]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2204]!, self._r[2204]!, [_0]) + return formatWithArgumentRanges(self._s[2206]!, self._r[2206]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[2205]! } - public var GroupPermission_NoSendPolls: String { return self._s[2206]! } - public var Wallet_Qr_ScanCode: String { return self._s[2207]! } - public var Message_VideoExpired: String { return self._s[2209]! } - public var Notifications_Badge: String { return self._s[2210]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[2211]! } - public var Wallet_Receive_AddressCopied: String { return self._s[2212]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[2213]! } - public var Username_InvalidTooShort: String { return self._s[2214]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2215]! } - public var Channel_AdminLog_PinMessages: String { return self._s[2216]! } - public var ArchivedChats_IntroTitle3: String { return self._s[2217]! } + public var Stickers_GroupStickersHelp: String { return self._s[2207]! } + public var GroupPermission_NoSendPolls: String { return self._s[2208]! } + public var Wallet_Qr_ScanCode: String { return self._s[2209]! } + public var Message_VideoExpired: String { return self._s[2211]! } + public var Notifications_Badge: String { return self._s[2212]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[2213]! } + public var Wallet_Receive_AddressCopied: String { return self._s[2214]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[2215]! } + public var Username_InvalidTooShort: String { return self._s[2216]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2217]! } + public var Channel_AdminLog_PinMessages: String { return self._s[2218]! } + public var ArchivedChats_IntroTitle3: String { return self._s[2219]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_1]) + return formatWithArgumentRanges(self._s[2220]!, self._r[2220]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[2219]! } - public var Conversation_DefaultRestrictedText: String { return self._s[2220]! } - public var SharedMedia_CategoryDocs: String { return self._s[2223]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[2221]! } + public var Conversation_DefaultRestrictedText: String { return self._s[2222]! } + public var SharedMedia_CategoryDocs: String { return self._s[2225]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2224]!, self._r[2224]!, [_1]) + return formatWithArgumentRanges(self._s[2226]!, self._r[2226]!, [_1]) } - public var Wallet_Send_UninitializedTitle: String { return self._s[2225]! } - public var Privacy_Forwards_NeverLink: String { return self._s[2227]! } + public var Wallet_Send_UninitializedTitle: String { return self._s[2227]! } + public var Privacy_Forwards_NeverLink: String { return self._s[2229]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2228]!, self._r[2228]!, [_1]) + return formatWithArgumentRanges(self._s[2230]!, self._r[2230]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2229]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2231]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2230]!, self._r[2230]!, [_0]) + return formatWithArgumentRanges(self._s[2232]!, self._r[2232]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[2231]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2232]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[2233]! } - public var Channel_UpdatePhotoItem: String { return self._s[2234]! } - public var GroupInfo_LeftStatus: String { return self._s[2235]! } - public var Watch_MessageView_Forward: String { return self._s[2237]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[2238]! } - public var Cache_ClearEmpty: String { return self._s[2240]! } - public var Localization_LanguageName: String { return self._s[2241]! } - public var Wallet_AccessDenied_Title: String { return self._s[2242]! } - public var WebSearch_GIFs: String { return self._s[2243]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2244]! } - public var Wallet_AccessDenied_Settings: String { return self._s[2245]! } - public var Username_InvalidStartsWithNumber: String { return self._s[2246]! } - public var Common_Back: String { return self._s[2247]! } - public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2248]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2249]! } - public var Wallet_Send_Send: String { return self._s[2250]! } + public var ChatSettings_PrivateChats: String { return self._s[2233]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2234]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[2235]! } + public var Channel_UpdatePhotoItem: String { return self._s[2236]! } + public var GroupInfo_LeftStatus: String { return self._s[2237]! } + public var Watch_MessageView_Forward: String { return self._s[2239]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[2240]! } + public var Cache_ClearEmpty: String { return self._s[2242]! } + public var Localization_LanguageName: String { return self._s[2243]! } + public var Wallet_AccessDenied_Title: String { return self._s[2244]! } + public var WebSearch_GIFs: String { return self._s[2245]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2246]! } + public var Wallet_AccessDenied_Settings: String { return self._s[2247]! } + public var Username_InvalidStartsWithNumber: String { return self._s[2248]! } + public var Common_Back: String { return self._s[2249]! } + public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2250]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2251]! } + public var Wallet_Send_Send: String { return self._s[2252]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2252]!, self._r[2252]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2254]!, self._r[2254]!, [_1, _2]) } - public var Wallet_Info_RefreshErrorTitle: String { return self._s[2253]! } - public var Wallet_Month_GenJune: String { return self._s[2254]! } - public var Passport_Email_Help: String { return self._s[2255]! } - public var Watch_Conversation_Reply: String { return self._s[2257]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[2260]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2261]! } - public var Channel_BanUser_Unban: String { return self._s[2263]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2264]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2265]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2267]! } - public var Wallet_Send_AddressHeader: String { return self._s[2268]! } - public var Passport_Identity_Name: String { return self._s[2269]! } + public var Wallet_Info_RefreshErrorTitle: String { return self._s[2255]! } + public var Wallet_Month_GenJune: String { return self._s[2256]! } + public var Passport_Email_Help: String { return self._s[2257]! } + public var Watch_Conversation_Reply: String { return self._s[2259]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[2262]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2263]! } + public var Channel_BanUser_Unban: String { return self._s[2265]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2266]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2267]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2269]! } + public var Wallet_Send_AddressHeader: String { return self._s[2270]! } + public var Passport_Identity_Name: String { return self._s[2271]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2270]!, self._r[2270]!, [_0]) + return formatWithArgumentRanges(self._s[2272]!, self._r[2272]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[2271]! } - public var Conversation_BlockUser: String { return self._s[2272]! } - public var Month_GenJanuary: String { return self._s[2273]! } - public var ChatSettings_TextSize: String { return self._s[2274]! } - public var Notification_PassportValuePhone: String { return self._s[2275]! } - public var MediaPlayer_UnknownArtist: String { return self._s[2276]! } - public var Passport_Language_ne: String { return self._s[2277]! } - public var Notification_CallBack: String { return self._s[2278]! } - public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2279]! } - public var TwoStepAuth_EmailHelp: String { return self._s[2280]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[2273]! } + public var Conversation_BlockUser: String { return self._s[2274]! } + public var Month_GenJanuary: String { return self._s[2275]! } + public var ChatSettings_TextSize: String { return self._s[2276]! } + public var Notification_PassportValuePhone: String { return self._s[2277]! } + public var MediaPlayer_UnknownArtist: String { return self._s[2278]! } + public var Passport_Language_ne: String { return self._s[2279]! } + public var Notification_CallBack: String { return self._s[2280]! } + public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2281]! } + public var TwoStepAuth_EmailHelp: String { return self._s[2282]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2281]!, self._r[2281]!, [_0]) + return formatWithArgumentRanges(self._s[2283]!, self._r[2283]!, [_0]) } - public var Channel_Info_Management: String { return self._s[2282]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[2283]! } - public var Stickers_FrequentlyUsed: String { return self._s[2284]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2285]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2287]! } + public var Channel_Info_Management: String { return self._s[2284]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[2285]! } + public var Stickers_FrequentlyUsed: String { return self._s[2286]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2287]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2289]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2288]!, self._r[2288]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2290]!, self._r[2290]!, [_1, "\(_2)"]) } - public var TwoFactorSetup_Password_Title: String { return self._s[2289]! } - public var Passport_Address_EditResidentialAddress: String { return self._s[2290]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[2291]! } - public var CreatePoll_TextHeader: String { return self._s[2292]! } + public var TwoFactorSetup_Password_Title: String { return self._s[2291]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[2292]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[2293]! } + public var CreatePoll_TextHeader: String { return self._s[2294]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2293]!, self._r[2293]!, [_0]) + return formatWithArgumentRanges(self._s[2295]!, self._r[2295]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[2294]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2295]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[2297]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[2298]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[2299]! } + public var PhotoEditor_QualityMedium: String { return self._s[2296]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2297]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[2299]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[2300]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[2301]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2300]!, self._r[2300]!, [_0]) + return formatWithArgumentRanges(self._s[2302]!, self._r[2302]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2301]!, self._r[2301]!, [_1]) + return formatWithArgumentRanges(self._s[2303]!, self._r[2303]!, [_1]) } - public var LogoutOptions_LogOutWalletInfo: String { return self._s[2302]! } - public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2303]! } - public var Conversation_LinkDialogOpen: String { return self._s[2305]! } - public var TwoFactorSetup_Hint_Title: String { return self._s[2306]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[2307]! } - public var Settings_Username: String { return self._s[2309]! } - public var Conversation_Block: String { return self._s[2311]! } - public var Wallpaper_Wallpaper: String { return self._s[2312]! } - public var SocksProxySetup_UseProxy: String { return self._s[2314]! } - public var Wallet_Send_Confirmation: String { return self._s[2315]! } - public var EditTheme_UploadEditedTheme: String { return self._s[2316]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[2317]! } - public var MessageTimer_Forever: String { return self._s[2318]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[2319]! } - public var PhotoEditor_DiscardChanges: String { return self._s[2320]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2321]! } - public var Passport_Language_da: String { return self._s[2322]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[2323]! } + public var LogoutOptions_LogOutWalletInfo: String { return self._s[2304]! } + public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2305]! } + public var Conversation_LinkDialogOpen: String { return self._s[2307]! } + public var TwoFactorSetup_Hint_Title: String { return self._s[2308]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[2309]! } + public var Settings_Username: String { return self._s[2311]! } + public var Conversation_Block: String { return self._s[2313]! } + public var Wallpaper_Wallpaper: String { return self._s[2314]! } + public var SocksProxySetup_UseProxy: String { return self._s[2316]! } + public var Wallet_Send_Confirmation: String { return self._s[2317]! } + public var EditTheme_UploadEditedTheme: String { return self._s[2318]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[2319]! } + public var MessageTimer_Forever: String { return self._s[2320]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[2321]! } + public var PhotoEditor_DiscardChanges: String { return self._s[2322]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2323]! } + public var Passport_Language_da: String { return self._s[2324]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[2325]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2324]!, self._r[2324]!, [_0]) + return formatWithArgumentRanges(self._s[2326]!, self._r[2326]!, [_0]) } - public var Passport_Address_EditPassportRegistration: String { return self._s[2325]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[2327]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2327]!, self._r[2327]!, [_0]) + return formatWithArgumentRanges(self._s[2329]!, self._r[2329]!, [_0]) } - public var Settings_AddDevice: String { return self._s[2328]! } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2330]! } - public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2331]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2332]! } - public var Conversation_PinnedPoll: String { return self._s[2333]! } - public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2334]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2335]! } - public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2336]! } + public var Settings_AddDevice: String { return self._s[2330]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2332]! } + public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2333]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2334]! } + public var Conversation_PinnedPoll: String { return self._s[2335]! } + public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2336]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2337]! } + public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2338]! } public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2337]!, self._r[2337]!, [_1]) + return formatWithArgumentRanges(self._s[2339]!, self._r[2339]!, [_1]) } - public var WallpaperSearch_ColorPurple: String { return self._s[2338]! } - public var Cache_ByPeerHeader: String { return self._s[2339]! } + public var WallpaperSearch_ColorPurple: String { return self._s[2340]! } + public var Cache_ByPeerHeader: String { return self._s[2341]! } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2340]!, self._r[2340]!, [_0]) + return formatWithArgumentRanges(self._s[2342]!, self._r[2342]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[2341]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2344]! } - public var Wallet_Completed_Title: String { return self._s[2345]! } - public var Notification_PinnedMessage: String { return self._s[2346]! } - public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2347]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2349]! } - public var Contacts_SortBy: String { return self._s[2350]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2343]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2346]! } + public var Wallet_Completed_Title: String { return self._s[2347]! } + public var Notification_PinnedMessage: String { return self._s[2348]! } + public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2349]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2351]! } + public var Contacts_SortBy: String { return self._s[2352]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2351]!, self._r[2351]!, [_1]) + return formatWithArgumentRanges(self._s[2353]!, self._r[2353]!, [_1]) } - public var Appearance_ColorThemeNight: String { return self._s[2353]! } + public var Appearance_ColorThemeNight: String { return self._s[2355]! } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2354]!, self._r[2354]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2356]!, self._r[2356]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[2355]! } - public var Watch_UserInfo_Service: String { return self._s[2356]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2358]! } - public var Conversation_Unpin: String { return self._s[2360]! } - public var CancelResetAccount_Title: String { return self._s[2361]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2362]! } + public var Call_EncryptionKey_Title: String { return self._s[2357]! } + public var Watch_UserInfo_Service: String { return self._s[2358]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2360]! } + public var Conversation_Unpin: String { return self._s[2362]! } + public var CancelResetAccount_Title: String { return self._s[2363]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2364]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2364]!, self._r[2364]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2366]!, self._r[2366]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2365]! } - public var CallSettings_Title: String { return self._s[2366]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2367]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2369]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2370]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2367]! } + public var CallSettings_Title: String { return self._s[2368]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2369]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2371]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2372]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2371]!, self._r[2371]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2373]!, self._r[2373]!, [_1, _2]) } - public var Passport_Identity_DocumentDetails: String { return self._s[2372]! } - public var LoginPassword_PasswordHelp: String { return self._s[2373]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2374]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2375]! } - public var Checkout_TotalPaidAmount: String { return self._s[2376]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2374]! } + public var LoginPassword_PasswordHelp: String { return self._s[2375]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2376]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2377]! } + public var Checkout_TotalPaidAmount: String { return self._s[2378]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2377]!, self._r[2377]!, [_0]) + return formatWithArgumentRanges(self._s[2379]!, self._r[2379]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[2378]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2380]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2381]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2380]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2382]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2383]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2382]!, self._r[2382]!, [_1]) + return formatWithArgumentRanges(self._s[2384]!, self._r[2384]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2383]! } - public var Contacts_InviteFriends: String { return self._s[2385]! } - public var Map_ChooseLocationTitle: String { return self._s[2386]! } - public var Conversation_StopPoll: String { return self._s[2388]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2385]! } + public var Contacts_InviteFriends: String { return self._s[2387]! } + public var Map_ChooseLocationTitle: String { return self._s[2388]! } + public var Conversation_StopPoll: String { return self._s[2390]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2389]!, self._r[2389]!, [_0]) + return formatWithArgumentRanges(self._s[2391]!, self._r[2391]!, [_0]) } - public var Call_Camera: String { return self._s[2390]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2391]! } - public var AppWallet_Intro_Text: String { return self._s[2392]! } - public var Calls_RatingFeedback: String { return self._s[2393]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2394]! } - public var Wallet_Alert_OK: String { return self._s[2395]! } - public var NotificationsSound_Pulse: String { return self._s[2396]! } - public var Watch_LastSeen_Lately: String { return self._s[2397]! } - public var ReportGroupLocation_Report: String { return self._s[2400]! } - public var Widget_NoUsers: String { return self._s[2401]! } - public var Conversation_UnvotePoll: String { return self._s[2402]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2404]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2405]! } - public var NotificationsSound_Circles: String { return self._s[2406]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2409]! } - public var Wallet_Settings_DeleteWallet: String { return self._s[2410]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2411]! } - public var Proxy_TooltipUnavailable: String { return self._s[2412]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2414]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2416]! } - public var Conversation_FileDropbox: String { return self._s[2417]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2418]! } - public var Tour_Text3: String { return self._s[2420]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2422]! } - public var GroupPermission_NoSendMessages: String { return self._s[2423]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2424]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2425]! } + public var Call_Camera: String { return self._s[2392]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2393]! } + public var AppWallet_Intro_Text: String { return self._s[2394]! } + public var Calls_RatingFeedback: String { return self._s[2395]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2396]! } + public var Wallet_Alert_OK: String { return self._s[2397]! } + public var NotificationsSound_Pulse: String { return self._s[2398]! } + public var Watch_LastSeen_Lately: String { return self._s[2399]! } + public var ReportGroupLocation_Report: String { return self._s[2402]! } + public var Widget_NoUsers: String { return self._s[2403]! } + public var Conversation_UnvotePoll: String { return self._s[2404]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2406]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2407]! } + public var NotificationsSound_Circles: String { return self._s[2408]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2411]! } + public var Wallet_Settings_DeleteWallet: String { return self._s[2412]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2413]! } + public var Proxy_TooltipUnavailable: String { return self._s[2414]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2416]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2418]! } + public var Conversation_FileDropbox: String { return self._s[2419]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2420]! } + public var Tour_Text3: String { return self._s[2422]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2424]! } + public var GroupPermission_NoSendMessages: String { return self._s[2425]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2426]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2427]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2427]!, self._r[2427]!, [_0]) + return formatWithArgumentRanges(self._s[2429]!, self._r[2429]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2428]! } - public var Checkout_ShippingOption_Title: String { return self._s[2429]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2430]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2430]! } + public var Checkout_ShippingOption_Title: String { return self._s[2431]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2432]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2431]!, self._r[2431]!, [_0]) + return formatWithArgumentRanges(self._s[2433]!, self._r[2433]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2432]!, self._r[2432]!, [_0]) + return formatWithArgumentRanges(self._s[2434]!, self._r[2434]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2433]! } - public var EditTheme_FileReadError: String { return self._s[2434]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2435]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2436]! } - public var AutoDownloadSettings_Photos: String { return self._s[2438]! } - public var Appearance_PreviewIncomingText: String { return self._s[2439]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[2440]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2441]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2442]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2443]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2444]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2445]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2446]! } - public var Notification_SecretChatScreenshot: String { return self._s[2447]! } - public var AccessDenied_Wallpapers: String { return self._s[2448]! } - public var ChatList_Context_Mute: String { return self._s[2450]! } - public var Passport_Address_City: String { return self._s[2451]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2452]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2453]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2454]! } - public var AccessDenied_LocationDisabled: String { return self._s[2455]! } - public var Group_Location_Title: String { return self._s[2456]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2458]! } - public var GroupInfo_Sound: String { return self._s[2459]! } - public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2460]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2461]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2462]! } - public var Contacts_Title: String { return self._s[2463]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[2464]! } - public var Passport_Language_fr: String { return self._s[2465]! } - public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2466]! } - public var Notifications_ResetAllNotifications: String { return self._s[2467]! } - public var IntentsSettings_SuggestedChats: String { return self._s[2469]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2471]! } - public var Checkout_NewCard_Title: String { return self._s[2472]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2473]! } - public var Conversation_ForwardChats: String { return self._s[2474]! } - public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2476]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2477]! } - public var Settings_FAQ: String { return self._s[2479]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2480]! } - public var Conversation_ContextMenuForward: String { return self._s[2481]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2484]! } - public var PrivacyPolicy_Title: String { return self._s[2487]! } - public var Notifications_TextTone: String { return self._s[2488]! } - public var Profile_CreateNewContact: String { return self._s[2489]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2490]! } - public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2492]! } - public var Call_Speaker: String { return self._s[2493]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2494]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2496]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2497]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2435]! } + public var EditTheme_FileReadError: String { return self._s[2436]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2437]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2438]! } + public var AutoDownloadSettings_Photos: String { return self._s[2440]! } + public var Appearance_PreviewIncomingText: String { return self._s[2441]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[2442]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2443]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2444]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2445]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2446]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2447]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2448]! } + public var Notification_SecretChatScreenshot: String { return self._s[2449]! } + public var AccessDenied_Wallpapers: String { return self._s[2450]! } + public var ChatList_Context_Mute: String { return self._s[2452]! } + public var Passport_Address_City: String { return self._s[2453]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2454]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2455]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2456]! } + public var AccessDenied_LocationDisabled: String { return self._s[2457]! } + public var Group_Location_Title: String { return self._s[2458]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2460]! } + public var GroupInfo_Sound: String { return self._s[2461]! } + public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2462]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2463]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2464]! } + public var Contacts_Title: String { return self._s[2465]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2466]! } + public var Passport_Language_fr: String { return self._s[2467]! } + public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2468]! } + public var Notifications_ResetAllNotifications: String { return self._s[2469]! } + public var IntentsSettings_SuggestedChats: String { return self._s[2471]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2473]! } + public var Checkout_NewCard_Title: String { return self._s[2474]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2475]! } + public var Conversation_ForwardChats: String { return self._s[2476]! } + public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2478]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2479]! } + public var Settings_FAQ: String { return self._s[2481]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2482]! } + public var Conversation_ContextMenuForward: String { return self._s[2483]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2486]! } + public var PrivacyPolicy_Title: String { return self._s[2489]! } + public var Notifications_TextTone: String { return self._s[2490]! } + public var Profile_CreateNewContact: String { return self._s[2491]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2492]! } + public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2494]! } + public var Call_Speaker: String { return self._s[2495]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2496]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2498]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2499]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2498]!, self._r[2498]!, [_0]) + return formatWithArgumentRanges(self._s[2500]!, self._r[2500]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2499]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2500]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2501]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2502]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2503]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2504]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2505]! } - public var Bot_Unblock: String { return self._s[2506]! } - public var TextFormat_Italic: String { return self._s[2507]! } - public var WallpaperSearch_ColorPink: String { return self._s[2508]! } - public var Settings_About_Help: String { return self._s[2509]! } - public var SearchImages_Title: String { return self._s[2510]! } - public var Weekday_Wednesday: String { return self._s[2511]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2512]! } - public var ExplicitContent_AlertTitle: String { return self._s[2513]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2501]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2502]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2503]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2504]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2505]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2506]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2507]! } + public var Bot_Unblock: String { return self._s[2508]! } + public var TextFormat_Italic: String { return self._s[2509]! } + public var WallpaperSearch_ColorPink: String { return self._s[2510]! } + public var Settings_About_Help: String { return self._s[2511]! } + public var SearchImages_Title: String { return self._s[2512]! } + public var Weekday_Wednesday: String { return self._s[2513]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2514]! } + public var ExplicitContent_AlertTitle: String { return self._s[2515]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2514]!, self._r[2514]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2516]!, self._r[2516]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2515]! } - public var Weekday_Thursday: String { return self._s[2516]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2517]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2518]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2517]! } + public var Weekday_Thursday: String { return self._s[2518]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2519]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2520]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2519]!, self._r[2519]!, [_0]) + return formatWithArgumentRanges(self._s[2521]!, self._r[2521]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2520]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2521]! } - public var Passport_RequestedInformation: String { return self._s[2522]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2523]! } - public var Conversation_EncryptionProcessing: String { return self._s[2525]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2526]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2528]! } - public var Channel_Setup_Title: String { return self._s[2529]! } - public var Conversation_SearchPlaceholder: String { return self._s[2530]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2531]! } - public var Checkout_ErrorGeneric: String { return self._s[2532]! } - public var Passport_Language_hu: String { return self._s[2533]! } - public var GroupPermission_EditingDisabled: String { return self._s[2534]! } - public var Wallet_Month_ShortSeptember: String { return self._s[2536]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2522]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2523]! } + public var Passport_RequestedInformation: String { return self._s[2524]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2525]! } + public var Conversation_EncryptionProcessing: String { return self._s[2527]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2528]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2530]! } + public var Channel_Setup_Title: String { return self._s[2531]! } + public var Conversation_SearchPlaceholder: String { return self._s[2532]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2533]! } + public var Checkout_ErrorGeneric: String { return self._s[2534]! } + public var Passport_Language_hu: String { return self._s[2535]! } + public var GroupPermission_EditingDisabled: String { return self._s[2536]! } + public var Wallet_Month_ShortSeptember: String { return self._s[2538]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2537]!, self._r[2537]!, [_0]) + return formatWithArgumentRanges(self._s[2539]!, self._r[2539]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2540]!, self._r[2540]!, [_1]) + return formatWithArgumentRanges(self._s[2542]!, self._r[2542]!, [_1]) } - public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2541]! } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2543]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2542]!, self._r[2542]!, [_0]) + return formatWithArgumentRanges(self._s[2544]!, self._r[2544]!, [_0]) } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2543]! } - public var Group_Location_Info: String { return self._s[2544]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2545]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2546]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2545]! } + public var Group_Location_Info: String { return self._s[2546]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2547]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2548]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2547]!, self._r[2547]!, [_0]) + return formatWithArgumentRanges(self._s[2549]!, self._r[2549]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2548]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2549]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2550]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2551]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2550]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2551]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2552]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2553]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2552]!, self._r[2552]!, [_0]) + return formatWithArgumentRanges(self._s[2554]!, self._r[2554]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2553]! } - public var Message_PinnedAnimationMessage: String { return self._s[2555]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2557]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2558]! } - public var Wallet_Info_TransactionTo: String { return self._s[2560]! } - public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2561]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2562]! } - public var Embed_PlayingInPIP: String { return self._s[2563]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2564]! } + public var Passport_Language_cs: String { return self._s[2555]! } + public var Message_PinnedAnimationMessage: String { return self._s[2557]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2559]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2560]! } + public var Wallet_Info_TransactionTo: String { return self._s[2562]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2563]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2564]! } + public var Embed_PlayingInPIP: String { return self._s[2565]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2566]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2565]!, self._r[2565]!, [_0]) + return formatWithArgumentRanges(self._s[2567]!, self._r[2567]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2566]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2568]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2567]!, self._r[2567]!, [_1]) + return formatWithArgumentRanges(self._s[2569]!, self._r[2569]!, [_1]) } - public var Notification_PaymentSent: String { return self._s[2568]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2569]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2570]! } - public var AutoNightTheme_System: String { return self._s[2571]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2572]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2573]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2574]! } + public var Notification_PaymentSent: String { return self._s[2570]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2571]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2572]! } + public var AutoNightTheme_System: String { return self._s[2573]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2574]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2575]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2576]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2577]!, self._r[2577]!, [_1]) - } - public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2578]!, self._r[2578]!, [_1]) - } - public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2579]!, self._r[2579]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2581]! } - public var PasscodeSettings_HelpTop: String { return self._s[2582]! } - public var Conversation_WalletRequiredTitle: String { return self._s[2583]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2584]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2585]! } - public var EditTheme_ShortLink: String { return self._s[2586]! } - public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2587]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2588]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2589]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2590]! } - public var Call_Accept: String { return self._s[2592]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2593]! } - public var Month_GenMarch: String { return self._s[2595]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2596]! } - public var LoginPassword_Title: String { return self._s[2597]! } - public var Call_End: String { return self._s[2598]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2599]! } - public var VoiceOver_Chat_Contact: String { return self._s[2600]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2601]! } - public var CallSettings_Always: String { return self._s[2602]! } - public var CallFeedback_Success: String { return self._s[2603]! } - public var TwoStepAuth_SetupHint: String { return self._s[2604]! } + public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2580]!, self._r[2580]!, [_1]) + } + public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2581]!, self._r[2581]!, [_1]) + } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2583]! } + public var PasscodeSettings_HelpTop: String { return self._s[2584]! } + public var Conversation_WalletRequiredTitle: String { return self._s[2585]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2586]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2587]! } + public var EditTheme_ShortLink: String { return self._s[2588]! } + public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2589]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2590]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2591]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2592]! } + public var Call_Accept: String { return self._s[2594]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2595]! } + public var Month_GenMarch: String { return self._s[2597]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2598]! } + public var LoginPassword_Title: String { return self._s[2599]! } + public var Call_End: String { return self._s[2600]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2601]! } + public var VoiceOver_Chat_Contact: String { return self._s[2602]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2603]! } + public var CallSettings_Always: String { return self._s[2604]! } + public var CallFeedback_Success: String { return self._s[2605]! } + public var TwoStepAuth_SetupHint: String { return self._s[2606]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2605]!, self._r[2605]!, [_1]) + return formatWithArgumentRanges(self._s[2607]!, self._r[2607]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2606]! } - public var Login_PhoneTitle: String { return self._s[2607]! } - public var Passport_FieldPhoneHelp: String { return self._s[2608]! } - public var Weekday_ShortSunday: String { return self._s[2609]! } - public var Passport_InfoFAQ_URL: String { return self._s[2610]! } - public var ContactInfo_Job: String { return self._s[2612]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2613]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2614]! } - public var TwoFactorSetup_Email_Text: String { return self._s[2615]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2616]! } - public var Invite_ChannelsTooMuch: String { return self._s[2617]! } - public var Wallet_Send_ConfirmationConfirm: String { return self._s[2618]! } - public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2619]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2620]! } - public var Wallet_Receive_AmountText: String { return self._s[2621]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2622]! } - public var CallFeedback_ReasonNoise: String { return self._s[2623]! } - public var Appearance_AppIconDefault: String { return self._s[2625]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2626]! } - public var MediaPicker_AddCaption: String { return self._s[2627]! } - public var CallSettings_TabIconDescription: String { return self._s[2628]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2608]! } + public var Login_PhoneTitle: String { return self._s[2609]! } + public var Passport_FieldPhoneHelp: String { return self._s[2610]! } + public var Weekday_ShortSunday: String { return self._s[2611]! } + public var Passport_InfoFAQ_URL: String { return self._s[2612]! } + public var ContactInfo_Job: String { return self._s[2614]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2615]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2616]! } + public var TwoFactorSetup_Email_Text: String { return self._s[2617]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2618]! } + public var Invite_ChannelsTooMuch: String { return self._s[2619]! } + public var Wallet_Send_ConfirmationConfirm: String { return self._s[2620]! } + public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2621]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2622]! } + public var Wallet_Receive_AmountText: String { return self._s[2623]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2624]! } + public var CallFeedback_ReasonNoise: String { return self._s[2625]! } + public var Appearance_AppIconDefault: String { return self._s[2627]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2628]! } + public var MediaPicker_AddCaption: String { return self._s[2629]! } + public var CallSettings_TabIconDescription: String { return self._s[2630]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_0]) - } - public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2630]! } - public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2631]!, self._r[2631]!, [_0]) } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2632]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2633]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2634]! } - public var DialogList_SearchSectionRecent: String { return self._s[2635]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2636]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2639]! } - public var LastSeen_WithinAWeek: String { return self._s[2640]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2641]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2643]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2644]! } + public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2632]! } + public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2633]!, self._r[2633]!, [_0]) + } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2634]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2635]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2636]! } + public var DialogList_SearchSectionRecent: String { return self._s[2637]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2638]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2641]! } + public var LastSeen_WithinAWeek: String { return self._s[2642]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2643]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2645]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2646]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2645]!, self._r[2645]!, [_0]) + return formatWithArgumentRanges(self._s[2647]!, self._r[2647]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2646]! } - public var Conversation_StatusLeftGroup: String { return self._s[2647]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2648]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2650]! } - public var GroupPermission_AddSuccess: String { return self._s[2651]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2653]! } - public var Conversation_ContextMenuCopy: String { return self._s[2654]! } - public var AccessDenied_CallMicrophone: String { return self._s[2655]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2648]! } + public var Conversation_StatusLeftGroup: String { return self._s[2649]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2650]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2652]! } + public var GroupPermission_AddSuccess: String { return self._s[2653]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2655]! } + public var Conversation_ContextMenuCopy: String { return self._s[2656]! } + public var AccessDenied_CallMicrophone: String { return self._s[2657]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2656]!, self._r[2656]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2658]!, self._r[2658]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2657]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2658]! } - public var Checkout_PaymentMethod_New: String { return self._s[2659]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2660]! } - public var PhotoEditor_QualityTool: String { return self._s[2661]! } - public var Login_SendCodeViaSms: String { return self._s[2662]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2663]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2664]! } - public var Wallet_Receive_CopyAddress: String { return self._s[2665]! } - public var Login_EmailNotConfiguredError: String { return self._s[2666]! } - public var SocksProxySetup_Status: String { return self._s[2667]! } - public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2668]! } - public var PrivacyPolicy_Accept: String { return self._s[2669]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2670]! } - public var Appearance_AppIconClassicX: String { return self._s[2671]! } + public var Login_InvalidFirstNameError: String { return self._s[2659]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2660]! } + public var Checkout_PaymentMethod_New: String { return self._s[2661]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2662]! } + public var PhotoEditor_QualityTool: String { return self._s[2663]! } + public var Login_SendCodeViaSms: String { return self._s[2664]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2665]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2666]! } + public var Wallet_Receive_CopyAddress: String { return self._s[2667]! } + public var Login_EmailNotConfiguredError: String { return self._s[2668]! } + public var SocksProxySetup_Status: String { return self._s[2669]! } + public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2670]! } + public var PrivacyPolicy_Accept: String { return self._s[2671]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2672]! } + public var Appearance_AppIconClassicX: String { return self._s[2673]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2672]!, self._r[2672]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2674]!, self._r[2674]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2673]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2675]! } - public var AutoNightTheme_Automatic: String { return self._s[2676]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2677]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2678]! } - public var Cache_Help: String { return self._s[2679]! } - public var Group_ErrorAccessDenied: String { return self._s[2680]! } - public var Passport_Language_fa: String { return self._s[2681]! } - public var Wallet_Intro_Text: String { return self._s[2682]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2683]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2684]! } - public var PrivacySettings_LastSeen: String { return self._s[2685]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2675]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2677]! } + public var AutoNightTheme_Automatic: String { return self._s[2678]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2679]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2680]! } + public var Cache_Help: String { return self._s[2681]! } + public var Group_ErrorAccessDenied: String { return self._s[2682]! } + public var Passport_Language_fa: String { return self._s[2683]! } + public var Wallet_Intro_Text: String { return self._s[2684]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2685]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2686]! } + public var PrivacySettings_LastSeen: String { return self._s[2687]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2686]!, self._r[2686]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2688]!, self._r[2688]!, [_0, _1]) } - public var Wallet_Configuration_Apply: String { return self._s[2690]! } - public var Preview_SaveGif: String { return self._s[2691]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2692]! } - public var Profile_About: String { return self._s[2693]! } - public var Channel_About_Placeholder: String { return self._s[2694]! } - public var Login_InfoTitle: String { return self._s[2695]! } + public var Wallet_Configuration_Apply: String { return self._s[2692]! } + public var Preview_SaveGif: String { return self._s[2693]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2694]! } + public var Profile_About: String { return self._s[2695]! } + public var Channel_About_Placeholder: String { return self._s[2696]! } + public var Login_InfoTitle: String { return self._s[2697]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2696]!, self._r[2696]!, [_0]) + return formatWithArgumentRanges(self._s[2698]!, self._r[2698]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2697]! } - public var Watch_Suggestion_CantTalk: String { return self._s[2699]! } - public var ContactInfo_Title: String { return self._s[2700]! } - public var Media_ShareThisVideo: String { return self._s[2701]! } - public var Weekday_ShortFriday: String { return self._s[2702]! } - public var AccessDenied_Contacts: String { return self._s[2704]! } - public var Notification_CallIncomingShort: String { return self._s[2705]! } - public var Group_Setup_TypePublic: String { return self._s[2706]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2707]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2708]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2711]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2712]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2713]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2714]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2715]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2699]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2701]! } + public var ContactInfo_Title: String { return self._s[2702]! } + public var Media_ShareThisVideo: String { return self._s[2703]! } + public var Weekday_ShortFriday: String { return self._s[2704]! } + public var AccessDenied_Contacts: String { return self._s[2706]! } + public var Notification_CallIncomingShort: String { return self._s[2707]! } + public var Group_Setup_TypePublic: String { return self._s[2708]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2709]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2710]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2713]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2714]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2715]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2716]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2717]! } public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2716]!, self._r[2716]!, [_0]) + return formatWithArgumentRanges(self._s[2718]!, self._r[2718]!, [_0]) } - public var DialogList_Typing: String { return self._s[2717]! } - public var CallFeedback_IncludeLogs: String { return self._s[2719]! } - public var Checkout_Phone: String { return self._s[2721]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2724]! } - public var Privacy_Calls_Integration: String { return self._s[2725]! } - public var Notifications_PermissionsAllow: String { return self._s[2726]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2730]! } - public var Settings_ChatSettings: String { return self._s[2731]! } - public var Conversation_SendingOptionsTooltip: String { return self._s[2732]! } + public var DialogList_Typing: String { return self._s[2719]! } + public var CallFeedback_IncludeLogs: String { return self._s[2721]! } + public var Checkout_Phone: String { return self._s[2723]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2726]! } + public var Privacy_Calls_Integration: String { return self._s[2727]! } + public var Notifications_PermissionsAllow: String { return self._s[2728]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2732]! } + public var Settings_ChatSettings: String { return self._s[2733]! } + public var Conversation_SendingOptionsTooltip: String { return self._s[2734]! } public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2734]!, self._r[2734]!, [_0]) + return formatWithArgumentRanges(self._s[2736]!, self._r[2736]!, [_0]) } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2735]!, self._r[2735]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2737]!, self._r[2737]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2737]! } + public var GroupRemoved_DeleteUser: String { return self._s[2739]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2738]!, self._r[2738]!, [_0]) + return formatWithArgumentRanges(self._s[2740]!, self._r[2740]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2739]!, self._r[2739]!, [_1]) + return formatWithArgumentRanges(self._s[2741]!, self._r[2741]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2740]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2741]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2743]! } - public var Conversation_Unblock: String { return self._s[2744]! } - public var PrivacySettings_DataSettings: String { return self._s[2745]! } - public var Group_PublicLink_Info: String { return self._s[2746]! } + public var Login_ContinueWithLocalization: String { return self._s[2742]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2743]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2745]! } + public var Conversation_Unblock: String { return self._s[2746]! } + public var PrivacySettings_DataSettings: String { return self._s[2747]! } + public var WallpaperPreview_PatternPaternApply: String { return self._s[2748]! } + public var Group_PublicLink_Info: String { return self._s[2749]! } public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2747]!, self._r[2747]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2750]!, self._r[2750]!, [_1, _2, _3]) } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2748]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2751]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2749]!, self._r[2749]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2752]!, self._r[2752]!, [_0, _1]) } - public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2751]! } - public var PrivacySettings_Passcode: String { return self._s[2753]! } - public var Call_Mute: String { return self._s[2754]! } - public var Wallet_Weekday_Yesterday: String { return self._s[2755]! } - public var Passport_Language_dz: String { return self._s[2756]! } - public var Wallet_Receive_AmountHeader: String { return self._s[2757]! } - public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2758]! } - public var Passport_Language_tk: String { return self._s[2759]! } + public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2754]! } + public var PrivacySettings_Passcode: String { return self._s[2756]! } + public var Call_Mute: String { return self._s[2757]! } + public var Wallet_Weekday_Yesterday: String { return self._s[2758]! } + public var Passport_Language_dz: String { return self._s[2759]! } + public var Wallet_Receive_AmountHeader: String { return self._s[2760]! } + public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2761]! } + public var Passport_Language_tk: String { return self._s[2762]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2760]!, self._r[2760]!, [_0]) + return formatWithArgumentRanges(self._s[2763]!, self._r[2763]!, [_0]) } - public var Settings_Search: String { return self._s[2761]! } - public var Wallet_Month_ShortFebruary: String { return self._s[2762]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2763]! } - public var Wallet_Configuration_SourceJSON: String { return self._s[2764]! } - public var Conversation_ContextMenuReply: String { return self._s[2765]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2766]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2767]! } - public var Tour_Title1: String { return self._s[2768]! } - public var Wallet_Alert_Cancel: String { return self._s[2769]! } - public var Conversation_ClearGroupHistory: String { return self._s[2771]! } - public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2772]! } - public var WallpaperPreview_Motion: String { return self._s[2773]! } + public var Settings_Search: String { return self._s[2764]! } + public var Wallet_Month_ShortFebruary: String { return self._s[2765]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2766]! } + public var Wallet_Configuration_SourceJSON: String { return self._s[2767]! } + public var Conversation_ContextMenuReply: String { return self._s[2768]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2769]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2770]! } + public var Tour_Title1: String { return self._s[2771]! } + public var Wallet_Alert_Cancel: String { return self._s[2772]! } + public var Conversation_ClearGroupHistory: String { return self._s[2774]! } + public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2775]! } + public var WallpaperPreview_Motion: String { return self._s[2776]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2774]!, self._r[2774]!, [_0]) + return formatWithArgumentRanges(self._s[2777]!, self._r[2777]!, [_0]) } - public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2775]! } - public var Call_RateCall: String { return self._s[2776]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2777]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2778]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2779]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2781]! } + public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2778]! } + public var Call_RateCall: String { return self._s[2779]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2780]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2781]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2782]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2784]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2783]!, self._r[2783]!, [_0]) + return formatWithArgumentRanges(self._s[2786]!, self._r[2786]!, [_0]) } - public var Compose_Create: String { return self._s[2784]! } - public var Contacts_InviteToTelegram: String { return self._s[2785]! } - public var GroupInfo_Notifications: String { return self._s[2786]! } - public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2788]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2789]! } - public var Month_GenApril: String { return self._s[2790]! } - public var Appearance_AutoNightTheme: String { return self._s[2791]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2793]! } - public var Login_CodeSentSms: String { return self._s[2795]! } + public var Compose_Create: String { return self._s[2787]! } + public var Contacts_InviteToTelegram: String { return self._s[2788]! } + public var GroupInfo_Notifications: String { return self._s[2789]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2791]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2792]! } + public var Month_GenApril: String { return self._s[2793]! } + public var Appearance_AutoNightTheme: String { return self._s[2794]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2796]! } + public var Login_CodeSentSms: String { return self._s[2798]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2796]!, self._r[2796]!, [_0]) + return formatWithArgumentRanges(self._s[2799]!, self._r[2799]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2797]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2798]! } - public var Passport_Language_hr: String { return self._s[2799]! } - public var Common_ActionNotAllowedError: String { return self._s[2800]! } + public var EmptyGroupInfo_Line3: String { return self._s[2800]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2801]! } + public var Passport_Language_hr: String { return self._s[2802]! } + public var Common_ActionNotAllowedError: String { return self._s[2803]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2801]!, self._r[2801]!, [_0]) + return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2802]! } - public var Wallet_Info_TransactionFrom: String { return self._s[2803]! } - public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2804]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2805]! } - public var Privacy_SecretChatsTitle: String { return self._s[2806]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2808]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2809]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2810]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2811]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2812]! } - public var Preview_DeleteGif: String { return self._s[2813]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2814]! } - public var Group_ErrorNotMutualContact: String { return self._s[2815]! } - public var Notification_MessageLifetime5s: String { return self._s[2816]! } - public var Wallet_Send_OwnAddressAlertText: String { return self._s[2817]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2805]! } + public var Wallet_Info_TransactionFrom: String { return self._s[2806]! } + public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2807]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2808]! } + public var Privacy_SecretChatsTitle: String { return self._s[2809]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2811]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2812]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2813]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2814]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2815]! } + public var Preview_DeleteGif: String { return self._s[2816]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2817]! } + public var Group_ErrorNotMutualContact: String { return self._s[2818]! } + public var Notification_MessageLifetime5s: String { return self._s[2819]! } + public var Wallet_Send_OwnAddressAlertText: String { return self._s[2820]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2818]!, self._r[2818]!, [_0]) + return formatWithArgumentRanges(self._s[2821]!, self._r[2821]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2819]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2821]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2822]! } - public var Passport_Address_AddBankStatement: String { return self._s[2823]! } - public var Notification_CallIncoming: String { return self._s[2824]! } - public var Wallet_Words_NotDoneTitle: String { return self._s[2825]! } - public var Compose_NewGroupTitle: String { return self._s[2826]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2828]! } - public var Passport_Address_Postcode: String { return self._s[2830]! } + public var VoiceOver_Chat_Video: String { return self._s[2822]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2824]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2825]! } + public var Passport_Address_AddBankStatement: String { return self._s[2826]! } + public var Notification_CallIncoming: String { return self._s[2827]! } + public var Wallet_Words_NotDoneTitle: String { return self._s[2828]! } + public var Compose_NewGroupTitle: String { return self._s[2829]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2831]! } + public var Passport_Address_Postcode: String { return self._s[2833]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2831]!, self._r[2831]!, [_0]) + return formatWithArgumentRanges(self._s[2834]!, self._r[2834]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2832]! } - public var Wallet_Month_ShortOctober: String { return self._s[2833]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2834]! } - public var WallpaperColors_Title: String { return self._s[2835]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2836]! } - public var VoiceOver_MessageContextForward: String { return self._s[2837]! } - public var GroupPermission_Duration: String { return self._s[2838]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2835]! } + public var Wallet_Month_ShortOctober: String { return self._s[2836]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2837]! } + public var WallpaperColors_Title: String { return self._s[2838]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2839]! } + public var VoiceOver_MessageContextForward: String { return self._s[2840]! } + public var GroupPermission_Duration: String { return self._s[2841]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2839]!, self._r[2839]!, [_0]) + return formatWithArgumentRanges(self._s[2842]!, self._r[2842]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2840]! } - public var Username_Placeholder: String { return self._s[2841]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2842]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2843]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2844]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2843]! } + public var Username_Placeholder: String { return self._s[2844]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2845]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2846]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2847]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2846]!, self._r[2846]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2849]!, self._r[2849]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2847]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2848]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2849]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2850]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2851]! } - public var Conversation_ContextMenuMore: String { return self._s[2852]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2853]! } - public var CallSettings_TabIcon: String { return self._s[2854]! } - public var KeyCommand_Find: String { return self._s[2855]! } - public var ClearCache_FreeSpaceDescription: String { return self._s[2856]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2857]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2858]! } - public var Message_PinnedGame: String { return self._s[2859]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2860]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2862]! } - public var Login_CallRequestState2: String { return self._s[2864]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2866]! } + public var Passport_PasswordDescription: String { return self._s[2850]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2851]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2852]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2853]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2854]! } + public var Conversation_ContextMenuMore: String { return self._s[2855]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2856]! } + public var CallSettings_TabIcon: String { return self._s[2857]! } + public var KeyCommand_Find: String { return self._s[2858]! } + public var ClearCache_FreeSpaceDescription: String { return self._s[2859]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2860]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2861]! } + public var Message_PinnedGame: String { return self._s[2862]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2863]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2865]! } + public var Login_CallRequestState2: String { return self._s[2867]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2869]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2867]!, self._r[2867]!, [_0]) + return formatWithArgumentRanges(self._s[2870]!, self._r[2870]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2869]!, self._r[2869]!, [_0]) + return formatWithArgumentRanges(self._s[2872]!, self._r[2872]!, [_0]) } - public var AuthSessions_AddDevice: String { return self._s[2870]! } - public var WallpaperPreview_Blurred: String { return self._s[2871]! } - public var Conversation_InstantPagePreview: String { return self._s[2872]! } + public var AuthSessions_AddDevice: String { return self._s[2873]! } + public var WallpaperPreview_Blurred: String { return self._s[2874]! } + public var Conversation_InstantPagePreview: String { return self._s[2875]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2873]!, self._r[2873]!, [_0]) + return formatWithArgumentRanges(self._s[2876]!, self._r[2876]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2876]! } - public var WallpaperSearch_ColorRed: String { return self._s[2877]! } - public var GroupPermission_NoPinMessages: String { return self._s[2878]! } - public var Passport_Language_es: String { return self._s[2879]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2881]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2882]! } + public var SecretTimer_VideoDescription: String { return self._s[2879]! } + public var WallpaperSearch_ColorRed: String { return self._s[2880]! } + public var GroupPermission_NoPinMessages: String { return self._s[2881]! } + public var Passport_Language_es: String { return self._s[2882]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2884]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2885]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2883]!, self._r[2883]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2886]!, self._r[2886]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2884]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2885]! } - public var Watch_UserInfo_Unmute: String { return self._s[2886]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2887]! } - public var AccessDenied_CameraRestricted: String { return self._s[2889]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2887]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2888]! } + public var Watch_UserInfo_Unmute: String { return self._s[2889]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2890]! } + public var AccessDenied_CameraRestricted: String { return self._s[2892]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2890]!, self._r[2890]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2893]!, self._r[2893]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2892]! } - public var Settings_CopyUsername: String { return self._s[2893]! } - public var Contacts_SearchLabel: String { return self._s[2894]! } - public var Map_OpenInYandexNavigator: String { return self._s[2896]! } - public var PasscodeSettings_EncryptData: String { return self._s[2897]! } - public var Settings_Wallet: String { return self._s[2898]! } - public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2899]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2900]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2901]! } - public var DialogList_AdNoticeAlert: String { return self._s[2902]! } - public var Wallet_Month_GenMay: String { return self._s[2904]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2905]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2906]! } - public var Localization_LanguageCustom: String { return self._s[2907]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2908]! } - public var CallFeedback_Title: String { return self._s[2909]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2912]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2913]! } - public var Wallet_Intro_CreateErrorTitle: String { return self._s[2914]! } - public var Conversation_InfoGroup: String { return self._s[2915]! } - public var Compose_NewMessage: String { return self._s[2916]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2917]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2918]! } - public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2919]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2920]! } + public var ChatList_ReadAll: String { return self._s[2895]! } + public var Settings_CopyUsername: String { return self._s[2896]! } + public var Contacts_SearchLabel: String { return self._s[2897]! } + public var Map_OpenInYandexNavigator: String { return self._s[2899]! } + public var PasscodeSettings_EncryptData: String { return self._s[2900]! } + public var Settings_Wallet: String { return self._s[2901]! } + public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2902]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2903]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2904]! } + public var DialogList_AdNoticeAlert: String { return self._s[2905]! } + public var Wallet_Month_GenMay: String { return self._s[2907]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2908]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2909]! } + public var Localization_LanguageCustom: String { return self._s[2910]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2911]! } + public var CallFeedback_Title: String { return self._s[2912]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2915]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2916]! } + public var Wallet_Intro_CreateErrorTitle: String { return self._s[2917]! } + public var Conversation_InfoGroup: String { return self._s[2918]! } + public var Compose_NewMessage: String { return self._s[2919]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2920]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2921]! } + public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2922]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2923]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2921]!, self._r[2921]!, [_0]) + return formatWithArgumentRanges(self._s[2924]!, self._r[2924]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2922]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2923]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2924]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2925]! } - public var Channel_BlackList_Title: String { return self._s[2926]! } - public var UserInfo_PhoneCall: String { return self._s[2927]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2929]! } - public var Wallet_Month_ShortJanuary: String { return self._s[2930]! } - public var State_connecting: String { return self._s[2931]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2932]! } - public var Wallet_Month_GenMarch: String { return self._s[2933]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[2934]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2925]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2926]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2927]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2928]! } + public var Channel_BlackList_Title: String { return self._s[2929]! } + public var UserInfo_PhoneCall: String { return self._s[2930]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2932]! } + public var Wallet_Month_ShortJanuary: String { return self._s[2933]! } + public var State_connecting: String { return self._s[2934]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2935]! } + public var Wallet_Month_GenMarch: String { return self._s[2936]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[2937]! } public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2935]!, self._r[2935]!, [_0]) + return formatWithArgumentRanges(self._s[2938]!, self._r[2938]!, [_0]) } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2936]!, self._r[2936]!, [_0]) + return formatWithArgumentRanges(self._s[2939]!, self._r[2939]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2937]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2938]! } - public var Passport_Identity_EditPassport: String { return self._s[2939]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2941]! } - public var Localization_EnglishLanguageName: String { return self._s[2942]! } - public var Share_AuthDescription: String { return self._s[2943]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2944]! } - public var Passport_Identity_Surname: String { return self._s[2945]! } - public var Compose_TokenListPlaceholder: String { return self._s[2946]! } - public var Wallet_AccessDenied_Camera: String { return self._s[2947]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[2948]! } - public var Settings_AboutEmpty: String { return self._s[2949]! } - public var Conversation_Unmute: String { return self._s[2950]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[2952]! } - public var Wallet_Sending_Text: String { return self._s[2953]! } + public var Notifications_GroupNotifications: String { return self._s[2940]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2941]! } + public var Passport_Identity_EditPassport: String { return self._s[2942]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2944]! } + public var Localization_EnglishLanguageName: String { return self._s[2945]! } + public var Share_AuthDescription: String { return self._s[2946]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2947]! } + public var Passport_Identity_Surname: String { return self._s[2948]! } + public var Compose_TokenListPlaceholder: String { return self._s[2949]! } + public var Wallet_AccessDenied_Camera: String { return self._s[2950]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2951]! } + public var Settings_AboutEmpty: String { return self._s[2952]! } + public var Conversation_Unmute: String { return self._s[2953]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[2955]! } + public var Wallet_Sending_Text: String { return self._s[2956]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2954]!, self._r[2954]!, [_1]) + return formatWithArgumentRanges(self._s[2957]!, self._r[2957]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[2955]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2957]! } - public var ChatSettings_Appearance: String { return self._s[2958]! } - public var ClearCache_StorageUsage: String { return self._s[2959]! } - public var Appearance_PickAccentColor: String { return self._s[2960]! } + public var Login_CodeSentCall: String { return self._s[2958]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2960]! } + public var ChatSettings_Appearance: String { return self._s[2961]! } + public var ClearCache_StorageUsage: String { return self._s[2962]! } + public var Appearance_PickAccentColor: String { return self._s[2963]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2961]!, self._r[2961]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2964]!, self._r[2964]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2962]!, self._r[2962]!, [_1]) + return formatWithArgumentRanges(self._s[2965]!, self._r[2965]!, [_1]) } - public var Notification_CallMissed: String { return self._s[2963]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2964]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2965]! } - public var Wallet_Month_GenOctober: String { return self._s[2967]! } - public var ChatAdmins_AdminLabel: String { return self._s[2968]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2969]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[2971]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2972]! } - public var Month_GenJune: String { return self._s[2973]! } - public var IntentsSettings_MainAccountInfo: String { return self._s[2974]! } - public var Watch_Location_Current: String { return self._s[2975]! } - public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2976]! } - public var Conversation_TitleMute: String { return self._s[2977]! } + public var Notification_CallMissed: String { return self._s[2966]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2967]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2968]! } + public var Wallet_Month_GenOctober: String { return self._s[2970]! } + public var ChatAdmins_AdminLabel: String { return self._s[2971]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2972]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2974]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2975]! } + public var Month_GenJune: String { return self._s[2976]! } + public var IntentsSettings_MainAccountInfo: String { return self._s[2977]! } + public var Watch_Location_Current: String { return self._s[2978]! } + public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[2979]! } + public var Conversation_TitleMute: String { return self._s[2980]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2978]!, self._r[2978]!, [_1]) + return formatWithArgumentRanges(self._s[2981]!, self._r[2981]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[2979]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2982]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2980]!, self._r[2980]!, [_0]) + return formatWithArgumentRanges(self._s[2983]!, self._r[2983]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[2981]! } - public var Chat_SlowmodeSendError: String { return self._s[2982]! } - public var MaskStickerSettings_Info: String { return self._s[2983]! } - public var EditTheme_Expand_TopInfo: String { return self._s[2984]! } + public var Call_ReportPlaceholder: String { return self._s[2984]! } + public var Chat_SlowmodeSendError: String { return self._s[2985]! } + public var MaskStickerSettings_Info: String { return self._s[2986]! } + public var EditTheme_Expand_TopInfo: String { return self._s[2987]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2985]!, self._r[2985]!, [_0]) + return formatWithArgumentRanges(self._s[2988]!, self._r[2988]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[2986]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[2988]! } - public var Contacts_ShareTelegram: String { return self._s[2989]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2990]! } - public var Map_AddressOnMap: String { return self._s[2991]! } - public var Channel_ErrorAccessDenied: String { return self._s[2992]! } - public var UserInfo_ScamBotWarning: String { return self._s[2994]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[2995]! } - public var Call_ConnectionErrorTitle: String { return self._s[2996]! } - public var UserInfo_NotificationsEnable: String { return self._s[2997]! } - public var ArchivedChats_IntroText1: String { return self._s[2998]! } - public var Tour_Text4: String { return self._s[3001]! } - public var WallpaperSearch_Recent: String { return self._s[3002]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[3003]! } - public var Profile_MessageLifetime2s: String { return self._s[3005]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3006]! } - public var Notification_MessageLifetime2s: String { return self._s[3007]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2989]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2991]! } + public var Contacts_ShareTelegram: String { return self._s[2992]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2993]! } + public var Map_AddressOnMap: String { return self._s[2994]! } + public var Channel_ErrorAccessDenied: String { return self._s[2995]! } + public var UserInfo_ScamBotWarning: String { return self._s[2997]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2998]! } + public var Call_ConnectionErrorTitle: String { return self._s[2999]! } + public var UserInfo_NotificationsEnable: String { return self._s[3000]! } + public var ArchivedChats_IntroText1: String { return self._s[3001]! } + public var Tour_Text4: String { return self._s[3004]! } + public var WallpaperSearch_Recent: String { return self._s[3005]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[3006]! } + public var Profile_MessageLifetime2s: String { return self._s[3008]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3009]! } + public var Notification_MessageLifetime2s: String { return self._s[3010]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3008]!, self._r[3008]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3011]!, self._r[3011]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[3009]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[3010]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3011]! } + public var Cache_ClearCache: String { return self._s[3012]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[3013]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3014]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3015]!, self._r[3015]!, [_0]) + return formatWithArgumentRanges(self._s[3018]!, self._r[3018]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3017]!, self._r[3017]!, [_0]) + return formatWithArgumentRanges(self._s[3020]!, self._r[3020]!, [_0]) } - public var LocalGroup_Text: String { return self._s[3018]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3019]! } - public var SocksProxySetup_TypeSocks: String { return self._s[3020]! } - public var ChatList_UnarchiveAction: String { return self._s[3021]! } - public var AutoNightTheme_Title: String { return self._s[3022]! } - public var InstantPage_FeedbackButton: String { return self._s[3023]! } - public var Passport_FieldAddress: String { return self._s[3024]! } + public var LocalGroup_Text: String { return self._s[3021]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3022]! } + public var SocksProxySetup_TypeSocks: String { return self._s[3023]! } + public var ChatList_UnarchiveAction: String { return self._s[3024]! } + public var AutoNightTheme_Title: String { return self._s[3025]! } + public var InstantPage_FeedbackButton: String { return self._s[3026]! } + public var Passport_FieldAddress: String { return self._s[3027]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3025]!, self._r[3025]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3028]!, self._r[3028]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[3026]! } + public var Month_ShortMarch: String { return self._s[3029]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3027]!, self._r[3027]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3030]!, self._r[3030]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3028]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3029]! } - public var Passport_FloodError: String { return self._s[3030]! } - public var SecretGif_Title: String { return self._s[3031]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3032]! } - public var ChatList_Context_UnhideArchive: String { return self._s[3033]! } - public var Passport_Language_th: String { return self._s[3035]! } - public var Passport_Address_Address: String { return self._s[3036]! } - public var Login_InvalidLastNameError: String { return self._s[3037]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[3038]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[3039]! } - public var ChatList_Context_Archive: String { return self._s[3040]! } - public var SettingsSearch_FAQ: String { return self._s[3041]! } - public var ShareMenu_Send: String { return self._s[3042]! } - public var WallpaperSearch_ColorYellow: String { return self._s[3044]! } - public var Month_GenNovember: String { return self._s[3046]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3048]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3031]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3032]! } + public var Passport_FloodError: String { return self._s[3033]! } + public var SecretGif_Title: String { return self._s[3034]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3035]! } + public var ChatList_Context_UnhideArchive: String { return self._s[3036]! } + public var Passport_Language_th: String { return self._s[3038]! } + public var Passport_Address_Address: String { return self._s[3039]! } + public var Login_InvalidLastNameError: String { return self._s[3040]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[3041]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[3042]! } + public var ChatList_Context_Archive: String { return self._s[3043]! } + public var SettingsSearch_FAQ: String { return self._s[3044]! } + public var ShareMenu_Send: String { return self._s[3045]! } + public var WallpaperSearch_ColorYellow: String { return self._s[3047]! } + public var Month_GenNovember: String { return self._s[3049]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3051]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3049]!, self._r[3049]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3052]!, self._r[3052]!, [_1, _2]) } - public var Conversation_SwipeToReplyHintText: String { return self._s[3050]! } - public var Checkout_Email: String { return self._s[3051]! } - public var NotificationsSound_Tritone: String { return self._s[3052]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[3054]! } - public var Wallet_ContextMenuCopy: String { return self._s[3056]! } + public var Conversation_SwipeToReplyHintText: String { return self._s[3053]! } + public var Checkout_Email: String { return self._s[3054]! } + public var NotificationsSound_Tritone: String { return self._s[3055]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[3057]! } + public var Wallet_ContextMenuCopy: String { return self._s[3059]! } public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3058]!, self._r[3058]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3061]!, self._r[3061]!, [_1, _2, _3]) } - public var Appearance_TextSize_Automatic: String { return self._s[3059]! } + public var Appearance_TextSize_Automatic: String { return self._s[3062]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3060]!, self._r[3060]!, [_1]) + return formatWithArgumentRanges(self._s[3063]!, self._r[3063]!, [_1]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[3061]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[3064]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3062]!, self._r[3062]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[3065]!, self._r[3065]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[3063]! } - public var Notification_Exceptions_Add: String { return self._s[3064]! } - public var DialogList_You: String { return self._s[3065]! } - public var MediaPicker_Send: String { return self._s[3068]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3069]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3070]! } - public var Call_AudioRouteSpeaker: String { return self._s[3071]! } - public var Watch_UserInfo_Title: String { return self._s[3072]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[3073]! } - public var Appearance_AccentColor: String { return self._s[3075]! } + public var ChatList_UndoArchiveTitle: String { return self._s[3066]! } + public var Notification_Exceptions_Add: String { return self._s[3067]! } + public var DialogList_You: String { return self._s[3068]! } + public var MediaPicker_Send: String { return self._s[3071]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3072]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3073]! } + public var Call_AudioRouteSpeaker: String { return self._s[3074]! } + public var Watch_UserInfo_Title: String { return self._s[3075]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[3076]! } + public var Appearance_AccentColor: String { return self._s[3078]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3076]!, self._r[3076]!, [_0]) + return formatWithArgumentRanges(self._s[3079]!, self._r[3079]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3077]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3080]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3078]!, self._r[3078]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3081]!, self._r[3081]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[3079]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[3080]! } - public var Notification_CallOutgoing: String { return self._s[3081]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3082]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3083]! } - public var Call_RecordingDisabledMessage: String { return self._s[3084]! } - public var Message_Game: String { return self._s[3085]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[3086]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3087]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3088]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3089]! } - public var Date_DialogDateFormat: String { return self._s[3090]! } - public var WallpaperColors_SetCustomColor: String { return self._s[3091]! } - public var Notifications_InAppNotifications: String { return self._s[3092]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[3082]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[3083]! } + public var Notification_CallOutgoing: String { return self._s[3084]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3085]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3086]! } + public var Call_RecordingDisabledMessage: String { return self._s[3087]! } + public var Message_Game: String { return self._s[3088]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[3089]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3090]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3091]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3092]! } + public var Date_DialogDateFormat: String { return self._s[3093]! } + public var WallpaperColors_SetCustomColor: String { return self._s[3094]! } + public var Notifications_InAppNotifications: String { return self._s[3095]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3093]!, self._r[3093]!, [_0]) - } - public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3094]!, self._r[3094]!, [_1, _2]) - } - public var NewContact_Title: String { return self._s[3095]! } - public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3096]!, self._r[3096]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[3097]! } + public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3097]!, self._r[3097]!, [_1, _2]) + } + public var NewContact_Title: String { return self._s[3098]! } + public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3099]!, self._r[3099]!, [_0]) + } + public var Conversation_ViewContactDetails: String { return self._s[3100]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3099]!, self._r[3099]!, [_1]) + return formatWithArgumentRanges(self._s[3102]!, self._r[3102]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3100]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[3101]! } - public var PrivacySettings_Title: String { return self._s[3102]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3105]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[3106]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[3107]! } - public var Contacts_PhoneNumber: String { return self._s[3108]! } - public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3110]! } - public var Map_ShowPlaces: String { return self._s[3111]! } - public var ChatAdmins_Title: String { return self._s[3112]! } - public var InstantPage_Reference: String { return self._s[3114]! } - public var Wallet_Info_Updating: String { return self._s[3115]! } - public var ReportGroupLocation_Text: String { return self._s[3116]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3103]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[3104]! } + public var PrivacySettings_Title: String { return self._s[3105]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3108]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[3109]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[3110]! } + public var Contacts_PhoneNumber: String { return self._s[3111]! } + public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3113]! } + public var Map_ShowPlaces: String { return self._s[3114]! } + public var ChatAdmins_Title: String { return self._s[3115]! } + public var InstantPage_Reference: String { return self._s[3117]! } + public var Wallet_Info_Updating: String { return self._s[3118]! } + public var ReportGroupLocation_Text: String { return self._s[3119]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3117]!, self._r[3117]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3120]!, self._r[3120]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[3118]! } - public var Watch_UserInfo_Block: String { return self._s[3119]! } - public var ChatSettings_Stickers: String { return self._s[3120]! } - public var ChatSettings_DownloadInBackground: String { return self._s[3121]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[3122]! } + public var Camera_FlashOff: String { return self._s[3121]! } + public var Watch_UserInfo_Block: String { return self._s[3122]! } + public var ChatSettings_Stickers: String { return self._s[3123]! } + public var ChatSettings_DownloadInBackground: String { return self._s[3124]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[3125]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3123]!, self._r[3123]!, [_0]) + return formatWithArgumentRanges(self._s[3126]!, self._r[3126]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[3124]! } - public var Login_CheckOtherSessionMessages: String { return self._s[3125]! } - public var AutoDownloadSettings_Cellular: String { return self._s[3126]! } - public var Wallet_Created_ExportErrorTitle: String { return self._s[3127]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3128]! } - public var VoiceOver_MessageContextShare: String { return self._s[3129]! } + public var Settings_ViewPhoto: String { return self._s[3127]! } + public var Login_CheckOtherSessionMessages: String { return self._s[3128]! } + public var AutoDownloadSettings_Cellular: String { return self._s[3129]! } + public var Wallet_Created_ExportErrorTitle: String { return self._s[3130]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3131]! } + public var VoiceOver_MessageContextShare: String { return self._s[3132]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3131]!, self._r[3131]!, [_0]) - } - public var Privacy_DeleteDrafts: String { return self._s[3132]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3133]! } - public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3134]!, self._r[3134]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[3135]! } - public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3136]! } - public var DialogList_SavedMessages: String { return self._s[3137]! } - public var GroupInfo_UpgradeButton: String { return self._s[3138]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3140]! } - public var DialogList_Pin: String { return self._s[3141]! } + public var Privacy_DeleteDrafts: String { return self._s[3135]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3136]! } + public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3137]!, self._r[3137]!, [_0]) + } + public var DialogList_SavedMessagesHelp: String { return self._s[3138]! } + public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3139]! } + public var DialogList_SavedMessages: String { return self._s[3140]! } + public var GroupInfo_UpgradeButton: String { return self._s[3141]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3143]! } + public var DialogList_Pin: String { return self._s[3144]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3142]!, self._r[3142]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3145]!, self._r[3145]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3143]!, self._r[3143]!, [_0]) + return formatWithArgumentRanges(self._s[3146]!, self._r[3146]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3144]! } - public var UserInfo_NotificationsDisable: String { return self._s[3145]! } - public var Paint_Outlined: String { return self._s[3146]! } - public var Activity_PlayingGame: String { return self._s[3147]! } - public var SearchImages_NoImagesFound: String { return self._s[3148]! } - public var SocksProxySetup_ProxyType: String { return self._s[3149]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3151]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[3152]! } - public var Settings_AppLanguage: String { return self._s[3153]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3154]! } - public var Common_ChoosePhoto: String { return self._s[3155]! } - public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3156]! } - public var CallFeedback_ReasonEcho: String { return self._s[3157]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3147]! } + public var UserInfo_NotificationsDisable: String { return self._s[3148]! } + public var Paint_Outlined: String { return self._s[3149]! } + public var Activity_PlayingGame: String { return self._s[3150]! } + public var SearchImages_NoImagesFound: String { return self._s[3151]! } + public var SocksProxySetup_ProxyType: String { return self._s[3152]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3154]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[3155]! } + public var Settings_AppLanguage: String { return self._s[3156]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3157]! } + public var Common_ChoosePhoto: String { return self._s[3158]! } + public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3159]! } + public var CallFeedback_ReasonEcho: String { return self._s[3160]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3158]!, self._r[3158]!, [_1]) + return formatWithArgumentRanges(self._s[3161]!, self._r[3161]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[3159]! } - public var Activity_UploadingVideo: String { return self._s[3160]! } - public var Conversation_WalletRequiredNotNow: String { return self._s[3161]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3162]! } - public var NetworkUsageSettings_Wifi: String { return self._s[3163]! } - public var VoiceOver_Editing_ClearText: String { return self._s[3164]! } - public var PUSH_SENDER_YOU: String { return self._s[3165]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[3166]! } - public var Checkout_PayWithTouchId: String { return self._s[3167]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3168]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[3162]! } + public var Activity_UploadingVideo: String { return self._s[3163]! } + public var Conversation_WalletRequiredNotNow: String { return self._s[3164]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3165]! } + public var NetworkUsageSettings_Wifi: String { return self._s[3166]! } + public var VoiceOver_Editing_ClearText: String { return self._s[3167]! } + public var PUSH_SENDER_YOU: String { return self._s[3168]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[3169]! } + public var Checkout_PayWithTouchId: String { return self._s[3170]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3171]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3170]!, self._r[3170]!, [_1]) - } - public var Notifications_ExceptionsNone: String { return self._s[3171]! } - public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3172]!, self._r[3172]!, [_0]) - } - public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3173]!, self._r[3173]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[3175]! } - public var Passport_Address_Region: String { return self._s[3178]! } - public var ChatList_DeleteChat: String { return self._s[3179]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[3180]! } - public var PhotoEditor_TiltShift: String { return self._s[3181]! } - public var Settings_FAQ_URL: String { return self._s[3182]! } - public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3183]! } - public var Passport_Language_sl: String { return self._s[3184]! } - public var Settings_PrivacySettings: String { return self._s[3186]! } - public var SharedMedia_TitleLink: String { return self._s[3187]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[3188]! } - public var Settings_SetProfilePhoto: String { return self._s[3189]! } - public var Channel_About_Help: String { return self._s[3190]! } - public var Contacts_PermissionsEnable: String { return self._s[3191]! } - public var Wallet_Sending_Title: String { return self._s[3192]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3193]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[3194]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3196]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3197]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3198]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3199]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[3200]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[3202]! } - public var Map_OpenInYandexMaps: String { return self._s[3204]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3205]! } - public var VoiceOver_MessageContextReply: String { return self._s[3206]! } - public var PhotoEditor_SaturationTool: String { return self._s[3207]! } + public var Notifications_ExceptionsNone: String { return self._s[3174]! } + public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3175]!, self._r[3175]!, [_0]) + } + public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3176]!, self._r[3176]!, [_1]) + } + public var AuthSessions_IncompleteAttempts: String { return self._s[3178]! } + public var Passport_Address_Region: String { return self._s[3181]! } + public var ChatList_DeleteChat: String { return self._s[3182]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[3183]! } + public var PhotoEditor_TiltShift: String { return self._s[3184]! } + public var Settings_FAQ_URL: String { return self._s[3185]! } + public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3186]! } + public var Passport_Language_sl: String { return self._s[3187]! } + public var Settings_PrivacySettings: String { return self._s[3189]! } + public var SharedMedia_TitleLink: String { return self._s[3190]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[3191]! } + public var Settings_SetProfilePhoto: String { return self._s[3192]! } + public var Channel_About_Help: String { return self._s[3193]! } + public var Contacts_PermissionsEnable: String { return self._s[3194]! } + public var Wallet_Sending_Title: String { return self._s[3195]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3196]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[3197]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3199]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3200]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3201]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3202]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[3203]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[3205]! } + public var Map_OpenInYandexMaps: String { return self._s[3207]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3208]! } + public var VoiceOver_MessageContextReply: String { return self._s[3209]! } + public var PhotoEditor_SaturationTool: String { return self._s[3210]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3208]!, self._r[3208]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3211]!, self._r[3211]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3209]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3210]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3211]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3212]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3213]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3214]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3212]!, self._r[3212]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3215]!, self._r[3215]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3213]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3215]! } - public var SettingsSearch_Synonyms_Wallet: String { return self._s[3216]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3216]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3218]! } + public var SettingsSearch_Synonyms_Wallet: String { return self._s[3219]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3217]!, self._r[3217]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3220]!, self._r[3220]!, [_1, _2]) } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3218]!, self._r[3218]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3221]!, self._r[3221]!, [_1, _2, _3]) } - public var GroupInfo_PublicLinkAdd: String { return self._s[3219]! } - public var Passport_PassportInformation: String { return self._s[3222]! } - public var Theme_Unsupported: String { return self._s[3223]! } - public var WatchRemote_AlertTitle: String { return self._s[3224]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3225]! } - public var ConvertToSupergroup_HelpText: String { return self._s[3227]! } + public var WallpaperPreview_PatternTitle: String { return self._s[3222]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[3223]! } + public var Passport_PassportInformation: String { return self._s[3226]! } + public var Theme_Unsupported: String { return self._s[3227]! } + public var WatchRemote_AlertTitle: String { return self._s[3228]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3229]! } + public var ConvertToSupergroup_HelpText: String { return self._s[3231]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3228]!, self._r[3228]!, [_0]) + return formatWithArgumentRanges(self._s[3232]!, self._r[3232]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3229]!, self._r[3229]!, [_1]) + return formatWithArgumentRanges(self._s[3233]!, self._r[3233]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3230]! } - public var Wallet_Navigation_Done: String { return self._s[3232]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3233]! } - public var AccessDenied_CameraDisabled: String { return self._s[3234]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3234]! } + public var Wallet_Navigation_Done: String { return self._s[3236]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3237]! } + public var AccessDenied_CameraDisabled: String { return self._s[3238]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3235]!, self._r[3235]!, [_0]) + return formatWithArgumentRanges(self._s[3239]!, self._r[3239]!, [_0]) } - public var ClearCache_Forever: String { return self._s[3236]! } - public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3237]! } - public var PhotoEditor_ContrastTool: String { return self._s[3240]! } + public var ClearCache_Forever: String { return self._s[3240]! } + public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3241]! } + public var PhotoEditor_ContrastTool: String { return self._s[3244]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3241]!, self._r[3241]!, [_1]) + return formatWithArgumentRanges(self._s[3245]!, self._r[3245]!, [_1]) } - public var DialogList_Draft: String { return self._s[3242]! } - public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3243]! } - public var Privacy_TopPeersDelete: String { return self._s[3245]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[3246]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3247]! } - public var WebSearch_RecentSectionClear: String { return self._s[3248]! } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[3249]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3251]! } - public var Common_Done: String { return self._s[3253]! } - public var Shortcut_SwitchAccount: String { return self._s[3254]! } - public var AuthSessions_EmptyText: String { return self._s[3255]! } - public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3256]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[3257]! } - public var Tour_Title5: String { return self._s[3258]! } - public var Wallet_Settings_Title: String { return self._s[3259]! } + public var DialogList_Draft: String { return self._s[3246]! } + public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3247]! } + public var Privacy_TopPeersDelete: String { return self._s[3249]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[3250]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3251]! } + public var WebSearch_RecentSectionClear: String { return self._s[3252]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[3253]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3255]! } + public var Common_Done: String { return self._s[3257]! } + public var Shortcut_SwitchAccount: String { return self._s[3258]! } + public var AuthSessions_EmptyText: String { return self._s[3259]! } + public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3260]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[3261]! } + public var Tour_Title5: String { return self._s[3262]! } + public var Wallet_Settings_Title: String { return self._s[3263]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_0]) + return formatWithArgumentRanges(self._s[3264]!, self._r[3264]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3261]! } - public var Conversation_LinkDialogSave: String { return self._s[3262]! } - public var GroupInfo_ActionRestrict: String { return self._s[3263]! } - public var Checkout_Title: String { return self._s[3264]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3266]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[3268]! } - public var Notification_RenamedGroup: String { return self._s[3269]! } - public var PeopleNearby_Groups: String { return self._s[3270]! } - public var Checkout_PayWithFaceId: String { return self._s[3271]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3272]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3274]! } - public var Checkout_WebConfirmation_Title: String { return self._s[3275]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[3276]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3265]! } + public var Conversation_LinkDialogSave: String { return self._s[3266]! } + public var GroupInfo_ActionRestrict: String { return self._s[3267]! } + public var Checkout_Title: String { return self._s[3268]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3270]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[3272]! } + public var Notification_RenamedGroup: String { return self._s[3273]! } + public var PeopleNearby_Groups: String { return self._s[3274]! } + public var Checkout_PayWithFaceId: String { return self._s[3275]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3276]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3278]! } + public var Checkout_WebConfirmation_Title: String { return self._s[3279]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[3280]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3277]!, self._r[3277]!, [_0]) + return formatWithArgumentRanges(self._s[3281]!, self._r[3281]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[3279]! } + public var Profile_AddToExisting: String { return self._s[3283]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3280]!, self._r[3280]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3284]!, self._r[3284]!, [_0, _1]) } - public var Cache_Files: String { return self._s[3282]! } - public var Permissions_PrivacyPolicy: String { return self._s[3283]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[3284]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3285]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[3287]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3289]! } - public var Calls_NoCallsPlaceholder: String { return self._s[3290]! } + public var Cache_Files: String { return self._s[3286]! } + public var Permissions_PrivacyPolicy: String { return self._s[3287]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[3288]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3289]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[3291]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3293]! } + public var Calls_NoCallsPlaceholder: String { return self._s[3294]! } public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3291]!, self._r[3291]!, [_0]) + return formatWithArgumentRanges(self._s[3295]!, self._r[3295]!, [_0]) } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3292]! } - public var VoiceOver_AttachMedia: String { return self._s[3294]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3295]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3296]! } + public var VoiceOver_AttachMedia: String { return self._s[3298]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3299]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3296]!, self._r[3296]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3300]!, self._r[3300]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3297]! } - public var Conversation_SetReminder_Title: String { return self._s[3298]! } - public var Passport_FieldAddressHelp: String { return self._s[3299]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3300]! } - public var PUSH_REMINDER_TITLE: String { return self._s[3301]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3301]! } + public var Conversation_SetReminder_Title: String { return self._s[3302]! } + public var Passport_FieldAddressHelp: String { return self._s[3303]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3304]! } + public var PUSH_REMINDER_TITLE: String { return self._s[3305]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3302]!, self._r[3302]!, [_0]) + return formatWithArgumentRanges(self._s[3306]!, self._r[3306]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[3303]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[3304]! } - public var Login_UnknownError: String { return self._s[3305]! } - public var Group_UpgradeNoticeText2: String { return self._s[3308]! } - public var Watch_Compose_AddContact: String { return self._s[3309]! } - public var ClearCache_StorageServiceFiles: String { return self._s[3310]! } - public var Web_Error: String { return self._s[3311]! } - public var Gif_Search: String { return self._s[3312]! } - public var Profile_MessageLifetime1h: String { return self._s[3313]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3314]! } - public var Channel_Username_CheckingUsername: String { return self._s[3315]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[3316]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[3317]! } - public var Channel_AboutItem: String { return self._s[3318]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3320]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[3321]! } - public var GroupInfo_SharedMedia: String { return self._s[3322]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[3307]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[3308]! } + public var Login_UnknownError: String { return self._s[3309]! } + public var Group_UpgradeNoticeText2: String { return self._s[3312]! } + public var Watch_Compose_AddContact: String { return self._s[3313]! } + public var ClearCache_StorageServiceFiles: String { return self._s[3314]! } + public var Web_Error: String { return self._s[3315]! } + public var Gif_Search: String { return self._s[3316]! } + public var Profile_MessageLifetime1h: String { return self._s[3317]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3318]! } + public var Channel_Username_CheckingUsername: String { return self._s[3319]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[3320]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[3321]! } + public var Channel_AboutItem: String { return self._s[3322]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3324]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[3325]! } + public var GroupInfo_SharedMedia: String { return self._s[3326]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3323]!, self._r[3323]!, [_1]) + return formatWithArgumentRanges(self._s[3327]!, self._r[3327]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[3324]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3328]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3325]!, self._r[3325]!, [_1]) + return formatWithArgumentRanges(self._s[3329]!, self._r[3329]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3326]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3327]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3328]! } - public var CreatePoll_AddOption: String { return self._s[3329]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3330]! } - public var Group_UpgradeNoticeHeader: String { return self._s[3331]! } - public var Channel_Management_AddModerator: String { return self._s[3332]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[3333]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[3334]! } - public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3335]! } - public var Theme_Colors_Background: String { return self._s[3336]! } - public var NotificationsSound_Hello: String { return self._s[3338]! } - public var SocksProxySetup_SavedProxies: String { return self._s[3339]! } - public var Channel_Stickers_Placeholder: String { return self._s[3341]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3330]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3331]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3332]! } + public var CreatePoll_AddOption: String { return self._s[3333]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3334]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3335]! } + public var Channel_Management_AddModerator: String { return self._s[3336]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3337]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3338]! } + public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3339]! } + public var Theme_Colors_Background: String { return self._s[3340]! } + public var NotificationsSound_Hello: String { return self._s[3342]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3343]! } + public var Channel_Stickers_Placeholder: String { return self._s[3345]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3342]!, self._r[3342]!, [_0]) + return formatWithArgumentRanges(self._s[3346]!, self._r[3346]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3343]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[3344]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3345]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3346]! } - public var AutoDownloadSettings_Channels: String { return self._s[3347]! } - public var Passport_Language_mn: String { return self._s[3348]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3351]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3352]! } - public var Passport_Language_ja: String { return self._s[3354]! } - public var Settings_About_Title: String { return self._s[3355]! } - public var Settings_NotificationsAndSounds: String { return self._s[3356]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3357]! } - public var Settings_BlockedUsers: String { return self._s[3358]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3347]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3348]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3349]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3350]! } + public var AutoDownloadSettings_Channels: String { return self._s[3351]! } + public var Passport_Language_mn: String { return self._s[3352]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3355]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3356]! } + public var Passport_Language_ja: String { return self._s[3358]! } + public var Settings_About_Title: String { return self._s[3359]! } + public var Settings_NotificationsAndSounds: String { return self._s[3360]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3361]! } + public var Settings_BlockedUsers: String { return self._s[3362]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3359]!, self._r[3359]!, [_0]) + return formatWithArgumentRanges(self._s[3363]!, self._r[3363]!, [_0]) } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3360]! } - public var Wallet_Weekday_Today: String { return self._s[3361]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3362]! } - public var Widget_ApplicationLocked: String { return self._s[3363]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3364]! } - public var Channel_Username_Title: String { return self._s[3365]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3364]! } + public var Wallet_Weekday_Today: String { return self._s[3365]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3366]! } + public var Widget_ApplicationLocked: String { return self._s[3367]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3368]! } + public var Channel_Username_Title: String { return self._s[3369]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3366]!, self._r[3366]!, [_0]) + return formatWithArgumentRanges(self._s[3370]!, self._r[3370]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3368]! } - public var AppleWatch_Title: String { return self._s[3369]! } - public var Activity_RecordingVideoMessage: String { return self._s[3370]! } + public var AttachmentMenu_File: String { return self._s[3372]! } + public var AppleWatch_Title: String { return self._s[3373]! } + public var Activity_RecordingVideoMessage: String { return self._s[3374]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3371]!, self._r[3371]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3375]!, self._r[3375]!, [_1, _2]) } - public var Theme_Colors_Messages: String { return self._s[3372]! } - public var Weekday_Saturday: String { return self._s[3373]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3374]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3375]! } - public var Common_Next: String { return self._s[3377]! } - public var Channel_Stickers_YourStickers: String { return self._s[3379]! } - public var Message_Theme: String { return self._s[3380]! } - public var Call_AudioRouteHeadphones: String { return self._s[3381]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3383]! } - public var Watch_Contacts_NoResults: String { return self._s[3385]! } - public var PhotoEditor_TintTool: String { return self._s[3388]! } - public var LoginPassword_ResetAccount: String { return self._s[3390]! } - public var Settings_SavedMessages: String { return self._s[3391]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3392]! } - public var Bot_GenericSupportStatus: String { return self._s[3393]! } - public var StickerPack_Add: String { return self._s[3394]! } - public var Checkout_TotalAmount: String { return self._s[3395]! } - public var Your_cards_number_is_invalid: String { return self._s[3396]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3397]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3398]! } + public var Theme_Colors_Messages: String { return self._s[3376]! } + public var Weekday_Saturday: String { return self._s[3377]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3378]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3379]! } + public var Common_Next: String { return self._s[3381]! } + public var Channel_Stickers_YourStickers: String { return self._s[3383]! } + public var Message_Theme: String { return self._s[3384]! } + public var Call_AudioRouteHeadphones: String { return self._s[3385]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3387]! } + public var Watch_Contacts_NoResults: String { return self._s[3389]! } + public var PhotoEditor_TintTool: String { return self._s[3392]! } + public var LoginPassword_ResetAccount: String { return self._s[3394]! } + public var Settings_SavedMessages: String { return self._s[3395]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3396]! } + public var Bot_GenericSupportStatus: String { return self._s[3397]! } + public var StickerPack_Add: String { return self._s[3398]! } + public var Checkout_TotalAmount: String { return self._s[3399]! } + public var Your_cards_number_is_invalid: String { return self._s[3400]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3401]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3402]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3399]!, self._r[3399]!, [_0]) + return formatWithArgumentRanges(self._s[3403]!, self._r[3403]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3400]!, self._r[3400]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3404]!, self._r[3404]!, [_1, _2]) } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3401]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3405]! } public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3403]!, self._r[3403]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3407]!, self._r[3407]!, [_1, _2]) } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3404]!, self._r[3404]!, [_0]) + return formatWithArgumentRanges(self._s[3408]!, self._r[3408]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3405]! } - public var StickerPack_Share: String { return self._s[3406]! } - public var Passport_DeleteAddress: String { return self._s[3407]! } - public var Settings_Passport: String { return self._s[3408]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3409]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3410]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3411]! } - public var Contacts_PermissionsText: String { return self._s[3412]! } - public var Group_Setup_HistoryVisible: String { return self._s[3413]! } - public var Wallet_Month_ShortDecember: String { return self._s[3415]! } - public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3416]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3417]! } - public var SocksProxySetup_Title: String { return self._s[3418]! } - public var Notification_Mute1h: String { return self._s[3419]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3409]! } + public var StickerPack_Share: String { return self._s[3410]! } + public var Passport_DeleteAddress: String { return self._s[3411]! } + public var Settings_Passport: String { return self._s[3412]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3413]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3414]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3415]! } + public var Contacts_PermissionsText: String { return self._s[3416]! } + public var Group_Setup_HistoryVisible: String { return self._s[3417]! } + public var Wallet_Month_ShortDecember: String { return self._s[3419]! } + public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3420]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3421]! } + public var SocksProxySetup_Title: String { return self._s[3422]! } + public var Notification_Mute1h: String { return self._s[3423]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3420]!, self._r[3420]!, [_0]) + return formatWithArgumentRanges(self._s[3424]!, self._r[3424]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3421]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3425]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3422]!, self._r[3422]!, [_1]) + return formatWithArgumentRanges(self._s[3426]!, self._r[3426]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3423]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3426]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3428]! } - public var DialogList_NoMessagesText: String { return self._s[3429]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3430]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3431]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3433]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3434]! } - public var Common_TakePhotoOrVideo: String { return self._s[3435]! } - public var Wallet_Words_Text: String { return self._s[3436]! } - public var Call_StatusBusy: String { return self._s[3437]! } - public var Conversation_PinnedMessage: String { return self._s[3438]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3439]! } - public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3440]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3441]! } - public var Undo_ChatCleared: String { return self._s[3442]! } - public var AppleWatch_ReplyPresets: String { return self._s[3443]! } - public var Passport_DiscardMessageDescription: String { return self._s[3445]! } - public var Login_NetworkError: String { return self._s[3446]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3427]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3430]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3432]! } + public var DialogList_NoMessagesText: String { return self._s[3433]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3434]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3435]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3437]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3438]! } + public var Common_TakePhotoOrVideo: String { return self._s[3439]! } + public var Wallet_Words_Text: String { return self._s[3440]! } + public var Call_StatusBusy: String { return self._s[3441]! } + public var Conversation_PinnedMessage: String { return self._s[3442]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3443]! } + public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3444]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3445]! } + public var Undo_ChatCleared: String { return self._s[3446]! } + public var AppleWatch_ReplyPresets: String { return self._s[3447]! } + public var Passport_DiscardMessageDescription: String { return self._s[3449]! } + public var Login_NetworkError: String { return self._s[3450]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3447]!, self._r[3447]!, [_0]) + return formatWithArgumentRanges(self._s[3451]!, self._r[3451]!, [_0]) } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3448]!, self._r[3448]!, [_0]) + return formatWithArgumentRanges(self._s[3452]!, self._r[3452]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3449]! } - public var Wallet_WordCheck_ViewWords: String { return self._s[3451]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3452]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3453]! } + public var Wallet_WordCheck_ViewWords: String { return self._s[3455]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3456]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3454]!, self._r[3454]!, [_0]) + return formatWithArgumentRanges(self._s[3458]!, self._r[3458]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[3455]! } - public var VoiceOver_Chat_Music: String { return self._s[3456]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3457]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3459]! } - public var ConversationMedia_Title: String { return self._s[3460]! } - public var EncryptionKey_Title: String { return self._s[3462]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3463]! } - public var Notification_Exceptions_AddException: String { return self._s[3464]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3465]! } - public var Profile_MessageLifetime1m: String { return self._s[3466]! } + public var Call_ConnectionErrorMessage: String { return self._s[3459]! } + public var VoiceOver_Chat_Music: String { return self._s[3460]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3461]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3463]! } + public var ConversationMedia_Title: String { return self._s[3464]! } + public var EncryptionKey_Title: String { return self._s[3466]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3467]! } + public var Notification_Exceptions_AddException: String { return self._s[3468]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3469]! } + public var Profile_MessageLifetime1m: String { return self._s[3470]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3467]!, self._r[3467]!, [_1]) + return formatWithArgumentRanges(self._s[3471]!, self._r[3471]!, [_1]) } - public var Month_GenMay: String { return self._s[3468]! } + public var Month_GenMay: String { return self._s[3472]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3469]!, self._r[3469]!, [_0]) + return formatWithArgumentRanges(self._s[3473]!, self._r[3473]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[3470]! } - public var Wallet_Send_AddressInfo: String { return self._s[3471]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3472]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3473]! } + public var PeopleNearby_Users: String { return self._s[3474]! } + public var Wallet_Send_AddressInfo: String { return self._s[3475]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3476]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3477]! } public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3475]!, self._r[3475]!, [_0]) + return formatWithArgumentRanges(self._s[3479]!, self._r[3479]!, [_0]) } - public var Conversation_EmptyPlaceholder: String { return self._s[3476]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3477]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3478]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3479]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3480]! } - public var Channel_JoinChannel: String { return self._s[3482]! } - public var Appearance_Animations: String { return self._s[3485]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3480]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3481]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3482]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3483]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3484]! } + public var Channel_JoinChannel: String { return self._s[3486]! } + public var Appearance_Animations: String { return self._s[3489]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3486]!, self._r[3486]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3490]!, self._r[3490]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[3488]! } - public var Appearance_ShareTheme: String { return self._s[3489]! } - public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3490]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3492]! } - public var Passport_Address_Street: String { return self._s[3493]! } - public var Conversation_AddContact: String { return self._s[3494]! } - public var Login_PhonePlaceholder: String { return self._s[3495]! } - public var Channel_Members_InviteLink: String { return self._s[3497]! } - public var Bot_Stop: String { return self._s[3498]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3500]! } - public var Notification_PassportValueAddress: String { return self._s[3501]! } - public var Month_ShortJuly: String { return self._s[3502]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3503]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3504]! } - public var Passport_Identity_ReverseSide: String { return self._s[3505]! } - public var Watch_Stickers_Recents: String { return self._s[3508]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3510]! } - public var Map_SendThisLocation: String { return self._s[3511]! } + public var Stickers_GroupStickers: String { return self._s[3492]! } + public var Appearance_ShareTheme: String { return self._s[3493]! } + public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3494]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3496]! } + public var Passport_Address_Street: String { return self._s[3497]! } + public var Conversation_AddContact: String { return self._s[3498]! } + public var Login_PhonePlaceholder: String { return self._s[3499]! } + public var Channel_Members_InviteLink: String { return self._s[3501]! } + public var Bot_Stop: String { return self._s[3502]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3504]! } + public var Notification_PassportValueAddress: String { return self._s[3505]! } + public var Month_ShortJuly: String { return self._s[3506]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3507]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3508]! } + public var Passport_Identity_ReverseSide: String { return self._s[3509]! } + public var Watch_Stickers_Recents: String { return self._s[3512]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3514]! } + public var Map_SendThisLocation: String { return self._s[3515]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3512]!, self._r[3512]!, [_0]) - } - public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3513]!, self._r[3513]!, [_0]) - } - public var ConvertToSupergroup_Note: String { return self._s[3514]! } - public var Wallet_Intro_NotNow: String { return self._s[3515]! } - public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3516]!, self._r[3516]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3517]! } + public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3517]!, self._r[3517]!, [_0]) + } + public var ConvertToSupergroup_Note: String { return self._s[3518]! } + public var Wallet_Intro_NotNow: String { return self._s[3519]! } + public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3520]!, self._r[3520]!, [_0]) + } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3521]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3518]!, self._r[3518]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3522]!, self._r[3522]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3520]! } - public var Wallpaper_SearchShort: String { return self._s[3521]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3523]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3524]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3525]! } + public var Login_CallRequestState3: String { return self._s[3524]! } + public var Wallpaper_SearchShort: String { return self._s[3525]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3527]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3528]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3529]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3526]!, self._r[3526]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3530]!, self._r[3530]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3527]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3531]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3531]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3535]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3532]!, self._r[3532]!, [_0]) + return formatWithArgumentRanges(self._s[3536]!, self._r[3536]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[3533]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3534]! } + public var Passport_CorrectErrors: String { return self._s[3537]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3538]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3535]!, self._r[3535]!, [_0]) + return formatWithArgumentRanges(self._s[3539]!, self._r[3539]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[3536]! } - public var Channel_DiscussionGroup: String { return self._s[3537]! } - public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3538]! } + public var Map_SendMyCurrentLocation: String { return self._s[3540]! } + public var Channel_DiscussionGroup: String { return self._s[3541]! } + public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3542]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3539]!, self._r[3539]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3543]!, self._r[3543]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[3540]! } - public var Permissions_NotificationsText_v0: String { return self._s[3541]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3542]! } - public var Appearance_AppIcon: String { return self._s[3543]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3544]! } - public var LoginPassword_FloodError: String { return self._s[3545]! } - public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3547]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3548]! } + public var SharedMedia_SearchNoResults: String { return self._s[3544]! } + public var Permissions_NotificationsText_v0: String { return self._s[3545]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3546]! } + public var Appearance_AppIcon: String { return self._s[3547]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3548]! } + public var LoginPassword_FloodError: String { return self._s[3549]! } + public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3551]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3552]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3549]!, self._r[3549]!, [_0]) - } - public var Passport_Language_bn: String { return self._s[3550]! } - public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3551]!, self._r[3551]!, [_0]) - } - public var ChatList_Context_Pin: String { return self._s[3552]! } - public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3553]!, self._r[3553]!, [_0]) } + public var Passport_Language_bn: String { return self._s[3554]! } + public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3555]!, self._r[3555]!, [_0]) + } + public var ChatList_Context_Pin: String { return self._s[3556]! } + public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3557]!, self._r[3557]!, [_0]) + } public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3554]!, self._r[3554]!, [_0]) + return formatWithArgumentRanges(self._s[3558]!, self._r[3558]!, [_0]) } - public var Wallet_Navigation_Close: String { return self._s[3555]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3559]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3561]! } - public var Wallet_Month_GenDecember: String { return self._s[3562]! } - public var Contacts_PermissionsAllow: String { return self._s[3563]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3564]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3565]! } - public var WallpaperPreview_Pattern: String { return self._s[3566]! } - public var Paint_Duplicate: String { return self._s[3567]! } - public var Passport_Address_Country: String { return self._s[3568]! } - public var Notification_RenamedChannel: String { return self._s[3570]! } - public var ChatList_Context_Unmute: String { return self._s[3571]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3572]! } - public var Group_MessagePhotoUpdated: String { return self._s[3573]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3574]! } - public var Conversation_ContextMenuBan: String { return self._s[3575]! } - public var TwoStepAuth_EmailSent: String { return self._s[3576]! } - public var MessagePoll_NoVotes: String { return self._s[3577]! } - public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3578]! } - public var Passport_Language_is: String { return self._s[3579]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3581]! } - public var Tour_Text5: String { return self._s[3582]! } + public var Wallet_Navigation_Close: String { return self._s[3559]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3563]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3565]! } + public var Wallet_Month_GenDecember: String { return self._s[3566]! } + public var Contacts_PermissionsAllow: String { return self._s[3567]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3568]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3569]! } + public var WallpaperPreview_Pattern: String { return self._s[3570]! } + public var Paint_Duplicate: String { return self._s[3571]! } + public var Passport_Address_Country: String { return self._s[3572]! } + public var Notification_RenamedChannel: String { return self._s[3574]! } + public var ChatList_Context_Unmute: String { return self._s[3575]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3576]! } + public var Group_MessagePhotoUpdated: String { return self._s[3577]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3578]! } + public var Conversation_ContextMenuBan: String { return self._s[3579]! } + public var TwoStepAuth_EmailSent: String { return self._s[3580]! } + public var MessagePoll_NoVotes: String { return self._s[3581]! } + public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3582]! } + public var Passport_Language_is: String { return self._s[3583]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3585]! } + public var Tour_Text5: String { return self._s[3586]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3584]!, self._r[3584]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3588]!, self._r[3588]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3585]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3586]! } + public var Undo_SecretChatDeleted: String { return self._s[3589]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3590]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3587]!, self._r[3587]!, [_0]) + return formatWithArgumentRanges(self._s[3591]!, self._r[3591]!, [_0]) } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3588]! } - public var Paint_Edit: String { return self._s[3590]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3592]! } - public var Undo_DeletedGroup: String { return self._s[3594]! } - public var LoginPassword_ForgotPassword: String { return self._s[3595]! } - public var Wallet_WordImport_IncorrectTitle: String { return self._s[3596]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3597]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3592]! } + public var Paint_Edit: String { return self._s[3594]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3596]! } + public var Undo_DeletedGroup: String { return self._s[3598]! } + public var LoginPassword_ForgotPassword: String { return self._s[3599]! } + public var Wallet_WordImport_IncorrectTitle: String { return self._s[3600]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3601]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3598]!, self._r[3598]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3602]!, self._r[3602]!, [_0, _1]) } - public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3599]! } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3600]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3601]! } - public var Passport_Language_uz: String { return self._s[3602]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3603]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3604]! } - public var Map_StopLiveLocation: String { return self._s[3606]! } - public var VoiceOver_MessageContextSend: String { return self._s[3608]! } - public var PasscodeSettings_Help: String { return self._s[3609]! } - public var NotificationsSound_Input: String { return self._s[3610]! } - public var Share_Title: String { return self._s[3613]! } - public var LogoutOptions_Title: String { return self._s[3614]! } - public var Wallet_Send_AddressText: String { return self._s[3615]! } - public var Login_TermsOfServiceAgree: String { return self._s[3616]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3617]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3618]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3619]! } - public var EnterPasscode_EnterTitle: String { return self._s[3620]! } + public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3603]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3604]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3605]! } + public var Passport_Language_uz: String { return self._s[3606]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3607]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3608]! } + public var Map_StopLiveLocation: String { return self._s[3610]! } + public var VoiceOver_MessageContextSend: String { return self._s[3612]! } + public var PasscodeSettings_Help: String { return self._s[3613]! } + public var NotificationsSound_Input: String { return self._s[3614]! } + public var Share_Title: String { return self._s[3617]! } + public var LogoutOptions_Title: String { return self._s[3618]! } + public var Wallet_Send_AddressText: String { return self._s[3619]! } + public var Login_TermsOfServiceAgree: String { return self._s[3620]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3621]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3622]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3623]! } + public var EnterPasscode_EnterTitle: String { return self._s[3624]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3621]!, self._r[3621]!, [_0]) + return formatWithArgumentRanges(self._s[3625]!, self._r[3625]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3622]! } - public var Conversation_AddToContacts: String { return self._s[3623]! } + public var Settings_CopyPhoneNumber: String { return self._s[3626]! } + public var Conversation_AddToContacts: String { return self._s[3627]! } public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3624]!, self._r[3624]!, [_0]) + return formatWithArgumentRanges(self._s[3628]!, self._r[3628]!, [_0]) } - public var NotificationsSound_Keys: String { return self._s[3625]! } + public var NotificationsSound_Keys: String { return self._s[3629]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3626]!, self._r[3626]!, [_0]) + return formatWithArgumentRanges(self._s[3630]!, self._r[3630]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3627]! } - public var Message_Video: String { return self._s[3628]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3629]! } + public var Notification_MessageLifetime1w: String { return self._s[3631]! } + public var Message_Video: String { return self._s[3632]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3633]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3630]!, self._r[3630]!, [_1]) + return formatWithArgumentRanges(self._s[3634]!, self._r[3634]!, [_1]) } - public var Wallet_Receive_AmountInfo: String { return self._s[3633]! } + public var Wallet_Receive_AmountInfo: String { return self._s[3637]! } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3634]!, self._r[3634]!, [_0]) + return formatWithArgumentRanges(self._s[3638]!, self._r[3638]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3635]!, self._r[3635]!, [_0]) + return formatWithArgumentRanges(self._s[3639]!, self._r[3639]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3636]! } + public var Passport_Language_mk: String { return self._s[3640]! } public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3637]!, self._r[3637]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3641]!, self._r[3641]!, [_1, _2, _3]) } - public var CreatePoll_CancelConfirmation: String { return self._s[3638]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3640]! } - public var PrivacyPolicy_Decline: String { return self._s[3641]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3642]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3643]! } - public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3644]! } - public var Permissions_SiriAllow_v0: String { return self._s[3646]! } - public var Wallet_Month_ShortAugust: String { return self._s[3647]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3648]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3642]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3644]! } + public var PrivacyPolicy_Decline: String { return self._s[3645]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3646]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3647]! } + public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3648]! } + public var Permissions_SiriAllow_v0: String { return self._s[3650]! } + public var Wallet_Month_ShortAugust: String { return self._s[3651]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3652]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3649]!, self._r[3649]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3653]!, self._r[3653]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3650]!, self._r[3650]!, [_0]) + return formatWithArgumentRanges(self._s[3654]!, self._r[3654]!, [_0]) } - public var Paint_Regular: String { return self._s[3651]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3652]! } - public var SocksProxySetup_ShareLink: String { return self._s[3653]! } - public var Wallet_Qr_Title: String { return self._s[3654]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3655]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3657]! } - public var Wallet_Settings_Configuration: String { return self._s[3658]! } - public var GroupInfo_InviteByLink: String { return self._s[3659]! } - public var MessageTimer_Custom: String { return self._s[3660]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3661]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3663]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3664]! } - public var VoiceOver_Chat_Selected: String { return self._s[3665]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3666]! } - public var Channel_Username_InvalidTaken: String { return self._s[3667]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3668]! } - public var Wallet_WordCheck_TryAgain: String { return self._s[3669]! } - public var Wallet_Info_TransactionPendingHeader: String { return self._s[3670]! } - public var Settings_ChatBackground: String { return self._s[3671]! } - public var Channel_Subscribers_Title: String { return self._s[3672]! } - public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3673]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3674]! } - public var Watch_ConnectionDescription: String { return self._s[3675]! } - public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3678]! } - public var IntentsSettings_SuggestBy: String { return self._s[3680]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3681]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3682]! } - public var Wallet_Send_TransactionInProgress: String { return self._s[3683]! } - public var EditProfile_Title: String { return self._s[3684]! } - public var NotificationsSound_Bamboo: String { return self._s[3686]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3688]! } - public var Login_SmsRequestState2: String { return self._s[3689]! } - public var Passport_Language_ar: String { return self._s[3690]! } + public var Paint_Regular: String { return self._s[3655]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3656]! } + public var SocksProxySetup_ShareLink: String { return self._s[3657]! } + public var Wallet_Qr_Title: String { return self._s[3658]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3659]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3661]! } + public var Wallet_Settings_Configuration: String { return self._s[3662]! } + public var GroupInfo_InviteByLink: String { return self._s[3663]! } + public var MessageTimer_Custom: String { return self._s[3664]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3665]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3667]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3668]! } + public var VoiceOver_Chat_Selected: String { return self._s[3669]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3670]! } + public var Channel_Username_InvalidTaken: String { return self._s[3671]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3672]! } + public var Wallet_WordCheck_TryAgain: String { return self._s[3673]! } + public var Wallet_Info_TransactionPendingHeader: String { return self._s[3674]! } + public var Settings_ChatBackground: String { return self._s[3675]! } + public var Channel_Subscribers_Title: String { return self._s[3676]! } + public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3677]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3678]! } + public var Watch_ConnectionDescription: String { return self._s[3679]! } + public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3682]! } + public var IntentsSettings_SuggestBy: String { return self._s[3684]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3685]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3686]! } + public var Wallet_Send_TransactionInProgress: String { return self._s[3687]! } + public var EditProfile_Title: String { return self._s[3688]! } + public var NotificationsSound_Bamboo: String { return self._s[3690]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3692]! } + public var Login_SmsRequestState2: String { return self._s[3693]! } + public var Passport_Language_ar: String { return self._s[3694]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3691]!, self._r[3691]!, [_0]) + return formatWithArgumentRanges(self._s[3695]!, self._r[3695]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3692]! } - public var Wallet_Created_Text: String { return self._s[3693]! } - public var Conversation_MessageDialogEdit: String { return self._s[3695]! } - public var Wallet_Created_Proceed: String { return self._s[3696]! } - public var Wallet_Words_Done: String { return self._s[3697]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3698]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3696]! } + public var Wallet_Created_Text: String { return self._s[3697]! } + public var Conversation_MessageDialogEdit: String { return self._s[3699]! } + public var Wallet_Created_Proceed: String { return self._s[3700]! } + public var Wallet_Words_Done: String { return self._s[3701]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3702]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3699]!, self._r[3699]!, [_1]) + return formatWithArgumentRanges(self._s[3703]!, self._r[3703]!, [_1]) } - public var Common_Close: String { return self._s[3700]! } - public var GroupInfo_PublicLink: String { return self._s[3701]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3702]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3703]! } + public var Common_Close: String { return self._s[3704]! } + public var GroupInfo_PublicLink: String { return self._s[3705]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3706]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3707]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3707]!, self._r[3707]!, [_0]) + return formatWithArgumentRanges(self._s[3711]!, self._r[3711]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3708]! } + public var UserInfo_About_Placeholder: String { return self._s[3712]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3709]!, self._r[3709]!, [_0]) - } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3710]! } - public var Channel_Info_Banned: String { return self._s[3712]! } - public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3713]!, self._r[3713]!, [_0]) } - public var Appearance_Other: String { return self._s[3714]! } - public var Passport_Language_my: String { return self._s[3715]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3716]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3714]! } + public var Channel_Info_Banned: String { return self._s[3716]! } + public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3717]!, self._r[3717]!, [_0]) + } + public var Appearance_Other: String { return self._s[3718]! } + public var Passport_Language_my: String { return self._s[3719]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3720]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3717]!, self._r[3717]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3721]!, self._r[3721]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3718]! } - public var Preview_CopyAddress: String { return self._s[3719]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3722]! } + public var Preview_CopyAddress: String { return self._s[3723]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3720]!, self._r[3720]!, [_0]) + return formatWithArgumentRanges(self._s[3724]!, self._r[3724]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3721]! } - public var UserInfo_BotSettings: String { return self._s[3722]! } - public var LiveLocation_MenuStopAll: String { return self._s[3724]! } - public var Passport_PasswordCreate: String { return self._s[3725]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3726]! } - public var Message_PinnedLocationMessage: String { return self._s[3727]! } - public var Map_Satellite: String { return self._s[3728]! } - public var Watch_Message_Unsupported: String { return self._s[3729]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3730]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3731]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3725]! } + public var UserInfo_BotSettings: String { return self._s[3726]! } + public var LiveLocation_MenuStopAll: String { return self._s[3728]! } + public var Passport_PasswordCreate: String { return self._s[3729]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3730]! } + public var Message_PinnedLocationMessage: String { return self._s[3731]! } + public var Map_Satellite: String { return self._s[3732]! } + public var Watch_Message_Unsupported: String { return self._s[3733]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3734]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3735]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3732]!, self._r[3732]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3736]!, self._r[3736]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3733]!, self._r[3733]!, [_0]) + return formatWithArgumentRanges(self._s[3737]!, self._r[3737]!, [_0]) } - public var Wallet_WordImport_Continue: String { return self._s[3734]! } + public var Wallet_WordImport_Continue: String { return self._s[3738]! } public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3735]!, self._r[3735]!, [_0]) + return formatWithArgumentRanges(self._s[3739]!, self._r[3739]!, [_0]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3736]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3737]! } - public var NotificationsSound_None: String { return self._s[3738]! } - public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3739]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3741]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3742]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3740]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3741]! } + public var NotificationsSound_None: String { return self._s[3742]! } + public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3743]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3745]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3746]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3743]!, self._r[3743]!, [_1]) + return formatWithArgumentRanges(self._s[3747]!, self._r[3747]!, [_1]) } - public var Cache_Indexing: String { return self._s[3744]! } - public var DialogList_RecentTitlePeople: String { return self._s[3746]! } - public var DialogList_EncryptionRejected: String { return self._s[3747]! } - public var GroupInfo_Administrators: String { return self._s[3748]! } - public var Passport_ScanPassportHelp: String { return self._s[3749]! } - public var Application_Name: String { return self._s[3750]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3751]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3753]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3754]! } + public var Cache_Indexing: String { return self._s[3748]! } + public var DialogList_RecentTitlePeople: String { return self._s[3750]! } + public var DialogList_EncryptionRejected: String { return self._s[3751]! } + public var GroupInfo_Administrators: String { return self._s[3752]! } + public var Passport_ScanPassportHelp: String { return self._s[3753]! } + public var Application_Name: String { return self._s[3754]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3755]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3757]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3758]! } public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3755]!, self._r[3755]!, [_0]) + return formatWithArgumentRanges(self._s[3759]!, self._r[3759]!, [_0]) } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3756]!, self._r[3756]!, [_0]) + return formatWithArgumentRanges(self._s[3760]!, self._r[3760]!, [_0]) } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3757]!, self._r[3757]!, [_0]) + return formatWithArgumentRanges(self._s[3761]!, self._r[3761]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3758]! } - public var Privacy_ChatsTitle: String { return self._s[3759]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3760]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3761]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3762]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3763]! } - public var WebBrowser_Title: String { return self._s[3764]! } - public var Group_LinkedChannel: String { return self._s[3765]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3766]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3767]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3768]! } - public var Appearance_TextSize_UseSystem: String { return self._s[3769]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3770]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3772]! } - public var Channel_Setup_TypePublic: String { return self._s[3774]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3762]! } + public var Privacy_ChatsTitle: String { return self._s[3763]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3764]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3765]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3766]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3767]! } + public var WebBrowser_Title: String { return self._s[3768]! } + public var Group_LinkedChannel: String { return self._s[3769]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3770]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3771]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3772]! } + public var Appearance_TextSize_UseSystem: String { return self._s[3773]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3774]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3776]! } + public var Channel_Setup_TypePublic: String { return self._s[3778]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3775]!, self._r[3775]!, [_0]) + return formatWithArgumentRanges(self._s[3779]!, self._r[3779]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3777]! } - public var Map_OpenInMaps: String { return self._s[3779]! } + public var Channel_TypeSetup_Title: String { return self._s[3781]! } + public var Map_OpenInMaps: String { return self._s[3783]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3780]!, self._r[3780]!, [_1]) + return formatWithArgumentRanges(self._s[3784]!, self._r[3784]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3782]! } + public var NotificationsSound_Tremolo: String { return self._s[3786]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3783]!, self._r[3783]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3787]!, self._r[3787]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3784]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3785]! } - public var Passport_PasswordHelp: String { return self._s[3786]! } - public var Login_CodeExpiredError: String { return self._s[3787]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3788]! } - public var Conversation_TitleUnmute: String { return self._s[3789]! } - public var Passport_Identity_ScansHelp: String { return self._s[3790]! } - public var Passport_Language_lo: String { return self._s[3791]! } - public var Camera_FlashAuto: String { return self._s[3792]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3793]! } - public var Common_Cancel: String { return self._s[3794]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3795]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3796]! } - public var Appearance_TintAllColors: String { return self._s[3797]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3788]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3789]! } + public var Passport_PasswordHelp: String { return self._s[3790]! } + public var Login_CodeExpiredError: String { return self._s[3791]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3792]! } + public var Conversation_TitleUnmute: String { return self._s[3793]! } + public var Passport_Identity_ScansHelp: String { return self._s[3794]! } + public var Passport_Language_lo: String { return self._s[3795]! } + public var Camera_FlashAuto: String { return self._s[3796]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3797]! } + public var Common_Cancel: String { return self._s[3798]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3799]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3800]! } + public var Appearance_TintAllColors: String { return self._s[3801]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3798]!, self._r[3798]!, [_1]) + return formatWithArgumentRanges(self._s[3802]!, self._r[3802]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3799]! } - public var ChatSettings_Title: String { return self._s[3801]! } - public var Passport_PasswordReset: String { return self._s[3802]! } - public var SocksProxySetup_TypeNone: String { return self._s[3803]! } - public var EditTheme_Title: String { return self._s[3805]! } - public var PhoneNumberHelp_Help: String { return self._s[3806]! } - public var Checkout_EnterPassword: String { return self._s[3807]! } - public var Share_AuthTitle: String { return self._s[3809]! } - public var Activity_UploadingDocument: String { return self._s[3810]! } - public var State_Connecting: String { return self._s[3811]! } - public var Profile_MessageLifetime1w: String { return self._s[3812]! } - public var Conversation_ContextMenuReport: String { return self._s[3813]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3814]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3815]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3803]! } + public var ChatSettings_Title: String { return self._s[3805]! } + public var Passport_PasswordReset: String { return self._s[3806]! } + public var SocksProxySetup_TypeNone: String { return self._s[3807]! } + public var EditTheme_Title: String { return self._s[3809]! } + public var PhoneNumberHelp_Help: String { return self._s[3810]! } + public var Checkout_EnterPassword: String { return self._s[3811]! } + public var Share_AuthTitle: String { return self._s[3813]! } + public var Activity_UploadingDocument: String { return self._s[3814]! } + public var State_Connecting: String { return self._s[3815]! } + public var Profile_MessageLifetime1w: String { return self._s[3816]! } + public var Conversation_ContextMenuReport: String { return self._s[3817]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3818]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3819]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3816]!, self._r[3816]!, [_0]) + return formatWithArgumentRanges(self._s[3820]!, self._r[3820]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3817]! } - public var Wallet_WordImport_CanNotRemember: String { return self._s[3818]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3820]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3821]! } - public var PhotoEditor_Set: String { return self._s[3822]! } - public var EmptyGroupInfo_Title: String { return self._s[3823]! } - public var Login_PadPhoneHelp: String { return self._s[3824]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3826]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3828]! } - public var NotificationsSound_Complete: String { return self._s[3829]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3830]! } - public var Group_Info_AdminLog: String { return self._s[3831]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3832]! } + public var AuthSessions_Terminate: String { return self._s[3821]! } + public var Wallet_WordImport_CanNotRemember: String { return self._s[3822]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3824]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3825]! } + public var PhotoEditor_Set: String { return self._s[3826]! } + public var EmptyGroupInfo_Title: String { return self._s[3827]! } + public var Login_PadPhoneHelp: String { return self._s[3828]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3830]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3832]! } + public var NotificationsSound_Complete: String { return self._s[3833]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3834]! } + public var Group_Info_AdminLog: String { return self._s[3835]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3836]! } public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3833]!, self._r[3833]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3837]!, self._r[3837]!, [_1, _2, _3]) } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3834]! } - public var Group_Location_CreateInThisPlace: String { return self._s[3836]! } - public var Conversation_Admin: String { return self._s[3837]! } - public var Conversation_GifTooltip: String { return self._s[3838]! } - public var Passport_NotLoggedInMessage: String { return self._s[3839]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3838]! } + public var Group_Location_CreateInThisPlace: String { return self._s[3840]! } + public var Conversation_Admin: String { return self._s[3841]! } + public var Conversation_GifTooltip: String { return self._s[3842]! } + public var Passport_NotLoggedInMessage: String { return self._s[3843]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3841]!, self._r[3841]!, [_0]) + return formatWithArgumentRanges(self._s[3845]!, self._r[3845]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3842]! } - public var SharedMedia_EmptyTitle: String { return self._s[3844]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3846]! } - public var Username_Help: String { return self._s[3847]! } - public var DialogList_LanguageTooltip: String { return self._s[3849]! } - public var Map_LoadError: String { return self._s[3850]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3851]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3852]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3853]! } - public var Notification_Exceptions_NewException: String { return self._s[3854]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3855]! } - public var WatchRemote_AlertText: String { return self._s[3856]! } + public var Profile_MessageLifetimeForever: String { return self._s[3846]! } + public var SharedMedia_EmptyTitle: String { return self._s[3848]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3850]! } + public var Username_Help: String { return self._s[3851]! } + public var DialogList_LanguageTooltip: String { return self._s[3853]! } + public var Map_LoadError: String { return self._s[3854]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3855]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3856]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3857]! } + public var Notification_Exceptions_NewException: String { return self._s[3858]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3859]! } + public var WatchRemote_AlertText: String { return self._s[3860]! } public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3857]!, self._r[3857]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3861]!, self._r[3861]!, [_1, _2, _3]) } - public var ChatSettings_ConnectionType_Title: String { return self._s[3861]! } - public var WebBrowser_DefaultBrowser: String { return self._s[3862]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3865]! } + public var WebBrowser_DefaultBrowser: String { return self._s[3866]! } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3863]!, self._r[3863]!, [_0]) + return formatWithArgumentRanges(self._s[3867]!, self._r[3867]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3864]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3865]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3868]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3869]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3866]!, self._r[3866]!, [_0]) + return formatWithArgumentRanges(self._s[3870]!, self._r[3870]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3867]!, self._r[3867]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3871]!, self._r[3871]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3868]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3869]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3871]! } - public var Wallet_Created_ExportErrorText: String { return self._s[3872]! } - public var ChatList_UndoArchiveText1: String { return self._s[3873]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3874]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3875]! } - public var Cache_ClearNone: String { return self._s[3876]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3877]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3878]! } + public var Group_AdminLog_EmptyText: String { return self._s[3872]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3873]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3875]! } + public var Wallet_Created_ExportErrorText: String { return self._s[3876]! } + public var ChatList_UndoArchiveText1: String { return self._s[3877]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3878]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3879]! } + public var Cache_ClearNone: String { return self._s[3880]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3881]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3882]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3879]!, self._r[3879]!, [_0]) + return formatWithArgumentRanges(self._s[3883]!, self._r[3883]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[3880]! } + public var Passport_Identity_Country: String { return self._s[3884]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3881]!, self._r[3881]!, [_0]) + return formatWithArgumentRanges(self._s[3885]!, self._r[3885]!, [_0]) } public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3882]!, self._r[3882]!, [_0]) + return formatWithArgumentRanges(self._s[3886]!, self._r[3886]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3883]! } - public var AccessDenied_Settings: String { return self._s[3884]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3885]! } - public var Month_ShortMay: String { return self._s[3886]! } - public var Compose_NewGroup: String { return self._s[3888]! } - public var Group_Setup_TypePrivate: String { return self._s[3890]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3892]! } - public var Appearance_ThemeDayClassic: String { return self._s[3893]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3894]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3895]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3896]! } - public var Conversation_typing: String { return self._s[3898]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[3899]! } - public var Paint_Masks: String { return self._s[3900]! } - public var Contacts_DeselectAll: String { return self._s[3901]! } + public var Exceptions_AddToExceptions: String { return self._s[3887]! } + public var AccessDenied_Settings: String { return self._s[3888]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3889]! } + public var Month_ShortMay: String { return self._s[3890]! } + public var Compose_NewGroup: String { return self._s[3892]! } + public var Group_Setup_TypePrivate: String { return self._s[3894]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3896]! } + public var Appearance_ThemeDayClassic: String { return self._s[3897]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3898]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3899]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3900]! } + public var Conversation_typing: String { return self._s[3902]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[3903]! } + public var Paint_Masks: String { return self._s[3904]! } + public var Contacts_DeselectAll: String { return self._s[3905]! } public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3902]!, self._r[3902]!, [_0]) + return formatWithArgumentRanges(self._s[3906]!, self._r[3906]!, [_0]) } - public var Username_InvalidTaken: String { return self._s[3903]! } - public var Call_StatusNoAnswer: String { return self._s[3904]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3905]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3906]! } - public var Passport_Identity_Selfie: String { return self._s[3907]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3908]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3909]! } - public var Conversation_ClearSecretHistory: String { return self._s[3910]! } - public var PeopleNearby_Description: String { return self._s[3912]! } - public var NetworkUsageSettings_Title: String { return self._s[3913]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3915]! } + public var Username_InvalidTaken: String { return self._s[3907]! } + public var Call_StatusNoAnswer: String { return self._s[3908]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[3909]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3910]! } + public var Passport_Identity_Selfie: String { return self._s[3911]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[3912]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3913]! } + public var Conversation_ClearSecretHistory: String { return self._s[3914]! } + public var PeopleNearby_Description: String { return self._s[3916]! } + public var NetworkUsageSettings_Title: String { return self._s[3917]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3919]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3917]!, self._r[3917]!, [_0]) + return formatWithArgumentRanges(self._s[3921]!, self._r[3921]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3918]!, self._r[3918]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3922]!, self._r[3922]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[3920]! } - public var VoiceOver_Navigation_Search: String { return self._s[3921]! } - public var Map_LiveLocationTitle: String { return self._s[3922]! } - public var Login_InfoAvatarAdd: String { return self._s[3923]! } - public var Passport_Identity_FilesView: String { return self._s[3924]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[3925]! } - public var Privacy_Calls_NeverAllow: String { return self._s[3926]! } - public var VoiceOver_Chat_File: String { return self._s[3927]! } - public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3928]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[3924]! } + public var VoiceOver_Navigation_Search: String { return self._s[3925]! } + public var Map_LiveLocationTitle: String { return self._s[3926]! } + public var Login_InfoAvatarAdd: String { return self._s[3927]! } + public var Passport_Identity_FilesView: String { return self._s[3928]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[3929]! } + public var Privacy_Calls_NeverAllow: String { return self._s[3930]! } + public var VoiceOver_Chat_File: String { return self._s[3931]! } + public var Wallet_Settings_DeleteWalletInfo: String { return self._s[3932]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3929]!, self._r[3929]!, [_0]) + return formatWithArgumentRanges(self._s[3933]!, self._r[3933]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[3930]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[3931]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3932]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[3934]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[3935]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3936]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3933]!, self._r[3933]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3937]!, self._r[3937]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3934]! } - public var Wallet_Intro_CreateErrorText: String { return self._s[3935]! } - public var Tour_Title2: String { return self._s[3936]! } - public var Wallet_Sent_ViewWallet: String { return self._s[3937]! } - public var Conversation_FileOpenIn: String { return self._s[3938]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3939]! } - public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3940]! } - public var Wallpaper_Set: String { return self._s[3941]! } - public var Passport_Identity_Translations: String { return self._s[3943]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3938]! } + public var Wallet_Intro_CreateErrorText: String { return self._s[3939]! } + public var Tour_Title2: String { return self._s[3940]! } + public var Wallet_Sent_ViewWallet: String { return self._s[3941]! } + public var Conversation_FileOpenIn: String { return self._s[3942]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3943]! } + public var Wallet_Send_ErrorInvalidAddress: String { return self._s[3944]! } + public var Wallpaper_Set: String { return self._s[3945]! } + public var Passport_Identity_Translations: String { return self._s[3947]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3944]!, self._r[3944]!, [_0]) + return formatWithArgumentRanges(self._s[3948]!, self._r[3948]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[3945]! } + public var Channel_LeaveChannel: String { return self._s[3949]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3946]!, self._r[3946]!, [_1]) + return formatWithArgumentRanges(self._s[3950]!, self._r[3950]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3948]! } - public var PhotoEditor_HighlightsTint: String { return self._s[3949]! } - public var Passport_Email_Delete: String { return self._s[3950]! } - public var Conversation_Mute: String { return self._s[3952]! } - public var Channel_AddBotAsAdmin: String { return self._s[3953]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[3955]! } - public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[3956]! } - public var ChatSettings_IntentsSettings: String { return self._s[3958]! } - public var Channel_Management_LabelOwner: String { return self._s[3959]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3952]! } + public var PhotoEditor_HighlightsTint: String { return self._s[3953]! } + public var Passport_Email_Delete: String { return self._s[3954]! } + public var Conversation_Mute: String { return self._s[3956]! } + public var Channel_AddBotAsAdmin: String { return self._s[3957]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[3959]! } + public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[3960]! } + public var ChatSettings_IntentsSettings: String { return self._s[3962]! } + public var Channel_Management_LabelOwner: String { return self._s[3963]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3960]!, self._r[3960]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3964]!, self._r[3964]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[3961]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[3962]! } - public var Common_No: String { return self._s[3963]! } - public var Weekday_Sunday: String { return self._s[3964]! } - public var Notification_Reply: String { return self._s[3965]! } - public var Conversation_ViewMessage: String { return self._s[3966]! } + public var Calls_CallTabDescription: String { return self._s[3965]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[3966]! } + public var Common_No: String { return self._s[3967]! } + public var Weekday_Sunday: String { return self._s[3968]! } + public var Notification_Reply: String { return self._s[3969]! } + public var Conversation_ViewMessage: String { return self._s[3970]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3967]!, self._r[3967]!, [_0]) + return formatWithArgumentRanges(self._s[3971]!, self._r[3971]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3968]!, self._r[3968]!, [_0]) + return formatWithArgumentRanges(self._s[3972]!, self._r[3972]!, [_0]) } public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3969]!, self._r[3969]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3973]!, self._r[3973]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3970]! } - public var Wallet_Send_Title: String { return self._s[3971]! } - public var Message_PinnedDocumentMessage: String { return self._s[3972]! } - public var Wallet_Info_RefreshErrorText: String { return self._s[3973]! } - public var DialogList_TabTitle: String { return self._s[3975]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[3976]! } - public var Passport_FieldEmail: String { return self._s[3977]! } - public var Conversation_UnpinMessageAlert: String { return self._s[3978]! } - public var Passport_Address_TypeBankStatement: String { return self._s[3979]! } - public var Wallet_SecureStorageReset_Title: String { return self._s[3980]! } - public var Passport_Identity_ExpiryDate: String { return self._s[3981]! } - public var Privacy_Calls_P2P: String { return self._s[3982]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3974]! } + public var Wallet_Send_Title: String { return self._s[3975]! } + public var Message_PinnedDocumentMessage: String { return self._s[3976]! } + public var Wallet_Info_RefreshErrorText: String { return self._s[3977]! } + public var DialogList_TabTitle: String { return self._s[3979]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[3980]! } + public var Passport_FieldEmail: String { return self._s[3981]! } + public var Conversation_UnpinMessageAlert: String { return self._s[3982]! } + public var Passport_Address_TypeBankStatement: String { return self._s[3983]! } + public var Wallet_SecureStorageReset_Title: String { return self._s[3984]! } + public var Passport_Identity_ExpiryDate: String { return self._s[3985]! } + public var Privacy_Calls_P2P: String { return self._s[3986]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3984]!, self._r[3984]!, [_0]) + return formatWithArgumentRanges(self._s[3988]!, self._r[3988]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[3985]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[3989]! } public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3986]!, self._r[3986]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3990]!, self._r[3990]!, [_1, _2]) } - public var Stickers_ClearRecent: String { return self._s[3987]! } - public var EnterPasscode_ChangeTitle: String { return self._s[3988]! } - public var TwoFactorSetup_Email_Title: String { return self._s[3989]! } - public var Passport_InfoText: String { return self._s[3990]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3991]! } + public var Stickers_ClearRecent: String { return self._s[3991]! } + public var EnterPasscode_ChangeTitle: String { return self._s[3992]! } + public var TwoFactorSetup_Email_Title: String { return self._s[3993]! } + public var Passport_InfoText: String { return self._s[3994]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3995]! } public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3992]!, self._r[3992]!, [_0]) + return formatWithArgumentRanges(self._s[3996]!, self._r[3996]!, [_0]) } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3993]!, self._r[3993]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3997]!, self._r[3997]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3994]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[3995]! } - public var VoiceOver_Navigation_Compose: String { return self._s[3996]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[3997]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[3999]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4000]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3998]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[3999]! } + public var VoiceOver_Navigation_Compose: String { return self._s[4000]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[4001]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[4003]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4004]! } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4001]!, self._r[4001]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4005]!, self._r[4005]!, [_1, _2]) } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4003]! } - public var ChatSettings_OpenLinksIn: String { return self._s[4004]! } - public var Map_HomeAndWorkTitle: String { return self._s[4005]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4007]! } + public var ChatSettings_OpenLinksIn: String { return self._s[4008]! } + public var Map_HomeAndWorkTitle: String { return self._s[4009]! } public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4007]!, self._r[4007]!, [_0]) + return formatWithArgumentRanges(self._s[4011]!, self._r[4011]!, [_0]) } - public var DialogList_Unread: String { return self._s[4008]! } + public var DialogList_Unread: String { return self._s[4012]! } public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4009]!, self._r[4009]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4013]!, self._r[4013]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[4010]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4011]! } + public var User_DeletedAccount: String { return self._s[4014]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4015]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4012]!, self._r[4012]!, [_0]) + return formatWithArgumentRanges(self._s[4016]!, self._r[4016]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[4013]! } - public var SharedMedia_CategoryMedia: String { return self._s[4014]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4015]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4016]! } - public var Watch_ChatList_Compose: String { return self._s[4017]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4018]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[4019]! } - public var Watch_Microphone_Access: String { return self._s[4020]! } - public var Group_Setup_HistoryHeader: String { return self._s[4021]! } - public var Map_SetThisLocation: String { return self._s[4022]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4023]! } - public var Activity_UploadingPhoto: String { return self._s[4024]! } - public var Conversation_Edit: String { return self._s[4026]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[4027]! } - public var Login_TermsOfServiceDecline: String { return self._s[4028]! } - public var Message_PinnedContactMessage: String { return self._s[4029]! } + public var UserInfo_NotificationsDefault: String { return self._s[4017]! } + public var SharedMedia_CategoryMedia: String { return self._s[4018]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4019]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4020]! } + public var Watch_ChatList_Compose: String { return self._s[4021]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4022]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[4023]! } + public var Watch_Microphone_Access: String { return self._s[4024]! } + public var Group_Setup_HistoryHeader: String { return self._s[4025]! } + public var Map_SetThisLocation: String { return self._s[4026]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4027]! } + public var Activity_UploadingPhoto: String { return self._s[4028]! } + public var Conversation_Edit: String { return self._s[4030]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[4031]! } + public var Login_TermsOfServiceDecline: String { return self._s[4032]! } + public var Message_PinnedContactMessage: String { return self._s[4033]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4030]!, self._r[4030]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4034]!, self._r[4034]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4031]!, self._r[4031]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[4035]!, self._r[4035]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[4032]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[4034]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4035]! } + public var Appearance_LargeEmoji: String { return self._s[4036]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[4038]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4039]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4036]!, self._r[4036]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4040]!, self._r[4040]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[4037]! } - public var Message_PinnedPhotoMessage: String { return self._s[4038]! } - public var Passport_FieldPhone: String { return self._s[4039]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4040]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[4041]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[4043]! } - public var Conversation_Call: String { return self._s[4044]! } - public var Common_TakePhoto: String { return self._s[4046]! } - public var Group_EditAdmin_RankTitle: String { return self._s[4047]! } - public var Wallet_Receive_CommentHeader: String { return self._s[4048]! } - public var Channel_NotificationLoading: String { return self._s[4049]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[4041]! } + public var Message_PinnedPhotoMessage: String { return self._s[4042]! } + public var Passport_FieldPhone: String { return self._s[4043]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4044]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[4045]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[4047]! } + public var Conversation_Call: String { return self._s[4048]! } + public var Common_TakePhoto: String { return self._s[4050]! } + public var Group_EditAdmin_RankTitle: String { return self._s[4051]! } + public var Wallet_Receive_CommentHeader: String { return self._s[4052]! } + public var Channel_NotificationLoading: String { return self._s[4053]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4050]!, self._r[4050]!, [_0]) - } - public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4051]!, self._r[4051]!, [_0]) - } - public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4052]!, self._r[4052]!, [_1]) - } - public var Permissions_SiriTitle_v0: String { return self._s[4053]! } - public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4054]!, self._r[4054]!, [_0]) } - public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4055]!, self._r[4055]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[4056]! } - public var Wallet_Info_ReceiveGrams: String { return self._s[4057]! } - public var ClearCache_FreeSpace: String { return self._s[4058]! } - public var Common_edit: String { return self._s[4059]! } - public var PrivacySettings_AuthSessions: String { return self._s[4060]! } - public var Month_ShortJune: String { return self._s[4061]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4062]! } - public var Call_ReportSend: String { return self._s[4063]! } - public var Watch_LastSeen_JustNow: String { return self._s[4064]! } - public var Notifications_MessageNotifications: String { return self._s[4065]! } - public var WallpaperSearch_ColorGreen: String { return self._s[4066]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[4068]! } - public var Group_Status: String { return self._s[4069]! } + public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4056]!, self._r[4056]!, [_1]) + } + public var Permissions_SiriTitle_v0: String { return self._s[4057]! } + public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4058]!, self._r[4058]!, [_0]) + } + public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4059]!, self._r[4059]!, [_0]) + } + public var Channel_MessagePhotoRemoved: String { return self._s[4060]! } + public var Wallet_Info_ReceiveGrams: String { return self._s[4061]! } + public var ClearCache_FreeSpace: String { return self._s[4062]! } + public var Common_edit: String { return self._s[4063]! } + public var PrivacySettings_AuthSessions: String { return self._s[4064]! } + public var Month_ShortJune: String { return self._s[4065]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4066]! } + public var Call_ReportSend: String { return self._s[4067]! } + public var Watch_LastSeen_JustNow: String { return self._s[4068]! } + public var Notifications_MessageNotifications: String { return self._s[4069]! } + public var WallpaperSearch_ColorGreen: String { return self._s[4070]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[4072]! } + public var Group_Status: String { return self._s[4073]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4070]!, self._r[4070]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4074]!, self._r[4074]!, [_0, _1]) } - public var TextFormat_AddLinkTitle: String { return self._s[4071]! } - public var ShareMenu_ShareTo: String { return self._s[4072]! } - public var Conversation_Moderate_Ban: String { return self._s[4073]! } + public var TextFormat_AddLinkTitle: String { return self._s[4075]! } + public var ShareMenu_ShareTo: String { return self._s[4076]! } + public var Conversation_Moderate_Ban: String { return self._s[4077]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4074]!, self._r[4074]!, [_0]) + return formatWithArgumentRanges(self._s[4078]!, self._r[4078]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[4075]! } - public var Map_LiveLocationFor8Hours: String { return self._s[4076]! } + public var SharedMedia_ViewInChat: String { return self._s[4079]! } + public var Map_LiveLocationFor8Hours: String { return self._s[4080]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4077]!, self._r[4077]!, [_1]) + return formatWithArgumentRanges(self._s[4081]!, self._r[4081]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4078]!, self._r[4078]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4082]!, self._r[4082]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4080]!, self._r[4080]!, [_0]) + return formatWithArgumentRanges(self._s[4084]!, self._r[4084]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[4081]! } - public var Appearance_ReduceMotion: String { return self._s[4082]! } + public var Map_OpenInHereMaps: String { return self._s[4085]! } + public var Appearance_ReduceMotion: String { return self._s[4086]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4083]!, self._r[4083]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4087]!, self._r[4087]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[4084]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[4085]! } - public var PhotoEditor_Skip: String { return self._s[4086]! } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ChatList_DeletedChats(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[4088]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[4089]! } + public var PhotoEditor_Skip: String { return self._s[4090]! } + public func Media_ShareItem(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) } - public func Media_ShareVideo(_ value: Int32) -> String { + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Minutes(_ value: Int32) -> String { + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) } - public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_SelectedChats(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_File(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ForwardedVideos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Theme_UsersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Contacts_ImportersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Generic(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortHours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Weeks(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Seconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_SharePhoto(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_UserInfo_Mute(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteFor_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedGifs(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_StickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessagePoll_VotedCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortSeconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Photo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPolls(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Video(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) - } - public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, _0, _1) - } public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessageTimer_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideoMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_Exceptions(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_SelectedMessages(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, _2, _1, _3) } public func ForwardedStickers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { + public func SharedMedia_Generic(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) } - public func UserCount(_ value: Int32) -> String { + public func ForwardedPolls(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func MuteExpires_Hours(_ value: Int32) -> String { + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) } - public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { + public func SharedMedia_File(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedMessages(_ value: Int32) -> String { + public func Invitation_Members(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) - } - public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) } public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortDays(_ value: Int32) -> String { + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func Media_SharePhoto(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Contacts_ImportersCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) } public func Call_ShortMinutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + public func Conversation_StatusOnline(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_Exceptions(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_SelectedMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAMinutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Weeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Contacts_InviteContacts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ChatList_DeletedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func MuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessagePoll_VotedCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) } public func MessageTimer_Months(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedFiles(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAudios(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareVideo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortSeconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Passport_Scans(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue) } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + public func Conversation_StatusSubscribers(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, _2, _1, _3) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, _1, _2) } public func StickerPack_AddStickerCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) } - public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + public func MessageTimer_ShortDays(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Seconds(_ value: Int32) -> String { + public func AttachmentMenu_SendItem(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_Link(_ value: Int32) -> String { + public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func InviteText_ContactsCountText(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPhotos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusOnline(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) } public func ForwardedLocations(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAudios(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusMembers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallet_Updated_HoursAgo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) - } - public func QuickSend_Photos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Years(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Invitation_Members(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareItem(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func AttachmentMenu_SendGif(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) - } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Contacts_InviteContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAHours(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAMinutes(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteFor_Days(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) } public func LastSeen_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Link(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedPhotos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedContacts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) + } + public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Theme_UsersCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) + } + public func QuickSend_Photos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_SelectedChats(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func StickerPack_StickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideoMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusMembers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Video(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreExtended(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendGif(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LastSeen_HoursAgo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddMaskCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedFiles(_ value: Int32) -> String { + public func MessageTimer_Years(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue) } - public func Passport_Scans(_ value: Int32) -> String { + public func ForwardedGifs(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, stringValue) } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + public func UserCount(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue) diff --git a/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift b/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift index a74f121ba2..b0918ec960 100644 --- a/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift +++ b/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift @@ -29,6 +29,15 @@ public extension TelegramWallpaper { } } + var isPattern: Bool { + switch self { + case let .file(file): + return file.isPattern + default: + return false + } + } + var isBuiltin: Bool { switch self { case .builtin: diff --git a/submodules/TelegramUI/Images.xcassets/Settings/ThemeColorSwapIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Settings/ThemeColorSwapIcon.imageset/Contents.json new file mode 100644 index 0000000000..8dec65adad --- /dev/null +++ b/submodules/TelegramUI/Images.xcassets/Settings/ThemeColorSwapIcon.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_input_change.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Settings/ThemeColorSwapIcon.imageset/ic_input_change.pdf b/submodules/TelegramUI/Images.xcassets/Settings/ThemeColorSwapIcon.imageset/ic_input_change.pdf new file mode 100644 index 0000000000000000000000000000000000000000..6151d0db8b2a6465012ae0487ec5a59ee9b77cbb GIT binary patch literal 4296 zcmai&2UJr_x5p`w5|E-4LDVBsr6nW*qS8xfN=G_`ByeVhrwfUfSerI)5`;g zb_M%U;tUntPC^-~m+}fn4k9IbN|+(K1wjTt&p~jXI}RV!N}EaGOTEXnoB#A~ zT%JBE$*7}DJ3(lLzEit+ZO_VUI3Z$~A#(O|wE7p5Wm*qo24>#E;aDS>xn`MjX!83Z zx`?!D#5i&ITrkZnMS(#8)k#+8zPyTt`mKZbJ{qFrrkfGAT!>H#A5tt3)02fn5GS)D zOhY)Tj+$e>m-iY6*>=4MI7&^tU0>v>J~xAB6f{Pq?w13{X1c^4qTsK$b{t9`jyuI6 zDUp%K9$o8=(riW_fTND@$5?VT-AE*$K>9e^$pT-pKVbw`JCEyWueT% z^_9*_x>tP>2b8ZrYJX@m-?6khpd5>%TLt6Xu)oAb9vy1(P>4U?NciF8;ZX7qxf)(~ z#{m+$X!{>e51gA90Q)IjeVixW+XI911f+f%l<{s}a2@cbiU(&eV>K z+OGtRG*IY%yA68gWkMMQ&oyCNUTCv8cD%RaE7b`WN+uJ^)=4`%5Ncb6YVcc=YCy6TAfY8Y$c>sE`nIbG129@N< zrOzwpo$9D^*(#bAX?&iRD)2d%+q94CDLgx-QFlCpe=i;!mrT&a}+32!?uuh zB+ZdD+he!8Mljg1g^DD%U!IKc(!RIvCVK`M% zVNs!$%FCCGOsPcd{#TZRsaB-ptLN>a_i|b}*FtBF^k$RkLn0j-LoWrJ#EWCWA%R1a zfhVK{X}NA?IkP!*cn!L8Tgsir0(7W7o~KwE&r!gft~AVY(v0r9vZAgG8+E60WIRiv!p>`f;uGiZl;$ey%5I+X z;%=a`yt8|s_B8;f*{2K$VNIhNKp%Ze@g!)p`XUb<>RInc6+iZSw4AN)CpGIh}FsSl~&q8BgnFm<Qd(hX4ws%0LDX$)FuKRPL}=J)jcINQo?<~Gk& z+nZ;b!GS!1rzhghbhQY^)0=^uZ!@303-Gz{8M1KG&Cu|%ONS%6KkyMu8 zoU)MW&##j_lIojkEuJH2eKt_@d*Qb_D!n#^HiO{&YU5nB$(m=fp&F_gc`3FLwi&jO zws$@uI`#OUCI%1JTu$0 zNsr^lnUjP_JS1)s;e|fUGlid@ohyXm#*ZIA!O&+xeR* zyeW1mlqqqg+D7;xwxO(2*HWE9h?9U5+G*5jZ%Di>mRLme%_e49!w)`x3!krUh`dp^ z>-434UUoi-JA=EKn~U3sI~CrA;L32zc%DJZn1OfKIG8a!2APq}W*%EXQqq@S8rty_ zqLH~3l}klp{c;6kWwI5RVuFc%{uM&samz$;b7{p|i&_I;B^@mZ6A9}oy_H-!y_|}i zf)-SZdEkrI*T6fQXvNI7;@qg*7IZc`e-d-9G@-2je7;%!#V#4llWS3Ha#Q94)sa~m zi5jubFB`la95=LSAl48Wou?fH;AM!$?!4*`rl#d;!}pQxmwImIU(ehTVUUeBiO%8} z||ZvTFex!pugb50ga-GEYm*W zzN3Bl42+zsoP%N~Jo>Lq*70~Gh-1ZLto__`2aVpROqnh0zPvmVJLA*g+A;Q4c67gP zPlQ>EIRO>jom`YO!%bwcib$=xnsBwMHu0Y$m7pSNZOT~*7d$5&`45a_+H{nm&i=)n&md`TLLIG%pH(lH-%}g<&QAC9fPqYPM?zl=#t6)gqQKS-~cWc6dHS zx#5N5(6Z6-Jca%QZ6QxnyT-J?zH5I`kKxPYzhlZkaC$UukHY1=(0j=`z4?} z=Nr%WZXxUtzTWoDKHtN>wIPeT#aP$qbAKNC)7~Ue8GG$cU;DF)4YG}Qr5ff_aiM6u7LxTvDBTka;MpNo(A@O z)pf2=bnQfcm@IE6F67NOwAcq)2dXTouO$#sp{NJl&*Hp?E)I@J7fUBgJ&R53dN_5h z8^8bYi?aXmvN>H?e*HE`<}7mUQ}_0nm2AdKqt~MXO6LUkbGDwmHj6UL9sV#J`J_O~ z(O=ttVlHSP>r~$q=drYtfOM;TNuY$u-n` zev?&MT{+$xoLXhIR_{^rzG?59QEHieCDQU@KvqE0QrLd%@ae|vyVi@h9OoXdxHiqX z6ZY>;Rs7X_Bw%LOa!+D>t092&*Fn}v>S&tXW$|YJ1FH|Ra{=S~{j?>_R`M@z$m~1p zV-~0K1i?DzvrFYG_J_7d>`Iz87w?bQ5D5|Xabb1J5(g7DbJhHOp@W@8|AeHoFt%7In6DQgUMDeQ(l#TlW)iwVR&!8nUtXZ+zq& z1(o~_yodaHXd^?ehO)8}+7pKb4gpplu>9?E2+_Zp_;1Gc1SBrwu#RXYydPi=A-lj1 z`wvL=CX+W5kkE3(dXnM!5Yfre{s3g?q5D50Dxt@N~qx0Z@oI6aiQWDS11(U;!vnQ3@hyAq?nwqdmNC0Azyy0sVen z!enqKUs=7#YgEV-4i-|mAPIpYp-?CS3X_CFpk@$=Ai0zMF5|I>F2Miq^7j_~JaBek z2mpnGA^+O|DFgzB0PKKYHkdSme8D(ufZJ~yL>fZQ%Rg-}DM|8O=bttRM3Q`x|6!9t zl8^E~Y|=9Sj)(X^{A3X1-2Zbe3?comcraU22( literal 0 HcmV?d00001 diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift index 6056cd9f7c..fb82c397ad 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAttachedContentNode.swift @@ -487,7 +487,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode { let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, wallpaper, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode) initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right refineContentImageLayout = refineLayout - if case let .file(_, _, isTheme, _) = wallpaper.content, isTheme { + if case let .file(_, _, _, _, isTheme, _) = wallpaper.content, isTheme { skipStandardStatus = true } } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift index 8afa4ac59b..54a8e8c452 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaNode.swift @@ -303,7 +303,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio unboundSize = CGSize(width: floor(dimensions.cgSize.width * 0.5), height: floor(dimensions.cgSize.height * 0.5)) } else if let wallpaper = media as? WallpaperPreviewMedia { switch wallpaper.content { - case let .file(file, _, isTheme, isSupported): + case let .file(file, _, _, _, isTheme, isSupported): if let thumbnail = file.previewRepresentations.first, var dimensions = file.dimensions { let dimensionsVertical = dimensions.width < dimensions.height let thumbnailVertical = thumbnail.dimensions.width < thumbnail.dimensions.height @@ -433,13 +433,19 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio var onlyFullSizeVideoThumbnail: Bool? var emptyColor: UIColor + var patternArguments: PatternWallpaperArguments? if isSticker { emptyColor = .clear } else { emptyColor = message.effectivelyIncoming(context.account.peerId) ? theme.chat.message.incoming.mediaPlaceholderColor : theme.chat.message.outgoing.mediaPlaceholderColor } - if let wallpaper = media as? WallpaperPreviewMedia, case let .file(_, patternColor, _, _) = wallpaper.content { - emptyColor = patternColor ?? UIColor(rgb: 0xd6e2ee, alpha: 0.5) + if let wallpaper = media as? WallpaperPreviewMedia, case let .file(_, patternColor, patternBottomColor, rotation, _, _) = wallpaper.content { + var colors: [UIColor] = [] + colors.append(patternColor ?? UIColor(rgb: 0xd6e2ee, alpha: 0.5)) + if let patternBottomColor = patternBottomColor { + colors.append(patternBottomColor) + } + patternArguments = PatternWallpaperArguments(colors: colors, rotation: rotation) } if mediaUpdated || isSendingUpdated || automaticPlaybackUpdated { @@ -572,7 +578,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } else if let wallpaper = media as? WallpaperPreviewMedia { updateImageSignal = { synchronousLoad in switch wallpaper.content { - case let .file(file, _, isTheme, _): + case let .file(file, _, _, _, isTheme, _): if isTheme { return themeImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: FileMediaReference.message(message: MessageReference(message), media: file)) } else { @@ -585,12 +591,12 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } case let .color(color): return solidColorImage(color) - case let .gradient(topColor, bottomColor): - return gradientImage([topColor, bottomColor]) + case let .gradient(topColor, bottomColor, rotation): + return gradientImage([topColor, bottomColor], rotation: rotation ?? 0) } } - if case let .file(file, _, _, _) = wallpaper.content { + if case let .file(file, _, _, _, _, _) = wallpaper.content { updatedFetchControls = FetchControls(fetch: { manual in if let strongSelf = self { strongSelf.fetchDisposable.set(messageMediaFileInteractiveFetched(context: context, message: message, file: file, userInitiated: manual).start()) @@ -634,7 +640,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } } else if let wallpaper = media as? WallpaperPreviewMedia { switch wallpaper.content { - case let .file(file, _, _, _): + case let .file(file, _, _, _, _, _): updatedStatusSignal = messageMediaFileStatus(context: context, messageId: message.id, file: file) |> map { resourceStatus -> (MediaResourceStatus, MediaResourceStatus?) in return (resourceStatus, nil) @@ -645,7 +651,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio } } - let arguments = TransformImageArguments(corners: corners, imageSize: drawingSize, boundingSize: boundingSize, intrinsicInsets: UIEdgeInsets(), resizeMode: isInlinePlayableVideo ? .fill(.black) : .blurBackground, emptyColor: emptyColor) + let arguments = TransformImageArguments(corners: corners, imageSize: drawingSize, boundingSize: boundingSize, intrinsicInsets: UIEdgeInsets(), resizeMode: isInlinePlayableVideo ? .fill(.black) : .blurBackground, emptyColor: emptyColor, custom: patternArguments) let imageFrame = CGRect(origin: CGPoint(x: -arguments.insets.left, y: -arguments.insets.top), size: arguments.drawingSize) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift index d351bade5d..5edef04901 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageWebpageBubbleContentNode.swift @@ -251,7 +251,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { if let wallpaper = parseWallpaperUrl(webpage.url), case let .slug(_, _, color, intensity) = wallpaper { patternColor = color?.withAlphaComponent(CGFloat(intensity ?? 50) / 100.0) } - let media = WallpaperPreviewMedia(content: .file(file, patternColor, false, false)) + let media = WallpaperPreviewMedia(content: .file(file, patternColor, nil, 0, false, false)) mediaAndFlags = (media, [.preferMediaAspectFilled]) if let fileSize = file.size { badge = dataSizeString(fileSize, decimalSeparator: item.presentationData.dateTimeFormat.decimalSeparator) @@ -285,7 +285,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { let components = text.replacingOccurrences(of: "#", with: "").components(separatedBy: "-") if components.count == 2, let topColorCode = components.first, let bottomColorCode = components.last { if let topColor = UIColor(hexString: topColorCode), let bottomColor = UIColor(hexString: bottomColorCode) { - let media = WallpaperPreviewMedia(content: .gradient(topColor, bottomColor)) + let media = WallpaperPreviewMedia(content: .gradient(topColor, bottomColor, 0)) mediaAndFlags = (media, ChatMessageAttachedContentNodeMediaFlags()) } } else if components.count == 1, let colorCode = components.first { @@ -311,7 +311,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode { file = contentFile } if let file = file { - let media = WallpaperPreviewMedia(content: .file(file, nil, true, isSupported)) + let media = WallpaperPreviewMedia(content: .file(file, nil, nil, nil, true, isSupported)) mediaAndFlags = (media, ChatMessageAttachedContentNodeMediaFlags()) } } diff --git a/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift b/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift index 05ef528873..3baf603f0b 100644 --- a/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift +++ b/submodules/TelegramUI/TelegramUI/FetchCachedRepresentations.swift @@ -82,7 +82,7 @@ public func fetchCachedResourceRepresentation(account: Account, resource: MediaR if !data.complete { return .complete() } - return fetchCachedPatternWallpaperRepresentation(account: account, resource: resource, resourceData: data, representation: representation) + return fetchCachedPatternWallpaperRepresentation(resource: resource, resourceData: data, representation: representation) } } else if let representation = representation as? CachedAlbumArtworkRepresentation { return account.postbox.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false)) @@ -452,21 +452,66 @@ private func fetchCachedPatternWallpaperRepresentation(resource: MediaResource, let size = CGSize(width: image.size.width * image.scale, height: image.size.height * image.scale) - let backgroundColor = UIColor(rgb: UInt32(bitPattern: representation.color)) - let foregroundColor = patternColor(for: backgroundColor, intensity: CGFloat(representation.intensity) / 100.0) + var colors: [UIColor] = [] + if let bottomColor = representation.bottomColor { + colors.append(UIColor(rgb: UInt32(bitPattern: bottomColor))) + } + colors.append(UIColor(rgb: UInt32(bitPattern: representation.color))) + + let intensity = CGFloat(representation.intensity) / 100.0 let colorImage = generateImage(size, contextGenerator: { size, c in let rect = CGRect(origin: CGPoint(), size: size) c.setBlendMode(.copy) - c.setFillColor(backgroundColor.cgColor) - c.fill(rect) + + if colors.count == 1, let color = colors.first { + c.setFillColor(color.cgColor) + c.fill(rect) + } else { + let gradientColors = colors.map { $0.cgColor } as CFArray + let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0) + + var locations: [CGFloat] = [] + for i in 0 ..< colors.count { + locations.append(delta * CGFloat(i)) + } + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! + + c.saveGState() + c.translateBy(x: rect.width / 2.0, y: rect.height / 2.0) + c.rotate(by: CGFloat(representation.rotation ?? 0) * CGFloat.pi / -180.0) + c.translateBy(x: -rect.width / 2.0, y: -rect.height / 2.0) + + c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: rect.height), options: CGGradientDrawingOptions()) + c.restoreGState() + } c.setBlendMode(.normal) if let cgImage = image.cgImage { c.clip(to: rect, mask: cgImage) } - c.setFillColor(foregroundColor.cgColor) - c.fill(rect) + + if colors.count == 1, let color = colors.first { + c.setFillColor(patternColor(for: color, intensity: intensity).cgColor) + c.fill(rect) + } else { + let gradientColors = colors.map { patternColor(for: $0, intensity: intensity).cgColor } as CFArray + let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0) + + var locations: [CGFloat] = [] + for i in 0 ..< colors.count { + locations.append(delta * CGFloat(i)) + } + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! + + c.translateBy(x: rect.width / 2.0, y: rect.height / 2.0) + c.rotate(by: CGFloat(representation.rotation ?? 0) * CGFloat.pi / -180.0) + c.translateBy(x: -rect.width / 2.0, y: -rect.height / 2.0) + + c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: rect.height), options: CGGradientDrawingOptions()) + } }, scale: 1.0) if let colorImage = colorImage, let colorDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) { @@ -554,89 +599,6 @@ private func fetchCachedBlurredWallpaperRepresentation(account: Account, resourc }) |> runOn(Queue.concurrentDefaultQueue()) } -private func fetchCachedPatternWallpaperMaskRepresentation(account: Account, resource: MediaResource, resourceData: MediaResourceData, representation: CachedPatternWallpaperMaskRepresentation) -> Signal { - return Signal({ subscriber in - if let data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) { - if let image = UIImage(data: data) { - let path = NSTemporaryDirectory() + "\(arc4random64())" - let url = URL(fileURLWithPath: path) - - let size = representation.size != nil ? image.size.aspectFitted(representation.size!) : CGSize(width: image.size.width * image.scale, height: image.size.height * image.scale) - - let alphaImage = generateImage(size, contextGenerator: { size, context in - context.setFillColor(UIColor.black.cgColor) - context.fill(CGRect(origin: CGPoint(), size: size)) - context.clip(to: CGRect(origin: CGPoint(), size: size), mask: image.cgImage!) - context.setFillColor(UIColor.white.cgColor) - context.fill(CGRect(origin: CGPoint(), size: size)) - }, scale: 1.0) - - if let alphaImage = alphaImage, let alphaDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) { - CGImageDestinationSetProperties(alphaDestination, [:] as CFDictionary) - - let colorQuality: Float = 0.87 - - let options = NSMutableDictionary() - options.setObject(colorQuality as NSNumber, forKey: kCGImageDestinationLossyCompressionQuality as NSString) - - CGImageDestinationAddImage(alphaDestination, alphaImage.cgImage!, options as CFDictionary) - if CGImageDestinationFinalize(alphaDestination) { - subscriber.putNext(.temporaryPath(path)) - subscriber.putCompletion() - } - } - } - } - return EmptyDisposable - }) |> runOn(Queue.concurrentDefaultQueue()) -} - -private func fetchCachedPatternWallpaperRepresentation(account: Account, resource: MediaResource, resourceData: MediaResourceData, representation: CachedPatternWallpaperRepresentation) -> Signal { - return Signal({ subscriber in - if let data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) { - if let image = UIImage(data: data) { - let path = NSTemporaryDirectory() + "\(arc4random64())" - let url = URL(fileURLWithPath: path) - - let size = CGSize(width: image.size.width * image.scale, height: image.size.height * image.scale) - - let backgroundColor = UIColor(rgb: UInt32(bitPattern: representation.color)) - let foregroundColor = patternColor(for: backgroundColor, intensity: CGFloat(representation.intensity) / 100.0) - - let colorImage = generateImage(size, contextGenerator: { size, c in - let rect = CGRect(origin: CGPoint(), size: size) - c.setBlendMode(.copy) - c.setFillColor(backgroundColor.cgColor) - c.fill(rect) - - c.setBlendMode(.normal) - if let cgImage = image.cgImage { - c.clip(to: rect, mask: cgImage) - } - c.setFillColor(foregroundColor.cgColor) - c.fill(rect) - }, scale: 1.0) - - if let colorImage = colorImage, let colorDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) { - CGImageDestinationSetProperties(colorDestination, [:] as CFDictionary) - - let colorQuality: Float = 0.9 - - let options = NSMutableDictionary() - options.setObject(colorQuality as NSNumber, forKey: kCGImageDestinationLossyCompressionQuality as NSString) - - CGImageDestinationAddImage(colorDestination, colorImage.cgImage!, options as CFDictionary) - if CGImageDestinationFinalize(colorDestination) { - subscriber.putNext(.temporaryPath(path)) - subscriber.putCompletion() - } - } - } - } - return EmptyDisposable - }) |> runOn(Queue.concurrentDefaultQueue()) -} - public enum FetchAlbumArtworkError { case moreDataNeeded(Int) } diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 10b92b2cc59b208b959ba392e68798fcc58d64c7..98679ca33c586ed6be0d5f79050180ca5a8ccbeb 100644 GIT binary patch delta 26157 zcmZX72Yi&p_BQjvn{40oY_iFw_fGE+Lg*cpe%2iOMZ;d)$l9J@R$gxk(d9VH zoK;Qmzn^&P6A^4TAAG{ragSG%CcelUR9RxLainKgRt|PlRhK#|7&7;v&=0>k&hkoU zwIe;>F*#?vy`sWVhRi0v@C_$gtG}U6A}`n%#M#LZc7R(?MzY^|$CHWdAYWe}Yswy1 z<#34Vf1sj`A7AcI6^}8KDzg6MTTUjbhfrXpC}N@7-W6k=qTnz$p2}eLywj-!^%#oN z_~K<2!k|oi;VBb4&R3m^Q~yFi0v+qig80!>mf*jU)S+!Z=eW{}^c-i2{OSpAJRQ$Y z@|LG#*eO2rbR_$SPsKma@a3ni>@5H6bd-7yE#vu>l_>;6d&yNEn9dh1!` ztgRHoN*`ESQzpB-#0&q4W|#THV}ZPWg0W|z9Shx&BNT` z!5JI7$t%uSm0Mo?$`cmvvPq)RZNBbID|Uw;I}@hd^Wrm`+W4XkYH)UKjkB`MK6P+u ziNh&-e}K=1QkNtwRsLDM^3aPSHZzNNJF&@4y!o`VVT^G)o31L}O`62;#Sbl1_&RIG zPn|U>O}%->%5b0TlJe4uYR@#A@tAWls*371Vty=4=PB{x6VIhFZ(et<4b$-7&t)<# z*PIVyIv#gEf$4eP`6R{QO>3gjs9$Nt1UWz>Uv)lJF?mznY!=FGM>PE6c^_ux56@c_ zA8%e*7r-+wgfm~Bf1#b~hp$?wYd8zwt1swPeg`G09$5S|TPKiUuJx!lH!o(HFf`E0QU^{*IL{FK2pVp}o3#va?Fo4CAXV zCaK}55J&Z$Sv0?RQK#CFOyknytB4SP9lP5TuM|UW$##%;KntH;xjJU z(EPPaA!-cDZQQqmRo~C)oG_?Tj3|~LyOhY{xc0J*CGf<{VQLa;#Zz`G%w*K%V3y1$ zUyflZe8uH(mdd}loWRof@yo51bZ>sKcPd}sKY-3}U|J=^oA>|GpO4z-#b;d6sF~;` zjdt8(Nd{+Sp#z*PzSf*?yOP3M@N-wJYD?6Jr8Tp#ZV^|5Su5V=YMj#AoBO;Pz}L6e z@#$B!N*iy!|2==c{HmF?oKf5pZ_q5mt7BFxqSBZ zbk>7!xNc)T`QGbUtQTkhX2tc!2LtdGu{V{@s+#n|@y-fIBTM!{c?=IvvvB9Xe$jp1 zwTm1zHKi5fs$I47Ys<$tr2OmW%_n~3&yCl8%telhl7Y?=`&7XR`C^_S{Nle_rQi`t zwBGPxg*^2}EE~Z4-)N;4q5B93B%4QE4dfr)Xs!-Iek9-VLzuxmO0h13x$n&=btsC0 z`0)85yzpkT=wV0+nOiuhsMn~RUfBajWq0pBYFNP_F^I=d7|ORzvhW2rwNWFG@}%9}s2J9Nn{t!hVpglkKqZ~3t?yw$BpOEEHq zbQ}m`O&{o(QqvrXCMDiHa|T!`Qc+d$@v(g2tzOg<0Eg|SUI0@J65egX|gD_@*TH>R40-l{7OWa z6#SL^{_Q9>kw@G~WmUZ2ofuZbEAJ#Kwcfn)^*|aui8Z6jVy4QVos||ogyLz?X;1Sm_oCUee9XOQ^*IzLar;;cUvtmGp66fQ zONe{{dHz_89A`z1y||`2eW0_l$WdGag(=qPMb7TGVRQKChXFieogW`{-;2G($KJQG zx%|2N@ya}JDR_0Q#bVD#UxA#p4bT=<+RH`r1^oQ|aCHP64M=5Y^#*<#-5K?YmG z%O6-&j)G`D>uw;gdk~<$j8q1nZL;#M=e%h{bEfk82WGaEUwRP5i2FWFXRq+C4RZSQ6Jz%&bXHY3$5q)Y$4?ba-WH3T!rq}yjJ09!Qmsg>r8SJj zuyyn;W0C56XdCSk-|Lrp@f#b=%KP4AJH@P&sbJ4P@Qji273R-Aq%jJMXX|N>!XnrP zTC1Rwji?kvvkgjsF5fZ9#n&Ixd4(miPbjb{OJbi=m!_E3XEeMiOAq-R_4OEEp1m@C zP{o7_=VZBI|MRBNNAcmUO_?wIg7!6KR`w;GZ_1+BCNed{f^3$;f^wR%aJGf)%~(3y zN{dj!w$a9BERAia`erOh+2PIij0h%^ih5sBs>)*7*VJF6z9FZ|;@G#e6q(9*kkJ2x z=(;&vfZ%&64TJfEao%)K1@ZnsdM_5D?!o&bbQQ&-?+Ll<+O$9EDGk>2 z5PhJ*S{8yq|SL!7(Y8-N_j(O9zKbdt|Z)VU-IVg46ajMj^O!gP8!H@bk zz7`@lgwAQ1UOkCq7|p)P0?4dmW_F4qbXeQd$WA2l0l+QWyFS_mT=x&aMFh>$u~4AH zx^wZgTL+>zPxU$$W4nMhQV>@;u-pR9HEN%W-kh!VHw`XzOddGiQSJhXl&xpE>SZ*G z0an0P=|Ln{yvdx&0{Q3>-WteYv4mIYkRJPTjUMQ+OV=sEfE~VpW>K7(L;btsYrU|f zjw&HCZX!R7U&#%jMFyr*Zy^~?vvOG!Z8tCtyG=U{EII5Bvc;|lG2g>kRc^0I@8&F% zyKrsN8+vUr$lxPi~{Y(HKeojx}exTGCO7mlh zVex1ucCxU_QSGQGcBDHi%1SHb8YIv}KNh7VYL*?UJ zirgteIM}7}k)jb84Gh$bk6f#f(ma*S{;YL)n!8m$XR*CZnmmoGl}=;)S%R8@Dw$&H zyu7J~*7-B5H4|ATd`rmGVb0p@Do|>b99$M1^M|Z%zAS(xvlf&R0QuLF`UkM)YAZBK zpdBl*q;&x-n6;+QMQIy462MZFwi-I7V?h)d$PA(FP*scmyE$vpi)!pul3&^*GmbC* zGlWJ3GJmCmhA$iv%nM)F=t`l)OT;d8q?LhSsm`=L5cJoDvf}|aug~#s#N%Db6a=!( zmVNog_)}VM*eVy=8MUH)H)JO_XjUI#qc}?BqKLvAS`x&P)b6MgNVA(M{yHg)P|_rq zjs&r^upTH9s>TJigmh^sN_!$ZoTA>s>_&MjIx(>(y^z-eQa+ic1_L>6u#~<}-+nSXglQU=&EYfkEoPayu%(FpwXj$`JAmfovX1S7Mk& zSg2GG0-hK~LqfoQkI}3Ui0sFyE(H5HoW2c#7#V@?f@u5KEJ&MID#iCm4UhaWfFeS{ z4x{8KCcX&3_Tmy|V54bNC`(f88Xo>pXhv>HX^o?#pM8wW%`gU)r4ypeVXw-u7ms(O z7u6OQ!>|@(E7tJ-hy1DXU8Xl>mrb@$tu7cl7Wqv|=wT@9t~fM&Z&zVfd+VeHE82{u zax0|SICLC9J6^yj)>|Px$J76;m`^Dkw}LUBp!-%R(Fv3p2B}g`L&5-sDnyfIZ?S-e z^`3}~?%2RibT|x7jVdI=xbKNjQ=X%w)Go$RjjV8<;S)q@;moAeYIxU9!88!ItTIVM z=`XY3WjmPG+a*pX(}Hk7ifObtoW-fr(KMb`eak}VA&gyh2GX$}7QFvGX3nBnG~OK0!+5sA?6^1U=#(JzouFD>#y|vJLJ)*J7t7vdE@M|4Si^gDA)9PrD#2WfO8eH)P zokTn3O^wi~+-IfBW_gQZV?ax9Q(g>Y=R4>$jQ8IVK=WhJ-Mh3h2HmZt9Wg8es2FUO zpuDG{*>{=EtA&{M`_wrWpy&fCk7a4fhgi<>pwdc!RN5X3^|Vor{gRIotnKbBmO$tu zx)6)K|Co$%5Ko_?La4;pR1n9EK*1y8SZnojWXJRVU4!VuI2Nq_56J+&;eH_1$1yM9 z-&1jbY+oWb88mI>BYX{TQjBxf%Dvbm1ZgJQOjYq%^)0kC9^czWpTFP2v6kI0UruA9IkJrkL~x(n$Yp|b}iVN&$@6bHg3pw7L>4W~YOCCu1>1NR{-KoW+wPpwPY z?x(OM$hcpqLlTQo4rrwR;OGQ@JxIS|oSf|Mv^WWh{0|MU4++u_su*LJV((8Vw8Jc# zypx%adI&wo@YyRvXrY$*sz;Da;5#-3kv*AN0D7k-W1Z@$E*Y@>80|=AS?oAnL#FbV zMnFtTO~GFNP3==KpA%>u$P1hn>3=z?;hBB`G%tk(0_MJ+f;Ok68lht;Fp>X}m9Inq zxTJu7&LEjY{l@_Tk2+@7J8O%__m+6>EOkl+Tb`qlso1&mG%XcdeSub{!iu{{J4Nae zolnKUu8=Ja)Nqvw(jcm?p~Gk&vQ`?ux5!yQEmn^D-SiaaR9UNTcIW| zv5if%^kN1}R2kH2GWiT+7TTS`LReEeodI5LMy5=xh^pm#w+B-1Oi+b44a)>N(9*uv zEFigCnbSp2LNEKHzah|rmG(+URl4Wj#Aggz7e4thlNnSa>Oz?g!)Ayw6Wz_kx6Bls zg&!a4ody2zrP3@+-;WmJNA*XG1m0y{Jk@70jS`?0ie6J<7tI5;w8NkTQABgtyg}5W zIn;G9>L*Eaoywa7u!M+o12Pddzlnv?w&oB+VRWQ9YYWhMxdltmNn~q7^(sY^>19~p;kr2dtvx7$?V zMs!&uV$|_kJ}))Z*t??G3IFgou@?!nwIxealhF>Q&*%s;w_ zFjeeRFkR}&j5N0uHZ?;_M~|~e+KdFtq@P-`P$f&t7dNx&^9u&%4jm|ZZ$YNk!1pcD zfyalIms?bn-7|Mo&+NQhQKuF4Zw&$4nrd5P5!<3_8fRxCX%n`ZwHG@c&N|RVQKuvM zwSn~QtfiG_n8mBDXx@c}wP7t;S6a}9g)7-wp@M9*3kfv`eML%p4vX!tbjO~32~)}K z4MJOhz|L&}WP507|3#psEs+|U+ZMKHPqYlB-S4vyj|tF=wzP%7>rIQhvIt)14H()E zE7gbEwPP`1ebGP&ydI@xj-t|Oj`Y6W#NhfNJ3@|NUOPCM^Qo>KG(`dJX$MGCh(b5K z>t2u}s`sbx_Sn)Q>eC*pKak4WgM|mv!uDXsA+(`ASZydBYtMqzVQ3pmX@6k*Z5;rI z9;1W~AmGQTr}!C8<2tac@DZpa3=+W`09xGzK8M-#5wex1wS41=RQMHej3f5)8B~ko8&_KWB$S1>rOIC8I?{WVa=HTY zJ%<_*G|@*1q?ujO(er||IlVQRcYk=d}y=Te_+On4quWV80l zd@bKmC1}<}`?A4<3+PxjOtyvSHPv(AL7lq+OfDjjW4y8$+X(o*sfy`nQ8$RAB~;f9 z19=%u0(n+VfUyA+E)_X+%tF9LZzmIJPN z1$j~YcxC`Sm4p3%RZCw0oYVRo3}HEK&H?gzO-uFPLttJ*A8aM*yTiS;3e7SFgrVH- z5b||2raLCPn&x$93Dz|z6bPizhufg}U#C6Y!Mkrrv8*3kCFu1{)J|xWREBJiv-d46 zMU91pFU~-u0(gg}=K_1JMT>AQtjaC9*n@Sn7Y-Ws9$m==Bfd|z9>7>1qE38+0`{Vk z9?VBsujR9k2Gjf=%oM&6BOlZs|O}@rIqbX}G zHd6TOm2b5CDU*#Bcq=B~1~-qO_is@TXJA@rB13PcRlh^pwXiVPeE}4^^u`x{KyGUs zyCf0yhLN-rNy!4i^nGtAl^?YdJoC(tG;~cg+eK<0mS*`0^@Mm8&IO>g2K~RA`t*UK z-GkB)3ZKp_S}073H22cHKEQzc=)FErANy%1>M1{K`4fQ|E>F@g6xNr;DZjc^i8OwG zBYR&^-T|817bxL(^qRygKMkiJ`a;Pcq{Apw|3GdSg{8y#5VQW1()$7O9MX!DJ({rr z*kRWbkYI=D?S4Q+M`&+9K$&_iw?Fjfb*bK0#K&{SJBlX&@2BThRXMBRrFB%579+pO zX)X1i$U=0rBJmGuM~D+w>YI;woTX9ukOk*lDv#=r7jh9*1X;*4F1LObv%5sQ@-fcK z)T{tri7S**0PS^^M#4&k4|GNWSmZjbD_|+=zvv;F*1XKD{z8V7c&yPID2OEC^`P)V zsKA?)SqMmROVk&E4uN3ov8BT8={}XYEgDFMbh~+6zOOs9p%5#1S8_XDEQAGgpZ+a` zBjTZZCU^GWJh;KxB2+=Lgb|hf0p1lPLxhW#R`&LGu~Zs*b^u_vmNpE4VWHE} zj;4w~-53DDtS7G`NLd5ANR&&&>*txgU5*bUjVOY0H_=l?XlMzd<`+JXlLFI5pACYE z7(qt|!OV@+iPL(D8_awx(Woc5Q^ZH4XT#f5DZxVw{X12gYw1aKoYL{CfZJH!HHW&tFGKzwD)UP2D9Hi)|^Jbu~E?SK^J_Rm)dll+q@8shLBQAL=+!Q$5kmciVch#MW>mW(jc^24T#b!o)BMMv(Q|0yW6(3* zQ5Yxj&ZWno9&^e2aUkLz$c-T9R2CfY2+d*Hn)F18SR{X%@Hh?_dLbF>I$&6Vw7xge zHdKShm$tXZWc$#*$1&=@$dBV2tl|9f20ge9FjeFTZ)Yg=84f1RqY=X)>++EuMtkd- z#qfwDsXwhB&Jr{OP#A!=OVTU=tT%_l?Kw!t*+hS8J%U-4!8$&wB3hp>PBhBIH-^xx z5!j5Ov~dJb$}rJ2f3PTs9*n@UJcgt|4*nD~68d>Kk}(ny3>^tkI0DH~DZyrr1Zo*Y z3r0e8kJeGdRA$rWI4dPWvD4v^5Nu;~(m3#LF1WH-$FIa;M5CCWT7q8EY1TBBsguUO zL-sm+ey9eKQeuQ-Y3(T3g5zl4C>9+z9>rpQt_UR&dLW{d2AA54%Bw}~Qj`l#7E2vQ z!*+dw291VroIuZxh6Pzh>qY}AmZMIP1VraX!(UgS^OFs2+m5d&DkJ8Q)zQS&hX0FzOg z=+f505u;8)8b{(k1V=PT#;M4`pWE}+kUNdO8N;HLC$U~nSe6wtFU@pR5;hxUb%2** z2E`V`74Q@?f%@Wu#DTvL9GbI>LB6x-tzwYxvnUL0i2ZVT)}Euw#jp#X*U4}v*bGSn zCp(L39F>TA8ZTDy1+)=fNw+DHo;}9xzj~1#F9Ao+p;;xsF)yK7I9NQ;7yAIqRR#%( z4W6sxt-VrtKdpw%r#qs>0*Y`zs4t|B4v_pJ!R-N5>A)G!5_-~sLoE&#jR>ZW!eO}C zfo*vi;`XB;I)XatQhX?tGAv4*^bx~r89A1vE3ZPHFGfFIElPmkYrxrO$3io%pei9EP@rR*hpZ);G{dBHIQn4#?+n zV7*O;#{q}DLtf*d^4ml_sxO%)s{Md!Rw-8l%AK_pHH|)wohXTS%VdA$M?ugbUJ?`TqLyVWD(ojz5LU4V zt-Cy%qSxItu?*b1hp3FTQ1_yu3>~5iWpKmoLlS_tgH;Fn*fr<<6j2T^^RxWq=r^oX zQqKG=zaS~pVdIgK^zi&j3(BE*4$ueXkgdPVHc%b(Z#k6qK_r94+UoP14M^w@O08h= z>YpfT-oRE-ID21Q!7R#Qo$&n!)4n}$j_s^~(mp~*D$wy!RL`XTRWQ6`o%r4{%5g$% z|3wp=EX?{hN?qoZD@Zg)o{)>VpP<*BV4supy%S*NH0q_(-h7s#Z?vKQq1a07*cs|y z35j=BC@p__suF{uB%iy z5e#~bDkq}ubsb-QPM&1wO^(U#tq~0VFYTKMNqPhAtpdPldsI242l6IGR$(x=D6fjO zQg5T&LRS>HjBB4wpd_{Ctpx!Y08l5y-Cbq2}KfrZhes>&h^B;SSfNcmN1O+ zCc~@`*Yo3V`3DWb+0qc$xkIX)730K;*ks>}7sA84elk>d1Z|znS}Rd{VM8Jm%4`rm zc|_!jE~6=93P>SFPv?S^P@48T?5J3JY6=J|jy{;edb4=CIR%0$foxN;B#G!egt8FN zD)DI&O_&OTN~XC}f#_1`?Wx$PRN6lku_von(bv>?L5X7AZPA&~lpb@e&^{H`da*+k zwxfb40T|oU#3!LCJJ8Z6(Q`-I{v@za7rOE!ShFjIOh;KZb(#)p?4}ngm}X7~wRNZG zr=vnHeK?(UPio&w~E*-b_sR zahf<20%|xdnh8o8A$}5c(!)IxT_eamfm!r9wbeB)h95<~vw*-yQ{P!I(~40gk&Yh+ zWj!|wTCRjvqEvMt8wa?Dg3Qt;_EZo;Tae=lLeh8()wqBVWyxX*U76cPn_9_=2Pj=Gb}!Q8j8g3 z_p?{m6geCfh=@dRShfrtcv29hg+CYx7y7dR7t^WWSuDp4G)bdu23LRGv+(LYrRTFV z;o%Kcn#t(v23PScI{GX~dp2pGgC+YkwR#Q$=NUcBp{_F887JCnp2L8jqwk&rO+QZ; zpTl~*py$3@EtK{=3+(bDzT}U=c@(n*gSq9EE)V1!cQG6W2qCPN4g)xY%H7A-mlR9 z1>ywHX4ExE-sO7UwR4c6pt#2A4t8Eai(Ui=zD66-L|LU5N0)T=MI3C@>1h!TFDPyf z^ABB(t_5n&!%+r~WE~X^N1tnGz#MGC>oj8ygw7jOHwWzhri=X#&p{B>TY9Qg;q@L+ zFetyfkWX)u&r8tv@1Vy7N)1s$sPHA={dZ~XOXy)Oy(oUx(Ylwwu zN^Cy%X}exV8hbaFCfW|k6#7;&HbzwbN@(&V^=tG5=03v$-H~kH(9Zc7(6@AQKAd*n zk!b;x)Q@^Vk~kTwOO*?ta(|*33s~E*-DoZ3-lO4H?f{5AVvkeVUV5+qbJ#~Q3$beZ zspmq7)1PVFLI~(zX#PSl#;T!A%<#@nkLd5(%&5vU}cJg0?XhzF3I0{x(# zL%lS~C^)s#)3znRUgrTQU@A|T<44z*z}{b za2l;MNME*8mwH;Y42N6>xNs$;G#1p>jB~egOoV$5HzeGDnwJ}Ufc<&^Y-$1R{fD3D^(!Q|8Os=#v!Ba#HRvK6vw;3uj)Ji z+H_Xnrh)4wk|+(Nfv;eqK~(z+^dSNYUx9Y9ph*}`$%6a_ILe)q93|c4<&F?!TlhqW zHCo81P^1KZh#PIL!`sI5537N1=whXUSAj0WXymK#Z`nkjGIr!qoD@MDUj-zJq~otb zKShyoIoL4PHQx{GS+Lt78%Lv;!>Jr^;P$ETRxSsop9drGc{V!J6vu8ndXa(2Y2Zcb%;T41`zHQIcOeZhVbc$JQtfB~1agNGwhpTKgI> zRa^T0HMro~8RQu^nOA~m+mm%A)}sR&bOV1SiFiIg+Pfc1)sZ&8!yxF;+EpwyEE^4_q-#J6*#i7YSlf;IuL133($h7%&klGm9{W?BdOqXAWec+&|Hz3BxQr9;igT~SLH=v!y)8aQkLr>8AZ(wiB z(LUItZFNAKcSI8>g}liUJ6EDqoLb1kL=ma!#C4+5vYMjtrDG*6O+*F3SsuuRlgm+q z2J{pAQbjZ0WNnpdgRn=utII@QEggIl`#Xv5y$PzHOyO^_7HkUje~ZP$OhsQ3T)Qkf zmn$#b<6uN-s0`z$58r~0c#^(&3tKmx3O9g>Bw>m>aq0|FkI#NTOea5lbk0j#o{p34P+;d6)F3RRn%DcF`FdzN2 zk%u{Cvmzws#dksd3#jg0))B79!|wvIEt1r)Z|*@KODJtEL>@;|8{c>!JWxbsh(W!K zoCN$zLCV*(idUB+NBVt(Xy01qtt>Mv35CSO1(L=w6CGR&T3Jqa*RllL3bYVLsJznv zSX^CODUi7fioQl&*Rd#dCF;Zq$G=(L!hzN2qTM=LvJPNtwLwPvd$kc_WexqY4!yrl z_tt?O-lWv`ppV|7{P#d~Z=)Y8ZJfb^jJU{RA5-S~$~(0BJ=A@d_PvMcuQkw>7A(ed zVdH(Wz7Nv*K#;G$#vSnTAwBj!JTL3fAp%F1S$O461Fd==PK=H8&inWxpyK;bZ6BjT zsyLtsA^#6R{hv_!2VjX$Y48VF(a%u|*J~dZ?fKdlwDAM%$d~lP2k2!JoyCv38TB&U zpV8474Rmkk58>I{g8W3jcuGnqOuWffq@dX!ao@EP+1rpUc*z}1*0p}!61U;X~TMe z=$)t#LKkuAg^r*MSBg%r$AR1~WCzjy*P$rFH-L$LqQnhYhCPCbdI5I6x&f+dpFvvM z!c{E|FLl4@j9=aotn0jk`H#rmCI*a)lRAP`9?)YI1+acJ@f z+QzvAZ@rJ=O?NgTbmkCr?l7yL5U~wm8DfQwxWxVNk1(>MH0~pq3iW6nO|wnVw;Mjf zN*_ZyRUA(Q@V`eyz$tmE2MsA`!0Ll6ouCWtH!mlIZVn%%oVSmyiBdqEvl-YR1 zx<{@spQfW9!%y)KN?N;}%ih%D6XqLx23f+Ol-PMdZeH*F?zsa-4eULzU#=MMSrkXm zf?zE2%uisXoTG)GKvkTVpV+hLkxyKpW4MBXbMObBU=y!U^r!f_N z9j%0Q(zA3dU~Yri{V%Qf6pG^pZT}Q7`6lW_$=Q?fGfecB9DopRizB=Y0sy%pvTw`v zrP9x!5$@15xGmLtsG22M7iV?`-~WU9@4LXtSyBH1-Te%B;-SHHL%r~IEp_@FfEqY3 z?{iQGWYv_mkK|F;ECG4;DGkALVl#9oNB~Ap zrpPZ?GgXgdjEMBL`s6!maKn2-!{`h&@CztmlTie)nV??EoT9xM4dABA3^tYs{a@;k z>cf}5{sIi*N9Vo(`}m_yoIKB@_%E^k0pcS9e9|B!ah(3dm)NWzTKFZTe=u$T62`N| zDAb>(T*45mQL+|dh(ru0CfZ!F$#U-}>|ziRv~Ux2L?o@>1Z@&Ue{O;Zji&pXz-tK9 z+YHSdOPw~O_c*G+fwmHF6r9BOB^y-HK7lrE24y8u{bmH$CXw$J2$W=Mu>~8KYUHDC z2WrKdiK=NdeGBksI=vzaGmM0r{Rmsw0^2>4Zf;?bQCXOs(Cwb6~66u^v_nT zSO+q0!+bkY+ie(qR~o(zi_ndxZ)0%@Ip{D5op|J>kccI2ubbSX?x^vI`FC*};At-1 z7hUzBsO^yUJ*ne%^w^7rZ-<)dZS;hA>gmJnKyH0#$96DoUvv~fSue8yT+;AU`ymN) z=(s;6@4yjr9+Gi<+vCwRat8!d0hR7xQA(kaXOst0rwkZbYelvGsAl6=_F7C58;koy zVhsk+@f~22B6@&UfRB-1AvK6PeFY10Fq%YC{}3h0J5TP-5L);Z*nKGS5x^&ec>PyU zX~XCrR0oPQeT`PbQJU&8mS_-e->4&y7vn;6&x-U&qyxpVc%#-IMVr3{8I7hxUxT*n z^x$ij6FCO;Jc6#UcYc0u_ffbp)UWs8T%pU0$^H$%{aBj+4QmYm`OP;tEi9$0-#~0W zfu>OnS4!0X54=tgBakczg7W@D*c^0Js{21=_?E8T=Q=T)5hz&k-UpU}j&flI9gE+l3>uSJ5Bhjqq3meXtAOh~-jv;bjgtELef^NB!Jk zKVhj}qx7F}?_(9p1VQDvv3wtR6Wsq!^*^y-pX`cKSICxR;ny+NSO~gVam-s@%6k*- zgXpPfU>&h0Z_$aLpp@Q*1o-=)mm801=1blES4q8hwCBk}M$qX>SdMY|yh z-lMwR;J6QH$8HuE^dYKi(4p&+p|etSzQM?Myl%q!aSVQZ4-o$UNVgZ?_>xlh;!J-NIrc)@Y!>o5#4AgX+7^0q zFT~MS`a%3`qw|Pl4%?271x{?xV(ED@qG<3Q9fBs$li1sN4|Tpa-gZ?*NGBy6ggR(5_1(H|XpE zEZj}<{T&eGmXQ|E1Qd@P3<#h9I~37vvi}aibH~ViTgK9Rzr&uriym-Gu7g$E&2`7< zo{>7I;=ouOM2HF8r~AJ{%sim5g9zSu=z<%ilC9vhD?bP&rI={ZK^73+3=R~b(Z%^i zy2SFX3*&-BRoWq{dYO3T8xRcU_GXM#AC@cN| zd75bTACTQ<+VTf>#)tafWFfr1qt0Vb`I7IS0K0zF;ZJnwPmle{GSmQcndk~Nc;`>h zdLV86lQjo`y7DKsGMIc1fekIx`4EiaPL5+)CujSbG=aAZNrO%BjC2sWEZ zUQT#$h-ocRC>2~LwQ-}{FPb6_V<0iq8TYjSs_ciM%i>TsoX=kSNX&jbtv?K#G=b_5 zHHCFQih3U&4;+_a+G<6W};8*vB#AvF93+8&7x695h&T*Bu`vSg}n*}$~(NR(7+uM z_~TJT3$><$M{xqv2HCOyiF?%+metB@vu(wKhG@zq5@~0W0XAMTz75C9_28(Ew7ecX z)QNW0L%MWEPYBY&wF&hYY{@Q2ifc%CXvk)y4#&WjU8&zO46Pf67Ni6To#LGAzUrAn ztBzqUx|971^XHdGH1~p(I+}MJ3($v_ABPU_OP?MG@#WExC_*&v5#1#ul)u6S%l1Fm!RMN7aR}+O)?sB;j=hXxc?VsJ%~(ygIESr z*543DLul0B!1qHPT{AZ$tonl zc)Ql$Nuy5TT)NUE)TFp2N*|sA?N6ltox)O9qgNY`{3u-8AQEbbon}$CS`-L}lH1=g z1dnW0r+0Uss7#`+r$Kjqd0^zuCd*(FA=Bc#mGz7sk+IpIGP@Xi&&{z=x zpw2{#L~%8aBCawK3oS(0ESmZcVA^b|!;ktjs>s_up)Fib_IMmE&!WU%e9jF{KZQ;tU954!w2; zqU9waw-V?toDu>9-V#~!DEKTY%%|M5nEV2&IE&dWq6KH+=~#@f1k>>f2*F)vvAj#@ zx3jQ`__A|2Zh0AnQbyqIg(7&+%gS(RUW|1qbvuWRUPj~2L7oz-MUw9}_`V-`0PPjz z;_eb27o#KRAl6@{?CU_bhV$^JEJs-=@1Gk;>E{tev;xUE&vg%z2(=Om`x=#=U%5?7r>TpP~`>I()uP! z@#l^P>Wz0{rnt|U-llD$-aB;q0v6|8^0^2xvX)w2#QfILu!~Tk@1dpGbs>qoiC;vd z?+3`THXL=B5y`mkA}D@6-M@&%+dzqzVBBsr(K!t)<|&sj#gEV+`9BcE#}#MsF>Sg8 zW8o9};}T0(KSi~ShWLMtS%xj;*o()@RsW1~E<@sejyh4?_mn@)xXc2>|A(ZY6Wn#~ zR^^0NyNbHDmY~qDh2a`9)LYpVP^hBzh4EA+f9aRtgX5Sg@J-D z18BrGlN1cKShMEUP1z#A&7#IpiUXIV{YrN})rzrXcE~}nK4KYtVVuCj| z;oz(g^2c?U`j1IkderqOp1wMRit=qhbK`}{vm%dL}!*j%t@$r6$N7Cj~?b=MUd0v z8r{E%DPE`WTM(`{WDhdh@$p-D=i-+5u*>cB{4Id!+elma_T9k-ghAm5Lh{5N+H#Av zioJ_6AzLN7OqY^Xp5P*YMttZVij(C%N=ms6opfJxMUnDNASrAgkn=XY-%ZR^cN@o% zK$POm9Xfg&o1>VeS$FR?+>uSqWVi#crJDJ~N-O2x0aW(F>}*u`DGT)hu5EZHOoQAY z%KnN4G-_2Hy?KYFhw4!z$gSZTn&+^|NaxXcsL5R}p1kP?mh^bE%#?B$_{Yagi#}n& zW;ihO9OAt}$y~lP>n^~g9~w)8-zrXc47Beq+>-vT!GMeD!d*!D0J?b>h$|4;IB~|^ za(Q1w>}?2jy$4AaO6B(;0Ijs-9t202nb*Gp2f{rVVc~S)9$XeS3cC*&5@B{-X_jxz zMN-LqsFW!5n&^p(XpA6;F}q%v*moc1bu22`C}JfpLb%VIVE#J3M{aXQ(|FQ-M&?FaDvrH~;xH%6oB@Q=un4&~Rc1K+aO@xIe1W0XlzB9X`da?^{ zIx2;0O8$EX8jh07~&v!J&jkd!UTNu7if6_uL?5G25{8#D!VGST9E}VYUGVkIRXU?87R7EB5p_2C9>f?k zU;hc7PPKWv?n+m~AQ2rE%Z?DtNo8J&(Ncn>*oels`sSjRgBE)!QOa1Cbot&3G&7D4 zcwy4x2}h^N@N}knIx>~(x#ZjbjsJ_12brr7Mu7KD!^eQ9!B{?=Lr;@N&B=) zfOVF8lpe=E{Gu+G;%s`TRl?!#4A+64o}p}=l8Ly>DxH#sxXaZ#B~E$X%nL3^GeC$v zT-JkERqBuzmf=|yZIf%7)!=Wg|xaLp~y^;U~T%iXE%%k~wB`$J4Mj*)C^TKP7 zQb$>dCje^!{j3L9EkrGMB%lOG7K7reE<$ER<6Y{$21TnZHjC%7#JgzXO8N`~#__V5 z4}UiVui6ziydAYv2&7~{<#Prl6s}G$Be?GsiZ?2;>Z|B9RN&qakHca)O*ATDxS+GZ z2;O*&wiuNpWu;5XE;Hc;)m3QIg*GC(oX^@~Fha|UICQB2>Zrd-NyQEHr%c$aHK-UX z&1n(yN?)54KcL|QCJg3H!VS%y>RYH`mC>IA5oyrqlX-_K%}PsP;kV4#jOuuPVw?4|SB-PX8@9-A z@*Vx^uO#92_yd2XMbr|w-2$V?akpS;q zXzowhL-Ed;==&!m6Xbi?^jCo5r|w2NM81ot#VM|&guN6RsH7?TT#Pa1r+2xzCv1gBB0b)*y)A!*n(X^mBxKgF#eBsa3EN5mt|H z2+`;U-VV2S?-;W2!dZ-essOr0c!dqOmF2{aqXd7ChMYFU5dTH%gO$#}%NK*eXeUT( zQKI0NO|f7hPMKYgX7q%sUdsA^Xr@I;3OR$mga^O{8(oSI$tGuMhXqS;4#jx(uUTND z(mGH25b);(N({k@U8KAaZ1W|Wj8in_vYGFg8AKaG6eAAXw~Bgrcr!$?TCbxcA)p1K zgY2rslNyeJ^0|$F$u|_D?*?UrD$%x^s3)8kk6vgW)o_FI7CA#flef)$-*p+tZow)0 z&QK*L0IlH1!&`88I~6gjy=xrhj4x^y<}ICfMG9XS5@Zs7OS$7sQ9F@#L@M!Ky~L~H z&1iN6;-~RGvsb8)onip)*Bu-sMTjfKV+++@bT(YEg?Xb)NKpA5pil8l_XU0p-H3;d z(NbZA63BG4)~ZB{J2@_+M2yQ_U%2`W^i+ZpfB8G;(|;_fzI9j%Yd5ei0J?fcJiG#mh1o50oUPowRK z^9Z9SS8ReEkVqo7A(Q5Hs9ZMc0D8K$VgaY#3iTkgPY z_t)^sg;lY_H*YlYovJl6d7R9?Xa}0`w~IhT`4gZ z(jgmdqQ$C*Q+~Xn3GIfonAU%o7ZJ2YIkYJZBkE3H+8|zYX-PbAXb;r1$(!U`qo8nl zN*bp*G0>kuWR6h+wPMBkpjI%#3WK}^Q}=BmUHl!x6s@%%N`!;KGcgg@FRox#=TTiE zHZ7lgVwK>)0@U#=qkDe}=~4^^)Sni`DnX$GP(xDJBfBNZu1Ls`_Aa&?=&t1XTmy*= zLV*~^e`r%SA1uUfus~*`!J;8i7jx*>yRB>XG!56$Ca)FhYO<&twRi8jZSs zB5W%_DYDZj8>Gh=x&#VGIO~s5N>rrq&I&?z{l_*0mrDPFpnKthaNToP#YT^%vRH_s zag-aQB&Uh{2x8?MSXu06X+s_q0XS2x(-X)Gm6WhIUh%d~K=S``ha7$x3T%SjLTG!O zqEX9{4idD{3~IlE&c-QmHmAF>=c1JSLiRX$Q$JbIWeTnn%m<%$c%`~U6mF!-daYfvIYo`)y|{-~v_XeG{9{I^2{ToLOfyZL`D CW`MH* delta 26611 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 i6o^`{QY~DARW+!Ik}OFNmXtNI8hhX>8ZUT( NSArray { + let array = NSMutableArray() + array.addObjects(from: self.colors) + array.add(NSNumber(value: self.rotation ?? 0)) + array.add(NSNumber(value: self.preview)) + return array + } +} + private func patternWallpaperDatas(account: Account, accountManager: AccountManager, representations: [ImageRepresentationWithReference], mode: PatternWallpaperDrawMode, 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.firstIndex(where: { $0.representation == smallestRepresentation }), let largestIndex = representations.firstIndex(where: { $0.representation == largestRepresentation }) { @@ -394,6 +414,8 @@ public func patternWallpaperImageInternal(thumbnailData: Data?, fullSizeData: Da return .single((thumbnailData, fullSizeData, fullSizeComplete)) |> map { (thumbnailData, fullSizeData, fullSizeComplete) in return { arguments in + var scale = scale + let drawingRect = arguments.drawingRect var fittedSize = arguments.imageSize if abs(fittedSize.width - arguments.boundingSize.width).isLessThanOrEqualTo(CGFloat(1.0)) { @@ -414,35 +436,69 @@ public func patternWallpaperImageInternal(thumbnailData: Data?, fullSizeData: Da } } - if let combinedColor = arguments.emptyColor { + if let customArguments = arguments.custom as? PatternWallpaperArguments, let combinedColor = customArguments.colors.first { + if customArguments.preview { + scale = max(1.0, UIScreenScale - 1.0) + } + + let combinedColors = customArguments.colors + let colors = combinedColors.reversed().map { $0.withAlphaComponent(1.0) } let color = combinedColor.withAlphaComponent(1.0) let intensity = combinedColor.alpha - if fullSizeImage == nil { - let context = DrawingContext(size: arguments.drawingSize, scale: 1.0, clear: true) - context.withFlippedContext { c in - c.setBlendMode(.copy) - c.setFillColor(color.cgColor) - c.fill(arguments.drawingRect) - } - - addCorners(context, arguments: arguments) - - return context - } - - let context = DrawingContext(size: arguments.drawingSize, scale: scale, clear: true) + let context = DrawingContext(size: arguments.drawingSize, scale: fullSizeImage == nil ? 1.0 : scale, clear: true) context.withFlippedContext { c in c.setBlendMode(.copy) - c.setFillColor(color.cgColor) - c.fill(arguments.drawingRect) + + if colors.count == 1 { + c.setFillColor(color.cgColor) + c.fill(arguments.drawingRect) + } else { + let gradientColors = colors.map { $0.cgColor } as CFArray + let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0) + + var locations: [CGFloat] = [] + for i in 0 ..< colors.count { + locations.append(delta * CGFloat(i)) + } + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! + + c.saveGState() + c.translateBy(x: arguments.drawingSize.width / 2.0, y: arguments.drawingSize.height / 2.0) + c.rotate(by: CGFloat(customArguments.rotation ?? 0) * CGFloat.pi / -180.0) + c.translateBy(x: -arguments.drawingSize.width / 2.0, y: -arguments.drawingSize.height / 2.0) + + c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: CGGradientDrawingOptions()) + c.restoreGState() + } if let fullSizeImage = fullSizeImage { c.setBlendMode(.normal) c.interpolationQuality = .medium c.clip(to: fittedRect, mask: fullSizeImage) - c.setFillColor(patternColor(for: color, intensity: intensity, prominent: prominent).cgColor) - c.fill(arguments.drawingRect) + + if colors.count == 1 { + c.setFillColor(patternColor(for: color, intensity: intensity, prominent: prominent).cgColor) + c.fill(arguments.drawingRect) + c.fill(arguments.drawingRect) + } else { + let gradientColors = colors.map { patternColor(for: $0, intensity: intensity, prominent: prominent).cgColor } as CFArray + let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0) + + var locations: [CGFloat] = [] + for i in 0 ..< colors.count { + locations.append(delta * CGFloat(i)) + } + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! + + c.translateBy(x: arguments.drawingSize.width / 2.0, y: arguments.drawingSize.height / 2.0) + c.rotate(by: CGFloat(customArguments.rotation ?? 0) * CGFloat.pi / -180.0) + c.translateBy(x: -arguments.drawingSize.width / 2.0, y: -arguments.drawingSize.height / 2.0) + + c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: CGGradientDrawingOptions()) + } } } @@ -490,7 +546,7 @@ public func solidColorImage(_ color: UIColor) -> Signal<(TransformImageArguments }) } -public func gradientImage(_ colors: [UIColor]) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { +public func gradientImage(_ colors: [UIColor], rotation: Int32 = 0) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { guard !colors.isEmpty else { return .complete() } @@ -515,6 +571,10 @@ public func gradientImage(_ colors: [UIColor]) -> Signal<(TransformImageArgument let colorSpace = CGColorSpaceCreateDeviceRGB() let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! + c.translateBy(x: arguments.drawingSize.width / 2.0, y: arguments.drawingSize.height / 2.0) + c.rotate(by: CGFloat(rotation) * CGFloat.pi / 180.0) + c.translateBy(x: -arguments.drawingSize.width / 2.0, y: -arguments.drawingSize.height / 2.0) + c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: CGGradientDrawingOptions()) } @@ -893,7 +953,7 @@ public func themeImage(account: Account, accountManager: AccountManager, fileRef let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedScaledImageRepresentation(size: CGSize(width: 720.0, height: 720.0), mode: .aspectFit), complete: true, fetch: true).start() if file.isPattern, let color = file.settings.color, let intensity = file.settings.intensity { - return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, intensity: intensity), complete: true, fetch: true) + return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation), complete: true, fetch: true) |> mapToSignal { data in if data.complete, let data = try? Data(contentsOf: URL(fileURLWithPath: data.path)), let image = UIImage(data: data) { return .single((theme, image, thumbnailData)) @@ -1085,7 +1145,7 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedScaledImageRepresentation(size: CGSize(width: 720.0, height: 720.0), mode: .aspectFit), complete: true, fetch: true).start() if file.isPattern, let color = file.settings.color, let intensity = file.settings.intensity { - return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, intensity: intensity), complete: true, fetch: true) + return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation), complete: true, fetch: true) |> mapToSignal { _ in return .complete() } From dece460fcf88fdf2da1a76bc388b69ccd5998e20 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sun, 15 Dec 2019 17:37:33 +0400 Subject: [PATCH 2/5] Theming fixes --- .../Themes/ThemeAccentColorController.swift | 166 ++++++++++-------- .../ThemeAccentColorControllerNode.swift | 40 +++-- .../ThemeAutoNightSettingsController.swift | 2 +- .../Themes/ThemeSettingsController.swift | 6 +- .../Themes/WallpaperColorPanelNode.swift | 2 +- .../Themes/WallpaperGalleryController.swift | 2 +- .../Themes/WallpaperPatternPanelNode.swift | 23 ++- .../DefaultDarkPresentationTheme.swift | 6 +- .../DefaultDarkTintedPresentationTheme.swift | 14 +- .../Sources/DefaultDayPresentationTheme.swift | 6 +- .../Sources/MakePresentationTheme.swift | 17 +- .../Sources/PresentationThemeCodable.swift | 37 ++-- .../Sources/WallpaperResources.swift | 4 +- 13 files changed, 186 insertions(+), 139 deletions(-) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift index 7c62b63322..b2715bf6cd 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift @@ -137,43 +137,61 @@ final class ThemeAccentColorController: ViewController { }, apply: { [weak self] state, serviceBackgroundColor in if let strongSelf = self { let context = strongSelf.context - if case let .edit(theme, _, themeReference, _, completion) = strongSelf.mode { - let updatedTheme: PresentationTheme - if let themeReference = themeReference { - updatedTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: state.accentColor, bubbleColors: state.messagesColors, backgroundColors: state.backgroundColors, serviceBackgroundColor: serviceBackgroundColor) ?? defaultPresentationTheme + + var coloredWallpaper: TelegramWallpaper? + if let backgroundColors = state.backgroundColors { + let color = Int32(bitPattern: backgroundColors.0.rgb) + let bottomColor = backgroundColors.1.flatMap { Int32(bitPattern: $0.rgb) } + + if let patternWallpaper = state.patternWallpaper { + coloredWallpaper = patternWallpaper.withUpdatedSettings(WallpaperSettings(motion: state.motion, color: color, bottomColor: bottomColor, intensity: state.patternIntensity, rotation: state.rotation)) + } else if let bottomColor = bottomColor { + coloredWallpaper = .gradient(color, bottomColor, WallpaperSettings(motion: state.motion, rotation: state.rotation)) } else { - updatedTheme = customizePresentationTheme(theme, editing: false, accentColor: state.accentColor, backgroundColors: state.backgroundColors, bubbleColors: state.messagesColors) + coloredWallpaper = .color(color) + } + } + + let prepare: Signal + if let patternWallpaper = state.patternWallpaper, case let .file(file) = patternWallpaper, let backgroundColors = state.backgroundColors { + let resource = file.file.resource + let representation = CachedPatternWallpaperRepresentation(color: Int32(bitPattern: backgroundColors.0.rgb), bottomColor: backgroundColors.1.flatMap { Int32(bitPattern: $0.rgb) }, intensity: state.patternIntensity, rotation: state.rotation) + + var data: Data? + if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) { + data = maybeData + } else if let path = strongSelf.context.sharedContext.accountManager.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) { + data = maybeData } - completion(updatedTheme) - } else { - let prepare: Signal - if let patternWallpaper = state.patternWallpaper, case let .file(file) = patternWallpaper, let backgroundColors = state.backgroundColors { - let resource = file.file.resource - let representation = CachedPatternWallpaperRepresentation(color: Int32(bitPattern: backgroundColors.0.rgb), bottomColor: backgroundColors.1.flatMap { Int32(bitPattern: $0.rgb) }, intensity: state.patternIntensity, rotation: state.rotation) - - var data: Data? - if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) { - data = maybeData - } else if let path = strongSelf.context.sharedContext.accountManager.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) { - data = maybeData - } - - if let data = data { - strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true) - prepare = (strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true) - |> filter({ $0.complete }) - |> take(1) - |> mapToSignal { _ -> Signal in - return .complete() - }) - } else { - prepare = .complete() - } + if let data = data { + strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true) + prepare = (strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true) + |> filter({ $0.complete }) + |> take(1) + |> mapToSignal { _ -> Signal in + return .complete() + }) } else { prepare = .complete() } - + } else { + prepare = .complete() + } + + if case let .edit(theme, _, themeReference, _, completion) = strongSelf.mode { + let _ = (prepare + |> deliverOnMainQueue).start(completed: { [weak self] in + let updatedTheme: PresentationTheme + if let themeReference = themeReference { + updatedTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: state.accentColor, backgroundColors: state.backgroundColors, bubbleColors: state.messagesColors, wallpaper: state.initialWallpaper ?? coloredWallpaper, serviceBackgroundColor: serviceBackgroundColor) ?? defaultPresentationTheme + } else { + updatedTheme = customizePresentationTheme(theme, editing: false, accentColor: state.accentColor, backgroundColors: state.backgroundColors, bubbleColors: state.messagesColors, wallpaper: state.initialWallpaper ?? coloredWallpaper) + } + + completion(updatedTheme) + }) + } else { let _ = (prepare |> then(updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in let autoNightModeTriggered = context.sharedContext.currentPresentationData.with { $0 }.autoNightModeTriggered @@ -198,17 +216,8 @@ final class ThemeAccentColorController: ViewController { themeSpecificAccentColors[currentTheme.index] = color var wallpaper = themeSpecificChatWallpapers[currentTheme.index] - if let backgroundColors = state.backgroundColors { - let color = Int32(bitPattern: backgroundColors.0.rgb) - let bottomColor = backgroundColors.1.flatMap { Int32(bitPattern: $0.rgb) } - - if let patternWallpaper = state.patternWallpaper { - wallpaper = patternWallpaper.withUpdatedSettings(WallpaperSettings(motion: state.motion, color: color, bottomColor: bottomColor, intensity: state.patternIntensity, rotation: state.rotation)) - } else if let bottomColor = bottomColor { - wallpaper = .gradient(color, bottomColor, WallpaperSettings(motion: state.motion, rotation: state.rotation)) - } else { - wallpaper = .color(color) - } + if let coloredWallpaper = coloredWallpaper { + wallpaper = coloredWallpaper } themeSpecificChatWallpapers[currentTheme.index] = wallpaper @@ -239,7 +248,7 @@ final class ThemeAccentColorController: ViewController { let accentColor: UIColor var initialWallpaper: TelegramWallpaper? - let backgroundColors: (UIColor, UIColor?)? + var backgroundColors: (UIColor, UIColor?)? var patternWallpaper: TelegramWallpaper? var patternIntensity: Int32 = 50 var motion = false @@ -249,13 +258,44 @@ final class ThemeAccentColorController: ViewController { var ignoreDefaultWallpaper = false + func extractWallpaperParameters(_ wallpaper: TelegramWallpaper?) { + guard let wallpaper = wallpaper else { + return + } + if case let .file(file) = wallpaper, file.isPattern { + var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5) + var bottomColor: UIColor? + if let color = file.settings.color { + if let intensity = file.settings.intensity { + patternIntensity = intensity + } + patternColor = UIColor(rgb: UInt32(bitPattern: color)) + if let bottomColorValue = file.settings.bottomColor { + bottomColor = UIColor(rgb: UInt32(bitPattern: bottomColorValue)) + } + } + patternWallpaper = wallpaper + backgroundColors = (patternColor, bottomColor) + motion = file.settings.motion + rotation = file.settings.rotation ?? 0 + } else if case let .color(color) = wallpaper { + backgroundColors = (UIColor(rgb: UInt32(bitPattern: color)), nil) + } else if case let .gradient(topColor, bottomColor, settings) = wallpaper { + backgroundColors = (UIColor(rgb: UInt32(bitPattern: topColor)), UIColor(rgb: UInt32(bitPattern: bottomColor))) + motion = settings.motion + rotation = settings.rotation ?? 0 + } else { + backgroundColors = nil + } + } + if let themeReference = strongSelf.mode.themeReference { accentColor = settings.themeSpecificAccentColors[themeReference.index]?.color ?? defaultDayAccentColor let wallpaper: TelegramWallpaper if let customWallpaper = settings.themeSpecificChatWallpapers[themeReference.index] { wallpaper = customWallpaper } else { - let theme = makePresentationTheme(mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: nil, bubbleColors: nil) ?? defaultPresentationTheme + let theme = makePresentationTheme(mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: nil) ?? defaultPresentationTheme if case let .builtin(themeName) = themeReference { if case .dayClassic = themeName, settings.themeSpecificAccentColors[themeReference.index] != nil { ignoreDefaultWallpaper = true @@ -274,31 +314,7 @@ final class ThemeAccentColorController: ViewController { if let initialBackgroundColor = strongSelf.initialBackgroundColor { backgroundColors = (initialBackgroundColor, nil) } else if !ignoreDefaultWallpaper { - if case let .file(file) = wallpaper, file.isPattern { - var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5) - var bottomColor: UIColor? - if let color = file.settings.color { - if let intensity = file.settings.intensity { - patternIntensity = intensity - } - patternColor = UIColor(rgb: UInt32(bitPattern: color)) - if let bottomColorValue = file.settings.bottomColor { - bottomColor = UIColor(rgb: UInt32(bitPattern: bottomColorValue)) - } - } - patternWallpaper = wallpaper - backgroundColors = (patternColor, bottomColor) - motion = file.settings.motion - rotation = file.settings.rotation ?? 0 - } else if case let .color(color) = wallpaper { - backgroundColors = (UIColor(rgb: UInt32(bitPattern: color)), nil) - } else if case let .gradient(topColor, bottomColor, settings) = wallpaper { - backgroundColors = (UIColor(rgb: UInt32(bitPattern: topColor)), UIColor(rgb: UInt32(bitPattern: bottomColor))) - motion = settings.motion - rotation = settings.rotation ?? 0 - } else { - backgroundColors = nil - } + extractWallpaperParameters(wallpaper) } else { backgroundColors = nil } @@ -318,14 +334,10 @@ final class ThemeAccentColorController: ViewController { } } else if case let .edit(theme, wallpaper, _, _, _) = strongSelf.mode { accentColor = theme.rootController.navigationBar.accentTextColor - if case let .color(color) = theme.chat.defaultWallpaper { - backgroundColors = (UIColor(rgb: UInt32(bitPattern: color)), nil) - } else if case let .gradient(topColor, bottomColor, settings) = theme.chat.defaultWallpaper { - backgroundColors = (UIColor(rgb: UInt32(bitPattern: topColor)), UIColor(rgb: UInt32(bitPattern: bottomColor))) - rotation = settings.rotation ?? 0 - } else { - backgroundColors = nil - } + + let wallpaper = wallpaper ?? theme.chat.defaultWallpaper + extractWallpaperParameters(wallpaper) + let topMessageColor = theme.chat.message.outgoing.bubble.withWallpaper.fill let bottomMessageColor = theme.chat.message.outgoing.bubble.withWallpaper.gradientFill diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift index e5d9c58aba..06212bb676 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift @@ -188,12 +188,12 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate private let serviceBackgroundColorPromise = Promise() private var wallpaperDisposable = MetaDisposable() - private var preview = false - private var currentBackgroundColor: UIColor? + private var currentBackgroundColors: (UIColor, UIColor?)? + private var currentBackgroundPromise = Promise<(UIColor, UIColor?)?>() + private var patternWallpaper: TelegramWallpaper? private var patternArguments: PatternWallpaperArguments? - - private var patternArgumentsValue = Promise() + private var patternArgumentsPromise = Promise() private var patternArgumentsDisposable: Disposable? private var tapGestureRecognizer: UITapGestureRecognizer? @@ -399,7 +399,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.stateDisposable = (self.statePromise.get() |> deliverOn(Queue.concurrentDefaultQueue()) - |> map { state -> (PresentationTheme, (TelegramWallpaper, UIImage?, Signal<(TransformImageArguments) -> DrawingContext?, NoError>?), UIColor, UIColor?, [UIColor], Bool) in + |> map { state -> (PresentationTheme, (TelegramWallpaper, UIImage?, Signal<(TransformImageArguments) -> DrawingContext?, NoError>?), UIColor, (UIColor, UIColor?)?, [UIColor], Bool) in let accentColor = state.accentColor var backgroundColors = state.backgroundColors let messagesColors = state.messagesColors @@ -439,12 +439,10 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate suggestedWallpaper = .gradient(Int32(bitPattern: topColor.rgb), Int32(bitPattern: bottomColor.rgb), WallpaperSettings()) wallpaperSignal = gradientImage([topColor, bottomColor], rotation: state.rotation) backgroundColors = (topColor, bottomColor) - singleBackgroundColor = bottomColor case .nightAccent: let color = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) suggestedWallpaper = .color(Int32(bitPattern: color.rgb)) backgroundColors = (color, nil) - singleBackgroundColor = color default: suggestedWallpaper = .builtin(WallpaperSettings()) } @@ -457,7 +455,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate let serviceBackgroundColor = serviceColor(for: (wallpaper, wallpaperImage)) let updatedTheme: PresentationTheme if let themeReference = mode.themeReference { - updatedTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: accentColor, bubbleColors: messagesColors, backgroundColors: backgroundColors, serviceBackgroundColor: serviceBackgroundColor, preview: true) ?? defaultPresentationTheme + updatedTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: messagesColors, serviceBackgroundColor: serviceBackgroundColor, preview: true) ?? defaultPresentationTheme } else if case let .edit(theme, _, _, _, _) = mode { updatedTheme = customizePresentationTheme(theme, editing: false, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: messagesColors) } else { @@ -468,9 +466,9 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate let patternColors = calcPatternColors(for: state) - return (updatedTheme, (wallpaper, wallpaperImage, wallpaperSignal), serviceBackgroundColor, singleBackgroundColor, patternColors, state.preview) + return (updatedTheme, (wallpaper, wallpaperImage, wallpaperSignal), serviceBackgroundColor, backgroundColors, patternColors, state.preview) } - |> deliverOnMainQueue).start(next: { [weak self] theme, wallpaperImageAndSignal, serviceBackgroundColor, singleBackgroundColor, patternColors, preview in + |> deliverOnMainQueue).start(next: { [weak self] theme, wallpaperImageAndSignal, serviceBackgroundColor, backgroundColors, patternColors, preview in guard let strongSelf = self else { return } @@ -495,13 +493,13 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate strongSelf.immediateBackgroundNode.image = nil strongSelf.immediateBackgroundNode.isHidden = false strongSelf.signalBackgroundNode.isHidden = true - + strongSelf.patternWallpaper = nil } else if let wallpaperImage = wallpaperImage { strongSelf.immediateBackgroundNode.image = wallpaperImage strongSelf.immediateBackgroundNode.isHidden = false strongSelf.signalBackgroundNode.isHidden = true - + strongSelf.patternWallpaper = nil } else if let wallpaperSignal = wallpaperSignal { strongSelf.signalBackgroundNode.contentMode = .scaleToFill @@ -520,7 +518,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate if dispatch { if let _ = strongSelf.patternArgumentsDisposable { } else { - let throttledSignal = strongSelf.patternArgumentsValue.get() + let throttledSignal = strongSelf.patternArgumentsPromise.get() |> mapToThrottled { next -> Signal in return .single(next) |> then(.complete() |> delay(0.016667, queue: Queue.concurrentDefaultQueue())) } @@ -534,7 +532,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate }) } - strongSelf.patternArgumentsValue.set(.single(TransformImageArguments(corners: ImageCorners(), imageSize: layout.size, boundingSize: layout.size, intrinsicInsets: UIEdgeInsets(), custom: patternArguments))) + strongSelf.patternArgumentsPromise.set(.single(TransformImageArguments(corners: ImageCorners(), imageSize: layout.size, boundingSize: layout.size, intrinsicInsets: UIEdgeInsets(), custom: patternArguments))) } else { strongSelf.patternArgumentsDisposable?.dispose() strongSelf.patternArgumentsDisposable = nil @@ -550,8 +548,12 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate } strongSelf.wallpaper = wallpaper strongSelf.patternArguments = patternArguments - strongSelf.currentBackgroundColor = singleBackgroundColor - + + if !preview { + strongSelf.currentBackgroundColors = backgroundColors + strongSelf.patternPanelNode.backgroundColors = backgroundColors + } + if let (layout, navigationBarHeight, messagesBottomInset) = strongSelf.validLayout { strongSelf.updateChatsLayout(layout: layout, topInset: navigationBarHeight, transition: .immediate) strongSelf.updateMessagesLayout(layout: layout, bottomInset: messagesBottomInset, transition: .immediate) @@ -1031,7 +1033,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate @objc private func togglePattern() { let wallpaper = self.state.previousPatternWallpaper ?? self.patternPanelNode.wallpapers.first - let backgroundColor = self.currentBackgroundColor + let backgroundColors = self.currentBackgroundColors var appeared = false self.updateState({ current in @@ -1044,8 +1046,8 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate updated.displayPatternPanel = true if current.patternWallpaper == nil, let wallpaper = wallpaper { updated.patternWallpaper = wallpaper - if updated.backgroundColors == nil, let color = backgroundColor { - updated.backgroundColors = (color, nil) + if updated.backgroundColors == nil { + updated.backgroundColors = backgroundColors } appeared = true } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift index 1e411fc73f..f9ed43dac9 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAutoNightSettingsController.swift @@ -523,7 +523,7 @@ public func themeAutoNightSettingsController(context: AccountContext) -> ViewCon } })) }, updateTheme: { theme in - guard let presentationTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: theme, accentColor: nil, bubbleColors: nil, serviceBackgroundColor: .black) else { + guard let presentationTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: theme) else { return } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift index a8f175e5a1..7fcb29126c 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift @@ -481,7 +481,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The currentTheme = current.automaticThemeSwitchSetting.theme } - guard let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: currentTheme, accentColor: color?.color, bubbleColors: nil) else { + guard let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: currentTheme, accentColor: color?.color) else { return current } @@ -559,7 +559,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The }))) } else { items.append(.action(ContextMenuActionItem(text: strings.Theme_Context_ChangeColors, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/ApplyTheme"), color: theme.contextMenu.primaryColor) }, action: { c, f in - guard let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: reference, accentColor: nil, bubbleColors: nil, backgroundColors: nil, preview: false) else { + guard let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: reference, preview: false) else { return } @@ -725,7 +725,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The return controller?.navigationController as? NavigationController } selectThemeImpl = { theme in - guard let presentationTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: theme, accentColor: nil, bubbleColors: nil, serviceBackgroundColor: .black) else { + guard let presentationTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: theme) else { return } diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift index eb9c41287b..6cba98b03f 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift @@ -284,7 +284,7 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate { private func updateSelectionLayout(size: CGSize, transition: ContainedViewLayoutTransition) { self.measureNode.attributedText = NSAttributedString(string: self.textFieldNode.textField.text ?? "", font: self.textFieldNode.textField.font) let size = self.measureNode.updateLayout(size) - transition.updateFrame(node: self.selectionNode, frame: CGRect(x: self.textFieldNode.frame.minX, y: 6.0, width: max(45.0, size.width), height: 20.0)) + transition.updateFrame(node: self.selectionNode, frame: CGRect(x: self.textFieldNode.frame.minX, y: 6.0, width: max(0.0, size.width), height: 20.0)) } private func updateSelectionVisibility() { diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift index 0563302b6f..c2607874c9 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift @@ -733,7 +733,7 @@ public class WallpaperGalleryController: ViewController { self.overlayNode?.insertSubnode(patternPanelNode, belowSubnode: self.toolbarNode!) } - let panelHeight: CGFloat = 190.0 + let panelHeight: CGFloat = 235.0 var patternPanelFrame = CGRect(x: 0.0, y: layout.size.height, width: layout.size.width, height: panelHeight) if self.patternPanelEnabled { patternPanelFrame.origin = CGPoint(x: 0.0, y: layout.size.height - bottomInset - panelHeight) diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift index d0e7ba4b90..1ae6a7e093 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift @@ -40,6 +40,12 @@ final class WallpaperPatternPanelNode: ASDisplayNode { } } + var backgroundColors: (UIColor, UIColor?)? = nil { + didSet { + self.updateWallpapers() + } + } + private var validLayout: CGSize? var patternChanged: ((TelegramWallpaper?, Int32?, Bool) -> Void)? @@ -128,15 +134,17 @@ final class WallpaperPatternPanelNode: ASDisplayNode { node.removeFromSupernode() } + let backgroundColors = self.backgroundColors ?? (UIColor(rgb: 0xd6e2ee), nil) + var selected = true for wallpaper in wallpapers { - let node = SettingsThemeWallpaperNode(overlayBackgroundColor: UIColor(rgb: 0x748698, alpha: 0.4)) + let node = SettingsThemeWallpaperNode(overlayBackgroundColor: self.serviceBackgroundColor.withAlphaComponent(0.4)) node.clipsToBounds = true node.cornerRadius = 5.0 var updatedWallpaper = wallpaper if case let .file(file) = updatedWallpaper { - let settings = WallpaperSettings(blur: false, motion: false, color: 0xd6e2ee, intensity: 100) + let settings = WallpaperSettings(blur: false, motion: false, color: Int32(bitPattern: backgroundColors.0.rgb), bottomColor: backgroundColors.1.flatMap { Int32(bitPattern: $0.rgb) }, intensity: 100) updatedWallpaper = .file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: file.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: settings) } @@ -193,6 +201,11 @@ final class WallpaperPatternPanelNode: ASDisplayNode { var wallpaper = initialWallpaper ?? self.wallpapers.first if let wallpaper = wallpaper { + var selectedFileId: Int64? + if case let .file(file) = wallpaper { + selectedFileId = file.id + } + self.currentWallpaper = wallpaper self.sliderView?.value = 40.0 @@ -200,7 +213,11 @@ final class WallpaperPatternPanelNode: ASDisplayNode { if let subnodes = self.scrollNode.subnodes { for case let subnode as SettingsThemeWallpaperNode in subnodes { - subnode.setSelected(wallpaper == subnode.wallpaper, animated: false) + var selected = false + if case let .file(file) = subnode.wallpaper, file.id == selectedFileId { + selected = true + } + subnode.setSelected(selected, animated: false) } } diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift index 794aa65ef4..4a72514c1a 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift @@ -6,7 +6,7 @@ import TelegramUIPreferences public let defaultDarkPresentationTheme = makeDefaultDarkPresentationTheme(preview: false) -public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, editing: Bool, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?) -> PresentationTheme { +public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, editing: Bool, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil) -> PresentationTheme { if (theme.referenceTheme != .night) { return theme } @@ -80,7 +80,9 @@ public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, edit } var defaultWallpaper: TelegramWallpaper? - if let backgroundColors = backgroundColors { + if let forcedWallpaper = forcedWallpaper { + defaultWallpaper = forcedWallpaper + } else if let backgroundColors = backgroundColors { if let secondColor = backgroundColors.1 { defaultWallpaper = .gradient(Int32(bitPattern: backgroundColors.0.rgb), Int32(bitPattern: secondColor.rgb), WallpaperSettings()) } else { diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift index f36b7344ab..7b11115f77 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift @@ -7,15 +7,7 @@ import TelegramUIPreferences private let defaultDarkTintedAccentColor = UIColor(rgb: 0x2ea6ff) public let defaultDarkTintedPresentationTheme = makeDefaultDarkTintedPresentationTheme(preview: false) -//public func makeDarkAccentPresentationTheme(accentColor: UIColor?, bubbleColors: (UIColor, UIColor?)?, preview: Bool) -> PresentationTheme { -// var accentColor = accentColor ?? defaultDarkAccentColor -// if accentColor == PresentationThemeBaseColor.blue.color { -// accentColor = defaultDarkAccentColor -// } -// return makeDarkPresentationTheme(accentColor: accentColor, bubbleColors: bubbleColors, preview: preview) -//} - -public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme, editing: Bool, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?) -> PresentationTheme { +public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme, editing: Bool, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil) -> PresentationTheme { if (theme.referenceTheme != .nightAccent) { return theme } @@ -217,7 +209,9 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme } var defaultWallpaper: TelegramWallpaper? - if let backgroundColors = backgroundColors { + if let forcedWallpaper = forcedWallpaper { + defaultWallpaper = forcedWallpaper + } else if let backgroundColors = backgroundColors { if let secondColor = backgroundColors.1 { defaultWallpaper = .gradient(Int32(bitPattern: backgroundColors.0.rgb), Int32(bitPattern: secondColor.rgb), WallpaperSettings()) } else { diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index 9e62e708a8..366dfa1ca5 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -8,7 +8,7 @@ public let defaultServiceBackgroundColor = UIColor(rgb: 0x000000, alpha: 0.3) public let defaultPresentationTheme = makeDefaultDayPresentationTheme(serviceBackgroundColor: defaultServiceBackgroundColor, day: false, preview: false) public let defaultDayAccentColor = UIColor(rgb: 0x007ee5) -public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, serviceBackgroundColor: UIColor?) -> PresentationTheme { +public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil, serviceBackgroundColor: UIColor?) -> PresentationTheme { if (theme.referenceTheme != .day && theme.referenceTheme != .dayClassic) { return theme } @@ -172,7 +172,9 @@ public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, ac } var defaultWallpaper: TelegramWallpaper? - if let backgroundColors = backgroundColors { + if let forcedWallpaper = forcedWallpaper { + defaultWallpaper = forcedWallpaper + } else if let backgroundColors = backgroundColors { if let secondColor = backgroundColors.1 { defaultWallpaper = .gradient(Int32(bitPattern: backgroundColors.0.rgb), Int32(bitPattern: secondColor.rgb), WallpaperSettings()) } else { diff --git a/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift b/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift index 2517d0a65b..f176fc1c69 100644 --- a/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import Postbox +import SyncCore import TelegramUIPreferences public func makeDefaultPresentationTheme(reference: PresentationBuiltinThemeReference, serviceBackgroundColor: UIColor?, preview: Bool = false) -> PresentationTheme { @@ -18,37 +19,37 @@ public func makeDefaultPresentationTheme(reference: PresentationBuiltinThemeRefe return theme } -public func customizePresentationTheme(_ theme: PresentationTheme, editing: Bool, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?) -> PresentationTheme { +public func customizePresentationTheme(_ theme: PresentationTheme, editing: Bool, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, wallpaper: TelegramWallpaper? = nil) -> PresentationTheme { if accentColor == nil && bubbleColors == nil && backgroundColors == nil { return theme } switch theme.referenceTheme { case .day, .dayClassic: - return customizeDefaultDayTheme(theme: theme, editing: editing, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, serviceBackgroundColor: nil) + return customizeDefaultDayTheme(theme: theme, editing: editing, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper, serviceBackgroundColor: nil) case .night: - return customizeDefaultDarkPresentationTheme(theme: theme, editing: editing, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors) + return customizeDefaultDarkPresentationTheme(theme: theme, editing: editing, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper) case .nightAccent: - return customizeDefaultDarkTintedPresentationTheme(theme: theme, editing: editing, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors) + return customizeDefaultDarkTintedPresentationTheme(theme: theme, editing: editing, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper) } return theme } -public func makePresentationTheme(mediaBox: MediaBox, themeReference: PresentationThemeReference, accentColor: UIColor?, bubbleColors: (UIColor, UIColor?)?, backgroundColors: (UIColor, UIColor?)? = nil, serviceBackgroundColor: UIColor? = nil, preview: Bool = false) -> PresentationTheme? { +public func makePresentationTheme(mediaBox: MediaBox, themeReference: PresentationThemeReference, accentColor: UIColor? = nil, backgroundColors: (UIColor, UIColor?)? = nil, bubbleColors: (UIColor, UIColor?)? = nil, wallpaper: TelegramWallpaper? = nil, serviceBackgroundColor: UIColor? = nil, preview: Bool = false) -> PresentationTheme? { let theme: PresentationTheme switch themeReference { case let .builtin(reference): let defaultTheme = makeDefaultPresentationTheme(reference: reference, serviceBackgroundColor: serviceBackgroundColor, preview: preview) - theme = customizePresentationTheme(defaultTheme, editing: true, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors) + theme = customizePresentationTheme(defaultTheme, editing: true, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper) case let .local(info): if let path = mediaBox.completedResourcePath(info.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead), let loadedTheme = makePresentationTheme(data: data, resolvedWallpaper: info.resolvedWallpaper) { - theme = customizePresentationTheme(loadedTheme, editing: false, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors) + theme = customizePresentationTheme(loadedTheme, editing: false, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper) } else { return nil } case let .cloud(info): if let file = info.theme.file, let path = mediaBox.completedResourcePath(file.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead), let loadedTheme = makePresentationTheme(data: data, resolvedWallpaper: info.resolvedWallpaper) { - theme = customizePresentationTheme(loadedTheme, editing: false, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors) + theme = customizePresentationTheme(loadedTheme, editing: false, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper) } else { return nil } diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift index 54f92d68ad..5375b2543d 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift @@ -39,6 +39,8 @@ extension TelegramWallpaper: Codable { case "builtin": self = .builtin(WallpaperSettings()) default: + let options = ["motion", "blur"] + if [6,7].contains(value.count), let color = UIColor(hexString: value) { self = .color(Int32(bitPattern: color.rgb)) } else { @@ -52,28 +54,40 @@ extension TelegramWallpaper: Codable { blur = true } - if components.count >= 2 && components.count <= 4 && [6,7].contains(components[0].count) && !["motion", "blur"].contains(components[0]) && [6,7].contains(components[1].count) && !["motion", "blur"].contains(components[1]), let topColor = UIColor(hexString: components[0]), let bottomColor = UIColor(hexString: components[1]) { + if components.count >= 2 && components.count <= 4 && [6,7].contains(components[0].count) && !options.contains(components[0]) && [6,7].contains(components[1].count) && !options.contains(components[1]), let topColor = UIColor(hexString: components[0]), let bottomColor = UIColor(hexString: components[1]) { self = .gradient(Int32(bitPattern: topColor.rgb), Int32(bitPattern: bottomColor.rgb), WallpaperSettings(blur: blur, motion: motion)) } else { var slug: String? var color: Int32? + var bottomColor: Int32? var intensity: Int32? if !components.isEmpty { slug = components[0] } - if components.count > 1, !["motion", "blur"].contains(components[1]), components[1].count == 6, let value = UIColor(hexString: components[1]) { - color = Int32(bitPattern: value.rgb) - } - if components.count > 2, !["motion", "blur"].contains(components[2]), let value = Int32(components[2]) { - if value >= 0 && value <= 100 { - intensity = value - } else { - intensity = 50 + if components.count > 1 { + for i in 1 ..< components.count { + let component = components[i] + if options.contains(component) { + continue + } + if component.count == 6, let value = UIColor(hexString: component) { + if color == nil { + color = Int32(bitPattern: value.rgb) + } else if bottomColor == nil { + bottomColor = Int32(bitPattern: value.rgb) + } + } else if component.count <= 3, let value = Int32(component) { + if value >= 0 && value <= 100 { + intensity = value + } else { + intensity = 50 + } + } } } if let slug = slug { - self = .file(id: 0, accessHash: 0, isCreator: false, isDefault: false, isPattern: color != nil, isDark: false, slug: slug, file: TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "", size: nil, attributes: []), settings: WallpaperSettings(blur: blur, motion: motion, color: color, intensity: intensity)) + self = .file(id: 0, accessHash: 0, isCreator: false, isDefault: false, isPattern: color != nil, isDark: false, slug: slug, file: TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "", size: nil, attributes: []), settings: WallpaperSettings(blur: blur, motion: motion, color: color, bottomColor: bottomColor, intensity: intensity)) } else { throw PresentationThemeDecodingError.generic } @@ -113,6 +127,9 @@ extension TelegramWallpaper: Codable { if let intensity = file.settings.intensity { components.append("\(intensity)") } + if let bottomColor = file.settings.bottomColor { + components.append(String(format: "%06x", bottomColor)) + } } if file.settings.motion { components.append("motion") diff --git a/submodules/WallpaperResources/Sources/WallpaperResources.swift b/submodules/WallpaperResources/Sources/WallpaperResources.swift index 1a17a01b25..fd84461012 100644 --- a/submodules/WallpaperResources/Sources/WallpaperResources.swift +++ b/submodules/WallpaperResources/Sources/WallpaperResources.swift @@ -1067,7 +1067,7 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the incomingColor = UIColor(rgb: 0xffffff) if let accentColor = accentColor { if let bubbleColors = bubbleColors { - backgroundColor = UIColor(rgb: 0xffffff) + backgroundColor = UIColor(rgb: 0xd6e2ee) outgoingColor = bubbleColors } else { backgroundColor = accentColor.withMultiplied(hue: 1.019, saturation: 0.867, brightness: 0.965) @@ -1127,7 +1127,7 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the backgroundColor = (.black, nil) case let .file(file): if file.isPattern, let color = file.settings.color { - backgroundColor = (UIColor(rgb: UInt32(bitPattern: color)), nil) + backgroundColor = (UIColor(rgb: UInt32(bitPattern: color)), file.settings.bottomColor.flatMap { UIColor(rgb: UInt32(bitPattern: $0)) }) } else { backgroundColor = (theme.chatList.backgroundColor, nil) } From 26f89fedef516a768e7d64ae90f440c6f01c96c8 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sun, 15 Dec 2019 20:13:04 +0400 Subject: [PATCH 3/5] Fix pattern wallpaper preview & setup interface --- .../Themes/WallpaperPatternPanelNode.swift | 17 +++++++++++++---- .../Sources/WallpaperResources.swift | 1 - 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift index 1ae6a7e093..9e8ff0bfc8 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift @@ -42,7 +42,9 @@ final class WallpaperPatternPanelNode: ASDisplayNode { var backgroundColors: (UIColor, UIColor?)? = nil { didSet { - self.updateWallpapers() + if oldValue?.0.rgb != self.backgroundColors?.0.rgb || oldValue?.1?.rgb != self.backgroundColors?.1?.rgb { + self.updateWallpapers() + } } } @@ -136,7 +138,11 @@ final class WallpaperPatternPanelNode: ASDisplayNode { let backgroundColors = self.backgroundColors ?? (UIColor(rgb: 0xd6e2ee), nil) - var selected = true + var selectedFileId: Int64? + if let currentWallpaper = self.currentWallpaper, case let .file(file) = currentWallpaper { + selectedFileId = file.id + } + for wallpaper in wallpapers { let node = SettingsThemeWallpaperNode(overlayBackgroundColor: self.serviceBackgroundColor.withAlphaComponent(0.4)) node.clipsToBounds = true @@ -148,6 +154,11 @@ final class WallpaperPatternPanelNode: ASDisplayNode { updatedWallpaper = .file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: file.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: settings) } + var selected = false + if case let .file(file) = wallpaper, file.id == selectedFileId { + selected = true + } + node.setWallpaper(context: self.context, wallpaper: updatedWallpaper, selected: selected, size: itemSize) node.pressed = { [weak self, weak node] in if let strongSelf = self { @@ -163,8 +174,6 @@ final class WallpaperPatternPanelNode: ASDisplayNode { } } self.scrollNode.addSubnode(node) - - selected = false } self.scrollNode.view.contentSize = CGSize(width: (itemSize.width + inset) * CGFloat(wallpapers.count) + inset, height: 112.0) diff --git a/submodules/WallpaperResources/Sources/WallpaperResources.swift b/submodules/WallpaperResources/Sources/WallpaperResources.swift index fd84461012..ad593d4c3d 100644 --- a/submodules/WallpaperResources/Sources/WallpaperResources.swift +++ b/submodules/WallpaperResources/Sources/WallpaperResources.swift @@ -480,7 +480,6 @@ public func patternWallpaperImageInternal(thumbnailData: Data?, fullSizeData: Da if colors.count == 1 { c.setFillColor(patternColor(for: color, intensity: intensity, prominent: prominent).cgColor) - c.fill(arguments.drawingRect) c.fill(arguments.drawingRect) } else { let gradientColors = colors.map { patternColor(for: $0, intensity: intensity, prominent: prominent).cgColor } as CFArray From 62ae89d18b98157ebe3c37d8ad0f32fb6c93888c Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Mon, 16 Dec 2019 10:33:16 +0400 Subject: [PATCH 4/5] Various theming fixes --- .../AvatarNode/Sources/AvatarNode.swift | 7 ++- submodules/Display/Display/ListView.swift | 6 +- .../Sources/ItemListPeerItem.swift | 4 +- .../ChatMessageLiveLocationPositionNode.swift | 4 +- .../Sources/VenueIconResources.swift | 23 ++++++- .../Sources/LocationActionListItem.swift | 2 +- .../Sources/LocationAnnotation.swift | 24 +++++-- .../LocationUI/Sources/LocationMapNode.swift | 4 +- .../Sources/LocationPickerController.swift | 8 +-- .../LocationPickerControllerNode.swift | 57 ++++++++++------- .../Sources/MapResourceToAvatarSizes.swift | 8 ++- .../Themes/ThemeAccentColorController.swift | 39 ++++++++---- .../ThemeAccentColorControllerNode.swift | 16 ++--- .../Themes/ThemeColorsGridController.swift | 18 +++++- .../Themes/ThemeSettingsController.swift | 62 ++++++++++++------- .../Themes/ThemeSettingsThemeItem.swift | 53 ++++++++-------- .../Themes/WallpaperGalleryController.swift | 39 +----------- .../Sources/Themes/WallpaperGalleryItem.swift | 2 +- .../Themes/WallpaperPatternPanelNode.swift | 27 ++++++-- .../Sources/PermissionController.swift | 8 ++- .../DefaultDarkPresentationTheme.swift | 1 - .../DefaultDarkTintedPresentationTheme.swift | 9 +++ .../Sources/DefaultDayPresentationTheme.swift | 3 +- .../Sources/PresentationThemeCodable.swift | 22 +++++-- .../Sources/WallpaperUtils.swift | 2 +- .../TelegramUI/CreateChannelController.swift | 4 +- .../TelegramUI/CreateGroupController.swift | 1 - .../TelegramUI/OpenChatMessage.swift | 21 +++++-- .../Sources/WallpaperResources.swift | 2 +- 29 files changed, 302 insertions(+), 174 deletions(-) diff --git a/submodules/AvatarNode/Sources/AvatarNode.swift b/submodules/AvatarNode/Sources/AvatarNode.swift index 86256cc0b4..92cdcfe761 100644 --- a/submodules/AvatarNode/Sources/AvatarNode.swift +++ b/submodules/AvatarNode/Sources/AvatarNode.swift @@ -449,7 +449,12 @@ public final class AvatarNode: ASDisplayNode { colorsArray = grayscaleColors } } else if colorIndex == -1 { - colorsArray = grayscaleColors + if let parameters = parameters as? AvatarNodeParameters, let theme = parameters.theme { + let colors = theme.chatList.unpinnedArchiveAvatarColor.backgroundColors.colors + colorsArray = [colors.1.cgColor, colors.0.cgColor] + } else { + colorsArray = grayscaleColors + } } else { colorsArray = gradientColors[colorIndex % gradientColors.count] } diff --git a/submodules/Display/Display/ListView.swift b/submodules/Display/Display/ListView.swift index 70ad620f7f..ea7a37522d 100644 --- a/submodules/Display/Display/ListView.swift +++ b/submodules/Display/Display/ListView.swift @@ -3799,9 +3799,9 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture if node.apparentHeight > self.visibleSize.height - self.insets.top - self.insets.bottom { if node.frame.maxY > self.visibleSize.height - self.insets.bottom { self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.bottom(-overflow), animated: animated, curve: ListViewAnimationCurve.Default(duration: 0.25), directionHint: ListViewScrollToItemDirectionHint.Down), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) - }/* else if node.frame.minY < self.insets.top { - self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(0.0), animated: true, curve: ListViewAnimationCurve.Default(duration: 0.25), directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) - }*/ + } else if node.frame.minY < self.insets.top && overflow > 0.0 { + self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: true, curve: ListViewAnimationCurve.Default(duration: 0.25), directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + } } else { if self.experimentalSnapScrollToItem { self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.visible, animated: animated, curve: ListViewAnimationCurve.Default(duration: nil), directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) diff --git a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift index 8f168ee150..c8018f245a 100644 --- a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift +++ b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift @@ -563,8 +563,8 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: labelAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 16.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - editingOffset - rightInset - labelLayout.size.width, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let (statusLayout, statusApply) = makeStatusLayout(TextNodeLayoutArguments(attributedString: statusAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - editingOffset - rightInset - labelLayout.size.width, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - editingOffset - rightInset - labelLayout.size.width - labelInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) + let (statusLayout, statusApply) = makeStatusLayout(TextNodeLayoutArguments(attributedString: statusAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - editingOffset - rightInset - labelLayout.size.width - labelInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) var insets = itemListNeighborsGroupedInsets(neighbors) if !item.hasTopGroupInset { diff --git a/submodules/LiveLocationPositionNode/Sources/ChatMessageLiveLocationPositionNode.swift b/submodules/LiveLocationPositionNode/Sources/ChatMessageLiveLocationPositionNode.swift index a0b99ae1b0..ce9b4ead41 100644 --- a/submodules/LiveLocationPositionNode/Sources/ChatMessageLiveLocationPositionNode.swift +++ b/submodules/LiveLocationPositionNode/Sources/ChatMessageLiveLocationPositionNode.swift @@ -148,8 +148,10 @@ public final class ChatMessageLiveLocationPositionNode: ASDisplayNode { strongSelf.iconNode.setSignal(venueIcon(postbox: context.account.postbox, type: updatedVenueType, background: false)) } + + let arguments = VenueIconArguments(defaultForegroundColor: theme.chat.inputPanel.actionControlForegroundColor) let iconSize = CGSize(width: 44.0, height: 44.0) - let apply = iconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: iconSize, boundingSize: iconSize, intrinsicInsets: UIEdgeInsets())) + let apply = iconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: iconSize, boundingSize: iconSize, intrinsicInsets: UIEdgeInsets(), custom: arguments)) apply() strongSelf.iconNode.frame = CGRect(origin: CGPoint(x: 9.0, y: 14.0), size: iconSize) diff --git a/submodules/LocationResources/Sources/VenueIconResources.swift b/submodules/LocationResources/Sources/VenueIconResources.swift index e4261cb88e..4384acda86 100644 --- a/submodules/LocationResources/Sources/VenueIconResources.swift +++ b/submodules/LocationResources/Sources/VenueIconResources.swift @@ -154,6 +154,20 @@ public func venueIconColor(type: String) -> UIColor { return randomColors[index] } +public struct VenueIconArguments: TransformImageCustomArguments { + let defaultForegroundColor: UIColor + + public init(defaultForegroundColor: UIColor) { + self.defaultForegroundColor = defaultForegroundColor + } + + public func serialized() -> NSArray { + let array = NSMutableArray() + array.add(self.defaultForegroundColor) + return array + } +} + public func venueIcon(postbox: Postbox, type: String, background: Bool) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> { let isBuiltinIcon = ["", "home", "work"].contains(type) let data: Signal = isBuiltinIcon ? .single(nil) : venueIconData(postbox: postbox, resource: VenueIconResource(type: type)) @@ -167,8 +181,13 @@ public func venueIcon(postbox: Postbox, type: String, background: Bool) -> Signa } let backgroundColor = venueIconColor(type: type) - let foregroundColor = UIColor.white - + let foregroundColor: UIColor + if type.isEmpty, let customArguments = arguments.custom as? VenueIconArguments { + foregroundColor = customArguments.defaultForegroundColor + } else { + foregroundColor = UIColor.white + } + context.withFlippedContext { c in if background { c.setFillColor(backgroundColor.cgColor) diff --git a/submodules/LocationUI/Sources/LocationActionListItem.swift b/submodules/LocationUI/Sources/LocationActionListItem.swift index 20082b8dcd..52ac179b82 100644 --- a/submodules/LocationUI/Sources/LocationActionListItem.swift +++ b/submodules/LocationUI/Sources/LocationActionListItem.swift @@ -73,7 +73,7 @@ private func generateLiveLocationIcon(theme: PresentationTheme) -> UIImage { context.scaleBy(x: 1.0, y: -1.0) context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0) - if let image = generateTintedImage(image: UIImage(bundleImageName: "Location/SendLiveLocationIcon"), color: theme.chat.inputPanel.actionControlForegroundColor) { + if let image = generateTintedImage(image: UIImage(bundleImageName: "Location/SendLiveLocationIcon"), color: .white) { context.draw(image.cgImage!, in: CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.height - image.size.height) / 2.0)), size: image.size)) } }! diff --git a/submodules/LocationUI/Sources/LocationAnnotation.swift b/submodules/LocationUI/Sources/LocationAnnotation.swift index 490994ab4c..4dd1184bac 100644 --- a/submodules/LocationUI/Sources/LocationAnnotation.swift +++ b/submodules/LocationUI/Sources/LocationAnnotation.swift @@ -97,6 +97,7 @@ class LocationPinAnnotationView: MKAnnotationView { var strokeLabelNode: ImmediateTextNode? var labelNode: ImmediateTextNode? + var initialized = false var appeared = false var animating = false @@ -203,6 +204,11 @@ class LocationPinAnnotationView: MKAnnotationView { if annotation.forcedSelection { self.setSelected(true, animated: false) } + + if self.initialized && !self.appeared { + self.appeared = true + self.animateAppearance() + } } } } @@ -211,6 +217,7 @@ class LocationPinAnnotationView: MKAnnotationView { override func prepareForReuse() { self.smallNode.isHidden = true self.backgroundNode.isHidden = false + self.appeared = false } override func setSelected(_ selected: Bool, animated: Bool) { @@ -516,6 +523,10 @@ class LocationPinAnnotationView: MKAnnotationView { } func animateAppearance() { + guard let annotation = self.annotation as? LocationPinAnnotation, annotation.location != nil && !annotation.forcedSelection else { + return + } + self.smallNode.transform = CATransform3DMakeScale(0.1, 0.1, 1.0) let avatarNodeTransform = self.avatarNode?.transform @@ -546,8 +557,13 @@ class LocationPinAnnotationView: MKAnnotationView { let smallIconApply = smallIconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: self.smallIconNode.bounds.size, boundingSize: self.smallIconNode.bounds.size, intrinsicInsets: UIEdgeInsets())) smallIconApply() + var arguments: VenueIconArguments? + if let annotation = self.annotation as? LocationPinAnnotation { + arguments = VenueIconArguments(defaultForegroundColor: annotation.theme.chat.inputPanel.actionControlForegroundColor) + } + let iconLayout = self.iconNode.asyncLayout() - let iconApply = iconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: self.iconNode.bounds.size, boundingSize: self.iconNode.bounds.size, intrinsicInsets: UIEdgeInsets())) + let iconApply = iconLayout(TransformImageArguments(corners: ImageCorners(), imageSize: self.iconNode.bounds.size, boundingSize: self.iconNode.bounds.size, intrinsicInsets: UIEdgeInsets(), custom: arguments)) iconApply() if let avatarNode = self.avatarNode { @@ -558,10 +574,8 @@ class LocationPinAnnotationView: MKAnnotationView { if !self.appeared { self.appeared = true - - if let annotation = annotation as? LocationPinAnnotation, annotation.location != nil && !annotation.forcedSelection { - self.animateAppearance() - } + self.initialized = true + self.animateAppearance() } } } diff --git a/submodules/LocationUI/Sources/LocationMapNode.swift b/submodules/LocationUI/Sources/LocationMapNode.swift index 9b5a11475b..7fd7152b2f 100644 --- a/submodules/LocationUI/Sources/LocationMapNode.swift +++ b/submodules/LocationUI/Sources/LocationMapNode.swift @@ -120,7 +120,7 @@ final class LocationMapNode: ASDisplayNode, MKMapViewDelegate { } } - func setMapCenter(coordinate: CLLocationCoordinate2D, span: MKCoordinateSpan = defaultMapSpan, offset: CGPoint = CGPoint(), isUserLocation: Bool = false, animated: Bool = false) { + func setMapCenter(coordinate: CLLocationCoordinate2D, span: MKCoordinateSpan = defaultMapSpan, offset: CGPoint = CGPoint(), isUserLocation: Bool = false, hidePicker: Bool = false, animated: Bool = false) { let region = MKCoordinateRegion(center: coordinate, span: span) self.ignoreRegionChanges = true if offset == CGPoint() { @@ -136,7 +136,7 @@ final class LocationMapNode: ASDisplayNode, MKMapViewDelegate { self.returnedToUserLocation = true self.pickerAnnotationView?.setRaised(true, animated: true) } - } else if self.hasPickerAnnotation, let customUserLocationAnnotationView = self.customUserLocationAnnotationView, customUserLocationAnnotationView.isHidden { + } else if self.hasPickerAnnotation, let customUserLocationAnnotationView = self.customUserLocationAnnotationView, customUserLocationAnnotationView.isHidden, hidePicker { self.pickerAnnotationContainerView.isHidden = true customUserLocationAnnotationView.setSelected(false, animated: false) customUserLocationAnnotationView.isHidden = false diff --git a/submodules/LocationUI/Sources/LocationPickerController.swift b/submodules/LocationUI/Sources/LocationPickerController.swift index e60f9e19ba..1a150f9c18 100644 --- a/submodules/LocationUI/Sources/LocationPickerController.swift +++ b/submodules/LocationUI/Sources/LocationPickerController.swift @@ -196,13 +196,7 @@ public final class LocationPickerController: ViewController { guard let strongSelf = self else { return } - strongSelf.controllerNode.updateState { state in - var state = state - state.displayingMapModeOptions = false - state.selectedLocation = .none - state.searchingVenuesAround = false - return state - } + strongSelf.controllerNode.goToUserLocation() }, goToCoordinate: { [weak self] coordinate in guard let strongSelf = self else { return diff --git a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift index a7fc4e163c..e94d1847b4 100644 --- a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift +++ b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift @@ -412,16 +412,18 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { } ) - let foundVenues: Signal<[TelegramMediaMap]?, NoError> = .single(nil) + let foundVenues: Signal<([TelegramMediaMap], CLLocation)?, NoError> = .single(nil) |> then( self.searchVenuesPromise.get() |> distinctUntilChanged - |> mapToSignal { coordinate -> Signal<[TelegramMediaMap]?, NoError> in + |> mapToSignal { coordinate -> Signal<([TelegramMediaMap], CLLocation)?, NoError> in if let coordinate = coordinate { return (.single(nil) |> then( nearbyVenues(account: context.account, latitude: coordinate.latitude, longitude: coordinate.longitude) - |> map (Optional.init) + |> map { venues -> ([TelegramMediaMap], CLLocation)? in + return (venues, CLLocation(latitude: coordinate.latitude, longitude: coordinate.longitude)) + } )) } else { return .single(nil) @@ -435,8 +437,10 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { let previousEntries = Atomic<[LocationPickerEntry]?>(value: nil) self.disposable = (combineLatest(self.presentationDataPromise.get(), self.statePromise.get(), userLocation, venues, foundVenues) - |> deliverOnMainQueue).start(next: { [weak self] presentationData, state, userLocation, venues, foundVenues in + |> deliverOnMainQueue).start(next: { [weak self] presentationData, state, userLocation, venues, foundVenuesAndLocation in if let strongSelf = self { + let (foundVenues, foundVenuesLocation) = foundVenuesAndLocation ?? (nil, nil) + var entries: [LocationPickerEntry] = [] switch state.selectedLocation { case let .location(coordinate, address): @@ -483,7 +487,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { entries.append(.header(presentationData.theme, presentationData.strings.Map_ChooseAPlace.uppercased())) - var displayedVenues = state.searchingVenuesAround ? foundVenues : venues + var displayedVenues = foundVenues != nil || state.searchingVenuesAround ? foundVenues : venues if let venues = displayedVenues { var index: Int = 0 for venue in venues { @@ -513,10 +517,8 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { strongSelf.headerNode.mapNode.setMapCenter(coordinate: userLocation.coordinate, isUserLocation: true, animated: previousUserLocation != nil) } strongSelf.headerNode.mapNode.resetAnnotationSelection() - strongSelf.searchVenuesPromise.set(.single(nil)) case .selecting: strongSelf.headerNode.mapNode.resetAnnotationSelection() - strongSelf.searchVenuesPromise.set(.single(nil)) case let .location(coordinate, address): var updateMap = false switch previousState.selectedLocation { @@ -530,16 +532,22 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { break } if updateMap { - strongSelf.headerNode.mapNode.setMapCenter(coordinate: coordinate, isUserLocation: false, animated: true) + strongSelf.headerNode.mapNode.setMapCenter(coordinate: coordinate, isUserLocation: false, hidePicker: false, animated: true) strongSelf.headerNode.mapNode.switchToPicking(animated: false) } if address != nil { - displayingPlacesButton = foundVenues == nil + if foundVenues == nil { + displayingPlacesButton = true + } else if let previousLocation = foundVenuesLocation { + let currentLocation = CLLocation(latitude: coordinate.latitude, longitude: coordinate.longitude) + if currentLocation.distance(from: previousLocation) > 500 { + displayingPlacesButton = true + } + } } case let .venue(venue): - strongSelf.headerNode.mapNode.setMapCenter(coordinate: venue.coordinate, animated: true) - strongSelf.searchVenuesPromise.set(.single(nil)) + strongSelf.headerNode.mapNode.setMapCenter(coordinate: venue.coordinate, hidePicker: true, animated: true) } strongSelf.headerNode.updateState(mapMode: state.mapMode, displayingMapModeOptions: state.displayingMapModeOptions, displayingPlacesButton: displayingPlacesButton, animated: true) @@ -656,21 +664,16 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { var state = state state.displayingMapModeOptions = false state.selectedLocation = annotation?.location.flatMap { .venue($0) } ?? .none - state.searchingVenuesAround = false + if annotation == nil { + state.searchingVenuesAround = false + } return state } } self.headerNode.mapNode.userLocationAnnotationSelected = { [weak self] in - guard let strongSelf = self else { - return - } - strongSelf.updateState { state in - var state = state - state.displayingMapModeOptions = false - state.selectedLocation = .none - state.searchingVenuesAround = false - return state + if let strongSelf = self { + strongSelf.goToUserLocation() } } } @@ -856,8 +859,20 @@ final class LocationPickerControllerNode: ViewControllerTracingNode { self.shadeNode.backgroundColor = highlighted ? self.presentationData.theme.list.itemHighlightedBackgroundColor : self.presentationData.theme.list.plainBackgroundColor } + func goToUserLocation() { + self.searchVenuesPromise.set(.single(nil)) + self.updateState { state in + var state = state + state.displayingMapModeOptions = false + state.selectedLocation = .none + state.searchingVenuesAround = false + return state + } + } + func requestPlacesAtSelectedLocation() { if case let .location(coordinate, _) = self.state.selectedLocation { + self.headerNode.mapNode.setMapCenter(coordinate: coordinate, animated: true) self.searchVenuesPromise.set(.single(coordinate)) self.updateState { state in var state = state diff --git a/submodules/MapResourceToAvatarSizes/Sources/MapResourceToAvatarSizes.swift b/submodules/MapResourceToAvatarSizes/Sources/MapResourceToAvatarSizes.swift index 9c4963d8dd..c42f510e76 100644 --- a/submodules/MapResourceToAvatarSizes/Sources/MapResourceToAvatarSizes.swift +++ b/submodules/MapResourceToAvatarSizes/Sources/MapResourceToAvatarSizes.swift @@ -15,7 +15,13 @@ public func mapResourceToAvatarSizes(postbox: Postbox, resource: MediaResource, } var result: [Int: Data] = [:] for i in 0 ..< representations.count { - if let scaledImage = generateScaledImage(image: image, size: representations[i].dimensions.cgSize, scale: 1.0), let scaledData = scaledImage.jpegData(compressionQuality: 0.8) { + let size: CGSize + if representations[i].dimensions.width == 80 { + size = CGSize(width: 160.0, height: 160.0) + } else { + size = representations[i].dimensions.cgSize + } + if let scaledImage = generateScaledImage(image: image, size: size, scale: 1.0), let scaledData = scaledImage.jpegData(compressionQuality: 0.8) { result[i] = scaledData } } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift index b2715bf6cd..3040fedb0c 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift @@ -105,11 +105,7 @@ final class ThemeAccentColorController: ViewController { } } - if case .background = mode { - self.title = self.presentationData.strings.Wallpaper_Title - } else { - self.navigationItem.titleView = self.segmentedTitleView - } + self.navigationItem.titleView = self.segmentedTitleView self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: UIView()) } @@ -238,9 +234,11 @@ final class ThemeAccentColorController: ViewController { } } - let _ = (self.context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]) - |> take(1) - |> deliverOnMainQueue).start(next: { [weak self] sharedData in + let _ = (combineLatest( + self.context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]) |> take(1), + telegramWallpapers(postbox: context.account.postbox, network: context.account.network) |> take(1) + ) + |> deliverOnMainQueue).start(next: { [weak self] sharedData, wallpapers in guard let strongSelf = self else { return } @@ -250,7 +248,7 @@ final class ThemeAccentColorController: ViewController { var initialWallpaper: TelegramWallpaper? var backgroundColors: (UIColor, UIColor?)? var patternWallpaper: TelegramWallpaper? - var patternIntensity: Int32 = 50 + var patternIntensity: Int32 = 40 var motion = false let messageColors: (UIColor, UIColor?)? var defaultMessagesColor: UIColor? @@ -263,7 +261,7 @@ final class ThemeAccentColorController: ViewController { return } if case let .file(file) = wallpaper, file.isPattern { - var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5) + var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.4) var bottomColor: UIColor? if let color = file.settings.color { if let intensity = file.settings.intensity { @@ -291,7 +289,7 @@ final class ThemeAccentColorController: ViewController { if let themeReference = strongSelf.mode.themeReference { accentColor = settings.themeSpecificAccentColors[themeReference.index]?.color ?? defaultDayAccentColor - let wallpaper: TelegramWallpaper + var wallpaper: TelegramWallpaper if let customWallpaper = settings.themeSpecificChatWallpapers[themeReference.index] { wallpaper = customWallpaper } else { @@ -307,6 +305,21 @@ final class ThemeAccentColorController: ViewController { wallpaper = theme.chat.defaultWallpaper } + if case let .builtin(settings) = wallpaper { + var defaultPatternWallpaper: TelegramWallpaper? + + for wallpaper in wallpapers { + if case let .file(file) = wallpaper, file.slug == "JqSUrO0-mFIBAAAAWwTvLzoWGQI" { + defaultPatternWallpaper = wallpaper + break + } + } + + if let defaultPatternWallpaper = defaultPatternWallpaper { + wallpaper = defaultPatternWallpaper.withUpdatedSettings(WallpaperSettings(blur: settings.blur, motion: settings.motion, color: 0xd6e2ee, bottomColor: nil, intensity: 25, rotation: nil)) + } + } + if !wallpaper.isColorOrGradient && !ignoreDefaultWallpaper { initialWallpaper = wallpaper } @@ -338,6 +351,10 @@ final class ThemeAccentColorController: ViewController { let wallpaper = wallpaper ?? theme.chat.defaultWallpaper extractWallpaperParameters(wallpaper) + if !wallpaper.isColorOrGradient { + initialWallpaper = wallpaper + } + let topMessageColor = theme.chat.message.outgoing.bubble.withWallpaper.fill let bottomMessageColor = theme.chat.message.outgoing.bubble.withWallpaper.gradientFill diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift index 06212bb676..4e71b8e8bf 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift @@ -63,7 +63,7 @@ struct ThemeColorState { self.preview = false self.previousPatternWallpaper = nil self.patternWallpaper = nil - self.patternIntensity = 50 + self.patternIntensity = 40 self.motion = false self.defaultMessagesColor = nil self.messagesColors = nil @@ -491,28 +491,22 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate strongSelf.backgroundColor = UIColor(rgb: UInt32(bitPattern: value)) strongSelf.immediateBackgroundNode.backgroundColor = UIColor(rgb: UInt32(bitPattern: value)) strongSelf.immediateBackgroundNode.image = nil - strongSelf.immediateBackgroundNode.isHidden = false strongSelf.signalBackgroundNode.isHidden = true strongSelf.patternWallpaper = nil } else if let wallpaperImage = wallpaperImage { strongSelf.immediateBackgroundNode.image = wallpaperImage - strongSelf.immediateBackgroundNode.isHidden = false strongSelf.signalBackgroundNode.isHidden = true strongSelf.patternWallpaper = nil } else if let wallpaperSignal = wallpaperSignal { strongSelf.signalBackgroundNode.contentMode = .scaleToFill - strongSelf.immediateBackgroundNode.isHidden = false strongSelf.signalBackgroundNode.isHidden = false if case let .file(file) = wallpaper, let (layout, _, _) = strongSelf.validLayout { var dispatch = false if let previousWallpaper = strongSelf.patternWallpaper, case let .file(previousFile) = previousWallpaper, file.id == previousFile.id { dispatch = true - } else { - strongSelf.patternWallpaper = wallpaper - strongSelf.signalBackgroundNode.setSignal(wallpaperSignal) } if dispatch { @@ -541,6 +535,11 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate let imageApply = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: layout.size, boundingSize: layout.size, intrinsicInsets: UIEdgeInsets(), custom: patternArguments)) let _ = imageApply() } + + if !dispatch { + strongSelf.signalBackgroundNode.setSignal(wallpaperSignal) + strongSelf.patternWallpaper = wallpaper + } } else { strongSelf.signalBackgroundNode.setSignal(wallpaperSignal) strongSelf.patternWallpaper = nil @@ -1043,6 +1042,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate updated.patternWallpaper = nil updated.displayPatternPanel = false } else { + updated.colorPanelCollapsed = false updated.displayPatternPanel = true if current.patternWallpaper == nil, let wallpaper = wallpaper { updated.patternWallpaper = wallpaper @@ -1056,7 +1056,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate }, animated: true) if appeared { - self.patternPanelNode.didAppear(initialWallpaper: wallpaper) + self.patternPanelNode.didAppear(initialWallpaper: wallpaper, intensity: self.state.patternIntensity) } } diff --git a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift index 1d64872306..87c5221f9f 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift @@ -129,6 +129,7 @@ final class ThemeColorsGridController: ViewController { }, presentColorPicker: { [weak self] in if let strongSelf = self { let _ = (strongSelf.context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]) + |> take(1) |> deliverOnMainQueue).start(next: { [weak self] sharedData in guard let strongSelf = self else { return @@ -144,10 +145,23 @@ final class ThemeColorsGridController: ViewController { } let controller = ThemeAccentColorController(context: strongSelf.context, mode: .background(themeReference: themeReference)) - controller.navigationPresentation = .modalInLargeLayout controller.completion = { [weak self] in if let strongSelf = self, let navigationController = strongSelf.navigationController as? NavigationController { - let _ = navigationController.popViewController(animated: true) + var controllers = navigationController.viewControllers + controllers = controllers.filter { controller in + if controller is ThemeColorsGridController { + return false + } + return true + } + navigationController.setViewControllers(controllers, animated: false) + controllers = controllers.filter { controller in + if controller is ThemeAccentColorController { + return false + } + return true + } + navigationController.setViewControllers(controllers, animated: true) } } strongSelf.push(controller) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift index 7fcb29126c..4ef49fd500 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift @@ -563,27 +563,40 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The return } - let controller = ThemeAccentColorController(context: context, mode: .edit(theme: theme, wallpaper: nil, defaultThemeReference: nil, create: true, completion: { result in - let controller = editThemeController(context: context, mode: .create(result), navigateToChat: { peerId in - if let navigationController = getNavigationControllerImpl?() { - context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId))) - } - }) - updateControllersImpl?({ controllers in - var controllers = controllers - controllers = controllers.filter { controller in - if controller is ThemeAccentColorController { - return false - } - return true - } - controllers.append(controller) - return controllers - }) - })) + let resolvedWallpaper: Signal + if case let .file(file) = theme.chat.defaultWallpaper, file.id == 0 { + resolvedWallpaper = cachedWallpaper(account: context.account, slug: file.slug, settings: file.settings) + |> map { cachedWallpaper -> TelegramWallpaper in + return cachedWallpaper?.wallpaper ?? theme.chat.defaultWallpaper + } + } else { + resolvedWallpaper = .single(theme.chat.defaultWallpaper) + } - c.dismiss(completion: { - pushControllerImpl?(controller) + let _ = (resolvedWallpaper + |> deliverOnMainQueue).start(next: { wallpaper in + let controller = ThemeAccentColorController(context: context, mode: .edit(theme: theme, wallpaper: wallpaper, defaultThemeReference: nil, create: true, completion: { result in + let controller = editThemeController(context: context, mode: .create(result), navigateToChat: { peerId in + if let navigationController = getNavigationControllerImpl?() { + context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId))) + } + }) + updateControllersImpl?({ controllers in + var controllers = controllers + controllers = controllers.filter { controller in + if controller is ThemeAccentColorController { + return false + } + return true + } + controllers.append(controller) + return controllers + }) + })) + + c.dismiss(completion: { + pushControllerImpl?(controller) + }) }) }))) } @@ -835,9 +848,12 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The public final class ThemeSettingsCrossfadeController: ViewController { private let snapshotView: UIView? - public init() { - self.snapshotView = (UIScreen.main as? UIView)?.snapshotContentTree() //UIScreen.main.snapshotView(afterScreenUpdates: false) - + public init(view: UIView? = nil) { + if let view = view { + self.snapshotView = view.snapshotContentTree() + } else { + self.snapshotView = UIScreen.main.snapshotView(afterScreenUpdates: false) + } super.init(navigationBarPresentationData: nil) self.statusBar.statusBarStyle = .Ignore diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift index 38dbb80104..3006b9664b 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift @@ -133,25 +133,21 @@ private func generateBorderImage(theme: PresentationTheme, bordered: Bool, selec } else { let image = generateImage(CGSize(width: 32.0, height: 32.0), rotatedContext: { size, context in let bounds = CGRect(origin: CGPoint(), size: size) - context.setFillColor(theme.list.itemBlocksBackgroundColor.cgColor) - context.fill(bounds) - - context.setBlendMode(.clear) - if selected { - context.fillEllipse(in: bounds.insetBy(dx: 5.0, dy: 5.0)) - } else { - context.fillEllipse(in: bounds.insetBy(dx: 1.0, dy: 1.0)) - } - context.setBlendMode(.normal) + context.clear(bounds) let lineWidth: CGFloat if selected { + lineWidth = 2.0 + context.setLineWidth(lineWidth) + context.setStrokeColor(theme.list.itemBlocksBackgroundColor.cgColor) + + context.strokeEllipse(in: bounds.insetBy(dx: 3.0 + lineWidth / 2.0, dy: 3.0 + lineWidth / 2.0)) + var accentColor = theme.list.itemAccentColor if accentColor.rgb == 0xffffff { accentColor = UIColor(rgb: 0x999999) } context.setStrokeColor(accentColor.cgColor) - lineWidth = 2.0 } else { context.setStrokeColor(theme.list.disclosureArrowColor.withAlphaComponent(0.4).cgColor) lineWidth = 1.0 @@ -291,7 +287,7 @@ private final class ThemeSettingsThemeItemIconNode : ListViewItemNode { let imageSize = CGSize(width: 98.0, height: 62.0) strongSelf.imageNode.frame = CGRect(origin: CGPoint(x: 10.0, y: 14.0), size: imageSize) - let applyLayout = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets(), emptyColor: .clear)) + let applyLayout = makeImageLayout(TransformImageArguments(corners: ImageCorners(radius: 16.0), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets(), emptyColor: .clear)) applyLayout() strongSelf.overlayNode.frame = CGRect(origin: CGPoint(x: 9.0, y: 13.0), size: CGSize(width: 100.0, height: 64.0)) @@ -398,7 +394,7 @@ private func preparedTransition(context: AccountContext, action: @escaping (Pres return ThemeSettingsThemeItemNodeTransition(deletions: deletions, insertions: insertions, updates: updates) } -private func ensureThemeVisible(listNode: ListView, themeReference: PresentationThemeReference, animated: Bool) { +private func ensureThemeVisible(listNode: ListView, themeReference: PresentationThemeReference, animated: Bool) -> Bool { var resultNode: ThemeSettingsThemeItemIconNode? listNode.forEachItemNode { node in if resultNode == nil, let node = node as? ThemeSettingsThemeItemIconNode { @@ -408,7 +404,10 @@ private func ensureThemeVisible(listNode: ListView, themeReference: Presentation } } if let resultNode = resultNode { - listNode.ensureItemNodeVisible(resultNode, animated: animated, overflow: 56.0) + listNode.ensureItemNodeVisible(resultNode, animated: animated, overflow: 57.0) + return true + } else { + return false } } @@ -466,21 +465,25 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { } private func dequeueTransition() { - guard let _ = self.item, let transition = self.enqueuedTransitions.first else { + guard let item = self.item, let transition = self.enqueuedTransitions.first else { return } self.enqueuedTransitions.remove(at: 0) var options = ListViewDeleteAndInsertOptions() + if self.initialized { + options.insert(.AnimateInsertion) + } - self.listNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { [weak self] _ in - if let strongSelf = self, let item = strongSelf.item { - if !strongSelf.initialized { - strongSelf.initialized = true - ensureThemeVisible(listNode: strongSelf.listNode, themeReference: item.currentTheme, animated: false) - } + var scrollToItem: ListViewScrollToItem? + if !self.initialized { + if let index = item.themes.firstIndex(where: { $0.index == item.currentTheme.index }) { + scrollToItem = ListViewScrollToItem(index: index, position: .bottom(-57.0), animated: false, curve: .Default(duration: 0.0), directionHint: .Down) + self.initialized = true } - }) + } + + self.listNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, scrollToItem: scrollToItem, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { _ in }) } func asyncLayout() -> (_ item: ThemeSettingsThemeItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) { @@ -555,9 +558,9 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { listInsets.top += params.leftInset + 4.0 listInsets.bottom += params.rightInset + 4.0 - strongSelf.listNode.bounds = CGRect(x: 0.0, y: 0.0, width: layoutSize.height, height: layoutSize.width) - strongSelf.listNode.position = CGPoint(x: layoutSize.width / 2.0, y: layoutSize.height / 2.0) - strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: CGSize(width: layoutSize.height, height: layoutSize.width), insets: listInsets, duration: 0.0, curve: .Default(duration: nil)), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) + strongSelf.listNode.bounds = CGRect(x: 0.0, y: 0.0, width: contentSize.height, height: contentSize.width) + strongSelf.listNode.position = CGPoint(x: contentSize.width / 2.0, y: contentSize.height / 2.0) + strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: CGSize(width: contentSize.height, height: contentSize.width), insets: listInsets, duration: 0.0, curve: .Default(duration: nil)), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in }) var entries: [ThemeSettingsThemeEntry] = [] var index: Int = 0 diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift index c2607874c9..a28dfc23cd 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift @@ -157,10 +157,8 @@ public class WallpaperGalleryController: ViewController { private var overlayNode: WallpaperGalleryOverlayNode? private var messageNodes: [ListViewItemNode]? private var toolbarNode: WallpaperGalleryToolbarNode? - private var colorPanelNode: WallpaperColorPanelNode? private var patternPanelNode: WallpaperPatternPanelNode? - private var colorPanelEnabled = false private var patternPanelEnabled = false public init(context: AccountContext, source: WallpaperListSource) { @@ -204,7 +202,6 @@ public class WallpaperGalleryController: ViewController { entries = [.contextResult(result)] centralEntryIndex = 0 case let .customColor(color): - self.colorPanelEnabled = true let initialColor = color ?? 0x000000 entries = [.wallpaper(.color(initialColor), nil)] centralEntryIndex = 0 @@ -338,19 +335,7 @@ public class WallpaperGalleryController: ViewController { self.overlayNode = overlayNode self.galleryNode.overlayNode = overlayNode self.galleryNode.addSubnode(overlayNode) - - let colorPanelNode = WallpaperColorPanelNode(theme: presentationData.theme, strings: presentationData.strings) - colorPanelNode.colorsChanged = { [weak self] color, _, ended in - if let strongSelf = self , let color = color { - strongSelf.updateEntries(color: color, preview: !ended) - } - } - if case let .customColor(colorValue) = self.source, let color = colorValue { - //colorPanelNode.color = UIColor(rgb: UInt32(bitPattern: color)) - } - self.colorPanelNode = colorPanelNode - overlayNode.addSubnode(colorPanelNode) - + let toolbarNode = WallpaperGalleryToolbarNode(theme: presentationData.theme, strings: presentationData.strings, doneButtonType: .set) self.toolbarNode = toolbarNode overlayNode.addSubnode(toolbarNode) @@ -632,12 +617,7 @@ public class WallpaperGalleryController: ViewController { topMessageText = presentationData.strings.WallpaperPreview_CustomColorTopText bottomMessageText = presentationData.strings.WallpaperPreview_CustomColorBottomText } - - if self.colorPanelEnabled { - topMessageText = presentationData.strings.WallpaperPreview_CustomColorTopText - bottomMessageText = presentationData.strings.WallpaperPreview_CustomColorBottomText - } - + let message1 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: bottomMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message1, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.fontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil)) @@ -680,10 +660,6 @@ public class WallpaperGalleryController: ViewController { if let messageNodes = self.messageNodes { var bottomOffset: CGFloat = layout.size.height - bottomInset - 9.0 - if self.colorPanelEnabled { - } else { - bottomOffset -= 66.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 @@ -707,16 +683,6 @@ public class WallpaperGalleryController: ViewController { var bottomInset = layout.intrinsicInsets.bottom + 49.0 let standardInputHeight = layout.deviceMetrics.keyboardHeight(inLandscape: false) let height = max(standardInputHeight, layout.inputHeight ?? 0.0) - bottomInset + 47.0 - if let colorPanelNode = self.colorPanelNode { - var colorPanelFrame = CGRect(x: 0.0, y: layout.size.height, width: layout.size.width, height: height) - if self.colorPanelEnabled { - colorPanelFrame.origin = CGPoint(x: 0.0, y: layout.size.height - bottomInset - height) - bottomInset += height - } - - transition.updateFrame(node: colorPanelNode, frame: colorPanelFrame) - colorPanelNode.updateLayout(size: colorPanelFrame.size, transition: transition) - } let currentPatternPanelNode: WallpaperPatternPanelNode if let patternPanelNode = self.patternPanelNode { @@ -739,6 +705,7 @@ public class WallpaperGalleryController: ViewController { patternPanelFrame.origin = CGPoint(x: 0.0, y: layout.size.height - bottomInset - panelHeight) bottomInset += panelHeight } + bottomInset += 66.0 transition.updateFrame(node: currentPatternPanelNode, frame: patternPanelFrame) currentPatternPanelNode.updateLayout(size: patternPanelFrame.size, transition: transition) diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift index 7abc84af85..0e7e024bb3 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift @@ -688,7 +688,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode { var additionalYOffset: CGFloat = 0.0 if self.patternButtonNode.isSelected { - additionalYOffset = -190.0 + additionalYOffset = -235.0 } let leftButtonFrame = CGRect(origin: CGPoint(x: floor(layout.size.width / 2.0 - buttonSize.width - 10.0) + offset.x, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom - 54.0 + offset.y + additionalYOffset), size: buttonSize) diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift index 9e8ff0bfc8..531ed2e4be 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift @@ -168,7 +168,11 @@ final class WallpaperPatternPanelNode: ASDisplayNode { } if let subnodes = strongSelf.scrollNode.subnodes { for case let subnode as SettingsThemeWallpaperNode in subnodes { - subnode.setSelected(node === subnode, animated: true) + let selected = node === subnode + subnode.setSelected(selected, animated: true) + if selected { + strongSelf.scrollToNode(subnode, animated: true) + } } } } @@ -206,7 +210,7 @@ final class WallpaperPatternPanelNode: ASDisplayNode { } } - func didAppear(initialWallpaper: TelegramWallpaper? = nil) { + func didAppear(initialWallpaper: TelegramWallpaper? = nil, intensity: Int32? = nil) { var wallpaper = initialWallpaper ?? self.wallpapers.first if let wallpaper = wallpaper { @@ -216,23 +220,38 @@ final class WallpaperPatternPanelNode: ASDisplayNode { } self.currentWallpaper = wallpaper - self.sliderView?.value = 40.0 + self.sliderView?.value = CGFloat(intensity ?? 40) self.scrollNode.view.contentOffset = CGPoint() + var selectedNode: SettingsThemeWallpaperNode? if let subnodes = self.scrollNode.subnodes { for case let subnode as SettingsThemeWallpaperNode in subnodes { var selected = false if case let .file(file) = subnode.wallpaper, file.id == selectedFileId { selected = true + selectedNode = subnode } subnode.setSelected(selected, animated: false) } } - + if initialWallpaper == nil, let wallpaper = self.currentWallpaper, let sliderView = self.sliderView { self.patternChanged?(wallpaper, Int32(sliderView.value), false) } + + if let selectedNode = selectedNode { + self.scrollToNode(selectedNode) + } + } + } + + private func scrollToNode(_ node: SettingsThemeWallpaperNode, animated: Bool = false) { + let bounds = self.scrollNode.view.bounds + let frame = node.frame.insetBy(dx: -48.0, dy: 0.0) + + if frame.minX < bounds.minX || frame.maxX > bounds.maxX { + self.scrollNode.view.scrollRectToVisible(frame, animated: animated) } } diff --git a/submodules/TelegramPermissionsUI/Sources/PermissionController.swift b/submodules/TelegramPermissionsUI/Sources/PermissionController.swift index 6964197836..e43f4b9f96 100644 --- a/submodules/TelegramPermissionsUI/Sources/PermissionController.swift +++ b/submodules/TelegramPermissionsUI/Sources/PermissionController.swift @@ -15,6 +15,8 @@ public final class PermissionController: ViewController { private var state: PermissionControllerContent? private var splashScreen = false + private var locationManager: LocationManager? + private var controllerNode: PermissionControllerNode { return self.displayNode as! PermissionControllerNode } @@ -185,11 +187,15 @@ public final class PermissionController: ViewController { case let .nearbyLocation(status): self.title = self.presentationData.strings.Permissions_PeopleNearbyTitle_v0 + if self.locationManager == nil { + self.locationManager = LocationManager() + } + self.allow = { [weak self] in if let strongSelf = self { switch status { case .requestable: - DeviceAccess.authorizeAccess(to: .location(.tracking), presentationData: strongSelf.context.sharedContext.currentPresentationData.with { $0 }, { [weak self] result in + DeviceAccess.authorizeAccess(to: .location(.tracking), locationManager: strongSelf.locationManager, presentationData: strongSelf.context.sharedContext.currentPresentationData.with { $0 }, { [weak self] result in self?.proceed?(result) }) case .denied, .unreachable: diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift index 4a72514c1a..de169248f8 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift @@ -61,7 +61,6 @@ public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, edit ) list = list.withUpdated( itemAccentColor: accentColor, - itemDisclosureActions: list.itemDisclosureActions.withUpdated(accent: list.itemDisclosureActions.accent.withUpdated(fillColor: accentColor)), itemCheckColors: list.itemCheckColors.withUpdated(fillColor: accentColor, foregroundColor: secondaryBadgeTextColor), itemBarChart: list.itemBarChart.withUpdated(color1: accentColor) ) diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift index 7b11115f77..43201ff25d 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift @@ -36,8 +36,15 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme var inputBackgroundColor: UIColor? var buttonStrokeColor: UIColor? + var suggestedWallpaper: TelegramWallpaper? + var bubbleColors = bubbleColors if bubbleColors == nil, editing { + if let accentColor = accentColor { + let color = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) + suggestedWallpaper = .color(Int32(bitPattern: color.rgb)) + } + let accentColor = accentColor ?? defaultDarkTintedAccentColor let bottomColor = accentColor.withMultiplied(hue: 1.019, saturation: 0.731, brightness: 0.59) let topColor = bottomColor.withMultiplied(hue: 0.966, saturation: 0.61, brightness: 0.98) @@ -217,6 +224,8 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme } else { defaultWallpaper = .color(Int32(bitPattern: backgroundColors.0.rgb)) } + } else if let forcedWallpaper = suggestedWallpaper { + defaultWallpaper = forcedWallpaper } var outgoingBubbleFillColor: UIColor? diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index 366dfa1ca5..47014f6095 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -21,9 +21,10 @@ public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, ac var chat = theme.chat var actionSheet = theme.actionSheet - var bubbleColors = bubbleColors var outgoingAccent: UIColor? var suggestedWallpaper: TelegramWallpaper? + + var bubbleColors = bubbleColors if bubbleColors == nil, editing { if day { let accentColor = accentColor ?? defaultDayAccentColor diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift index 5375b2543d..0e18340c01 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift @@ -39,9 +39,9 @@ extension TelegramWallpaper: Codable { case "builtin": self = .builtin(WallpaperSettings()) default: - let options = ["motion", "blur"] + let optionKeys = ["motion", "blur"] - if [6,7].contains(value.count), let color = UIColor(hexString: value) { + if value.count == 6, let color = UIColor(hexString: value) { self = .color(Int32(bitPattern: color.rgb)) } else { let components = value.components(separatedBy: " ") @@ -54,7 +54,15 @@ extension TelegramWallpaper: Codable { blur = true } - if components.count >= 2 && components.count <= 4 && [6,7].contains(components[0].count) && !options.contains(components[0]) && [6,7].contains(components[1].count) && !options.contains(components[1]), let topColor = UIColor(hexString: components[0]), let bottomColor = UIColor(hexString: components[1]) { + if components.count >= 2 && components.count <= 5 && components[0].count == 6 && !optionKeys.contains(components[0]) && components[1].count == 6 && !optionKeys.contains(components[1]), let topColor = UIColor(hexString: components[0]), let bottomColor = UIColor(hexString: components[1]) { + + var rotation: Int32? + if components.count > 2, components[2].count <= 3, let value = Int32(components[2]) { + if value >= 0 && value < 360 { + rotation = value + } + } + self = .gradient(Int32(bitPattern: topColor.rgb), Int32(bitPattern: bottomColor.rgb), WallpaperSettings(blur: blur, motion: motion)) } else { var slug: String? @@ -68,7 +76,7 @@ extension TelegramWallpaper: Codable { if components.count > 1 { for i in 1 ..< components.count { let component = components[i] - if options.contains(component) { + if optionKeys.contains(component) { continue } if component.count == 6, let value = UIColor(hexString: component) { @@ -110,6 +118,9 @@ extension TelegramWallpaper: Codable { var components: [String] = [] components.append(String(format: "%06x", topColor)) components.append(String(format: "%06x", bottomColor)) + if let rotation = settings.rotation { + components.append("\(rotation)") + } if settings.motion { components.append("motion") } @@ -130,6 +141,9 @@ extension TelegramWallpaper: Codable { if let bottomColor = file.settings.bottomColor { components.append(String(format: "%06x", bottomColor)) } + if let rotation = file.settings.rotation { + components.append("\(rotation)") + } } if file.settings.motion { components.append("motion") diff --git a/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift b/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift index b0918ec960..ae81d73b1a 100644 --- a/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift +++ b/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift @@ -22,7 +22,7 @@ public extension TelegramWallpaper { var isColorOrGradient: Bool { switch self { - case .color, .gradient: + case .color, .gradient: return true default: return false diff --git a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift b/submodules/TelegramUI/TelegramUI/CreateChannelController.swift index 30493d6001..9cb387fbfb 100644 --- a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift +++ b/submodules/TelegramUI/TelegramUI/CreateChannelController.swift @@ -139,9 +139,10 @@ private enum CreateChannelEntry: ItemListNodeEntry { let arguments = arguments as! CreateChannelArguments switch self { case let .channelInfo(theme, strings, dateTimeFormat, peer, state, avatar): - return ItemListAvatarAndNameInfoItem(accountContext: arguments.context, presentationData: presentationData, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: nil, cachedData: nil, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false, withExtendedBottomInset: false), editingNameUpdated: { editingName in + return ItemListAvatarAndNameInfoItem(accountContext: arguments.context, presentationData: presentationData, dateTimeFormat: dateTimeFormat, mode: .editSettings, peer: peer, presence: nil, cachedData: nil, state: state, sectionId: ItemListSectionId(self.section), style: .blocks(withTopInset: false, withExtendedBottomInset: false), editingNameUpdated: { editingName in arguments.updateEditingName(editingName) }, avatarTapped: { + arguments.changeProfilePhoto() }, updatingImage: avatar, tag: CreateChannelEntryTag.info) case let .setProfilePhoto(theme, text): return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: ItemListSectionId(self.section), style: .blocks, action: { @@ -188,7 +189,6 @@ private func CreateChannelEntries(presentationData: PresentationData, state: Cre let peer = TelegramGroup(id: PeerId(namespace: -1, id: 0), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator(rank: nil), membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0) entries.append(.channelInfo(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer, groupInfoState, state.avatar)) - entries.append(.setProfilePhoto(presentationData.theme, presentationData.strings.Channel_UpdatePhotoItem)) entries.append(.descriptionSetup(presentationData.theme, presentationData.strings.Channel_Edit_AboutItem, state.editingDescriptionText)) entries.append(.descriptionInfo(presentationData.theme, presentationData.strings.Channel_About_Help)) diff --git a/submodules/TelegramUI/TelegramUI/CreateGroupController.swift b/submodules/TelegramUI/TelegramUI/CreateGroupController.swift index d18162efae..e78968ab6a 100644 --- a/submodules/TelegramUI/TelegramUI/CreateGroupController.swift +++ b/submodules/TelegramUI/TelegramUI/CreateGroupController.swift @@ -300,7 +300,6 @@ private func createGroupEntries(presentationData: PresentationData, state: Creat let peer = TelegramGroup(id: PeerId(namespace: -1, id: 0), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator(rank: nil), membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0) entries.append(.groupInfo(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer, groupInfoState, state.avatar)) - //entries.append(.setProfilePhoto(presentationData.theme, presentationData.strings.GroupInfo_SetGroupPhoto)) var peers: [Peer] = [] for peerId in peerIds { diff --git a/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift b/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift index a051e0ee50..9c5191fe37 100644 --- a/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift +++ b/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift @@ -283,15 +283,24 @@ func openChatMessageImpl(_ params: OpenChatMessageParams) -> Bool { case let .map(mapMedia): params.dismissInput() - let controllerParams = LocationViewParams(sendLiveLocation: { location in - let outMessage: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: location), replyToMessageId: nil, localGroupingKey: nil) +// let controllerParams = LocationViewParams(sendLiveLocation: { location in +// let outMessage: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: location), replyToMessageId: nil, localGroupingKey: nil) +// params.enqueueMessage(outMessage) +// }, stopLiveLocation: { +// params.context.liveLocationManager?.cancelLiveLocation(peerId: params.message.id.peerId) +// }, openUrl: params.openUrl, openPeer: { peer in +// params.openPeer(peer, .info) +// }) +// let controller = LocationViewController(context: params.context, mapMedia: mapMedia, params: controllerParams) + let controller = legacyLocationController(message: params.message, mapMedia: mapMedia, context: params.context, openPeer: { peer in + params.openPeer(peer, .info) + }, sendLiveLocation: { coordinate, period in + let outMessage: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaMap(latitude: coordinate.latitude, longitude: coordinate.longitude, geoPlace: nil, venue: nil, liveBroadcastingTimeout: period)), replyToMessageId: nil, localGroupingKey: nil) params.enqueueMessage(outMessage) }, stopLiveLocation: { params.context.liveLocationManager?.cancelLiveLocation(peerId: params.message.id.peerId) - }, openUrl: params.openUrl, openPeer: { peer in - params.openPeer(peer, .info) - }) - let controller = LocationViewController(context: params.context, mapMedia: mapMedia, params: controllerParams) + }, openUrl: params.openUrl) + controller.navigationPresentation = .modal params.navigationController?.pushViewController(controller) return true case let .stickerPack(reference): diff --git a/submodules/WallpaperResources/Sources/WallpaperResources.swift b/submodules/WallpaperResources/Sources/WallpaperResources.swift index ad593d4c3d..d84c5da42b 100644 --- a/submodules/WallpaperResources/Sources/WallpaperResources.swift +++ b/submodules/WallpaperResources/Sources/WallpaperResources.swift @@ -1233,7 +1233,7 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the c.translateBy(x: -drawingRect.width / 2.0, y: -drawingRect.height / 2.0) c.draw(outgoing!.cgImage!, in: CGRect(x: 9.0, y: 12.0, width: 57.0, height: 16.0)) } - + addCorners(context, arguments: arguments) return context } } From 0779ccd8a56b79301f6c79a3cb2cb3a3d3f08691 Mon Sep 17 00:00:00 2001 From: overtake Date: Mon, 16 Dec 2019 12:12:52 +0400 Subject: [PATCH 5/5] syntax error [skip ci] --- submodules/TelegramCore/Sources/AuthTransfer.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramCore/Sources/AuthTransfer.swift b/submodules/TelegramCore/Sources/AuthTransfer.swift index 232dd17f4f..a691167d34 100644 --- a/submodules/TelegramCore/Sources/AuthTransfer.swift +++ b/submodules/TelegramCore/Sources/AuthTransfer.swift @@ -105,7 +105,7 @@ public func exportAuthTransferToken(accountManager: AccountManager, account: Una } |> mapToSignal { result -> Signal in switch result { - case let .loginTokenSuccess(authorization): + case let .loginTokenSuccess(authorization)?: switch authorization { case let .authorization(_, _, user): return updatedAccount.postbox.transaction { transaction -> Signal in