From 1db4fbd241051cbe24d8ae413189f131670e0a19 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Tue, 21 Jan 2020 19:36:59 +0400 Subject: [PATCH] Upgrade message bubble graphics and introduce the ability to adjust corner radius via UI --- Telegram-iOS/en.lproj/Localizable.strings | 5 + .../Sources/AccountContext.swift | 4 +- submodules/Display/Display/ImageCorners.swift | 114 +- submodules/Display/Display/ImageNode.swift | 21 +- .../BubbleSettingsController.swift | 578 ++ .../ForwardPrivacyChatPreviewItem.swift | 6 +- .../SelectivePrivacySettingsController.swift | 12 +- .../TextSizeSelectionController.swift | 10 +- .../Sources/Themes/EditThemeController.swift | 16 +- .../Themes/ThemeAccentColorController.swift | 4 +- .../ThemeAccentColorControllerNode.swift | 7 +- .../Themes/ThemePreviewControllerNode.swift | 4 +- .../Themes/ThemeSettingsChatPreviewItem.swift | 6 +- .../Themes/ThemeSettingsController.swift | 57 +- .../Themes/ThemeSettingsFontSizeItem.swift | 14 +- .../Sources/Themes/WallpaperGalleryItem.swift | 4 +- .../Sources/ChatMessageBubbleImages.swift | 346 +- .../Sources/PresentationData.swift | 38 +- .../Sources/PresentationStrings.swift | 4724 +++++++++-------- .../Sources/PresentationTheme.swift | 4 + .../PresentationThemeEssentialGraphics.swift | 139 +- .../Sources/PresentationsResourceCache.swift | 19 + .../Resources/PresentationResourceKey.swift | 7 +- .../Resources/PresentationResourcesChat.swift | 13 +- .../TelegramUI/ChatHistoryGridNode.swift | 2 +- .../TelegramUI/ChatHistoryListNode.swift | 4 +- .../ChatMessageAnimatedStickerItemNode.swift | 2 +- .../TelegramUI/ChatMessageBackground.swift | 2 +- .../ChatMessageBubbleBackdrop.swift | 2 +- ...eBubbleContentCalclulateImageCorners.swift | 56 +- .../ChatMessageBubbleItemNode.swift | 6 +- .../ChatMessageDateAndStatusNode.swift | 2 +- .../TelegramUI/ChatMessageDateHeader.swift | 4 +- .../ChatMessageInstantVideoItemNode.swift | 2 +- .../ChatMessageInteractiveFileNode.swift | 2 +- .../TelegramUI/ChatMessageItemView.swift | 92 +- .../ChatMessageMapBubbleContentNode.swift | 4 +- .../ChatMessageMediaBubbleContentNode.swift | 6 +- .../ChatMessageStickerItemNode.swift | 2 +- .../TelegramUI/ChatPresentationData.swift | 4 +- .../ChatRecentActionsControllerNode.swift | 4 +- ...SendMessageActionSheetControllerNode.swift | 9 +- .../Resources/PresentationStrings.mapping | Bin 144339 -> 144517 bytes .../TelegramUI/SharedAccountContext.swift | 8 +- .../TelegramUI/ThemeUpdateManager.swift | 2 +- .../TelegramUI/WallpaperUploadManager.swift | 2 +- .../Sources/PresentationThemeSettings.swift | 56 +- 47 files changed, 3657 insertions(+), 2768 deletions(-) create mode 100644 submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 4af86fec1d..d7d634db54 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -5291,3 +5291,8 @@ Any member of this group will be able to see messages in the channel."; "Forward.ErrorPublicQuizDisabledInChannels" = "Sorry, public polls can’t be forwarded to channels."; "Map.PlacesInThisArea" = "Places In This Area"; + +"Appearance.BubbleCornersSetting" = "Message Corners"; +"Appearance.BubbleCorners.Title" = "Message Corners"; +"Appearance.BubbleCorners.AdjustAdjacent" = "Adjust Adjacent Corners"; +"Appearance.BubbleCorners.Apply" = "Set"; diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift index 063be71577..620bf03962 100644 --- a/submodules/AccountContext/Sources/AccountContext.swift +++ b/submodules/AccountContext/Sources/AccountContext.swift @@ -446,8 +446,8 @@ public protocol SharedAccountContext: class { func makeComposeController(context: AccountContext) -> ViewController func makeChatListController(context: AccountContext, groupId: PeerGroupId, controlsHistoryPreload: Bool, hideNetworkActivityStatus: Bool, previewing: Bool, enableDebugActions: Bool) -> ChatListController func makeChatController(context: AccountContext, chatLocation: ChatLocation, subject: ChatControllerSubject?, botStart: ChatControllerInitialBotStart?, mode: ChatControllerPresentationMode) -> ChatController - func makeChatMessagePreviewItem(context: AccountContext, message: Message, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)?, clickThroughMessage: (() -> Void)?) -> ListViewItem - func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader + func makeChatMessagePreviewItem(context: AccountContext, message: Message, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)?, clickThroughMessage: (() -> Void)?) -> ListViewItem + func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader func makePeerSharedMediaController(context: AccountContext, peerId: PeerId) -> ViewController? func makeContactSelectionController(_ params: ContactSelectionControllerParams) -> ContactSelectionController func makeContactMultiselectionController(_ params: ContactMultiselectionControllerParams) -> ContactMultiselectionController diff --git a/submodules/Display/Display/ImageCorners.swift b/submodules/Display/Display/ImageCorners.swift index ce45a9565a..6930a5bcf4 100644 --- a/submodules/Display/Display/ImageCorners.swift +++ b/submodules/Display/Display/ImageCorners.swift @@ -109,7 +109,6 @@ private func ==(lhs: Tail, rhs: Tail) -> Bool { } private var cachedCorners = Atomic<[Corner: DrawingContext]>(value: [:]) -private var cachedTails = Atomic<[Tail: DrawingContext]>(value: [:]) private func cornerContext(_ corner: Corner) -> DrawingContext { let cached: DrawingContext? = cachedCorners.with { @@ -148,62 +147,6 @@ private func cornerContext(_ corner: Corner) -> DrawingContext { } } -private func tailContext(_ tail: Tail) -> DrawingContext { - let cached: DrawingContext? = cachedTails.with { - return $0[tail] - } - - if let cached = cached { - return cached - } else { - let context = DrawingContext(size: CGSize(width: CGFloat(tail.radius) + 3.0, height: CGFloat(tail.radius)), clear: true) - - context.withContext { c in - c.setBlendMode(.copy) - c.setFillColor(UIColor.black.cgColor) - let rect: CGRect - switch tail { - case let .BottomLeft(radius): - rect = CGRect(origin: CGPoint(x: 3.0, y: -CGFloat(radius)), size: CGSize(width: CGFloat(radius << 1), height: CGFloat(radius << 1))) - - c.move(to: CGPoint(x: 3.0, y: 1.0)) - c.addLine(to: CGPoint(x: 3.0, y: 11.0)) - c.addLine(to: CGPoint(x: 2.3, y: 13.0)) - c.addLine(to: CGPoint(x: 0.0, y: 16.6)) - c.addLine(to: CGPoint(x: 4.5, y: 15.5)) - c.addLine(to: CGPoint(x: 6.5, y: 14.3)) - c.addLine(to: CGPoint(x: 9.0, y: 12.5)) - c.closePath() - c.fillPath() - case let .BottomRight(radius): - rect = CGRect(origin: CGPoint(x: 3.0, y: -CGFloat(radius)), size: CGSize(width: CGFloat(radius << 1), height: CGFloat(radius << 1))) - - c.translateBy(x: context.size.width / 2.0, y: context.size.height / 2.0) - c.scaleBy(x: -1.0, y: 1.0) - c.translateBy(x: -context.size.width / 2.0, y: -context.size.height / 2.0) - - c.move(to: CGPoint(x: 3.0, y: 1.0)) - c.addLine(to: CGPoint(x: 3.0, y: 11.0)) - c.addLine(to: CGPoint(x: 2.3, y: 13.0)) - c.addLine(to: CGPoint(x: 0.0, y: 16.6)) - c.addLine(to: CGPoint(x: 4.5, y: 15.5)) - c.addLine(to: CGPoint(x: 6.5, y: 14.3)) - c.addLine(to: CGPoint(x: 9.0, y: 12.5)) - c.closePath() - c.fillPath() - } - c.fillEllipse(in: rect) - } - - let _ = cachedTails.modify { current in - var current = current - current[tail] = context - return current - } - return context - } -} - public func addCorners(_ context: DrawingContext, arguments: TransformImageArguments) { let corners = arguments.corners let drawingRect = arguments.drawingRect @@ -223,23 +166,24 @@ public func addCorners(_ context: DrawingContext, arguments: TransformImageArgum let corner = cornerContext(.BottomLeft(Int(radius))) context.blt(corner, at: CGPoint(x: drawingRect.minX, y: drawingRect.maxY - radius)) } - case let .Tail(radius, enabled): + case let .Tail(radius, image): if radius > CGFloat.ulpOfOne { - if enabled { - let tail = tailContext(.BottomLeft(Int(radius))) - let color = context.colorAt(CGPoint(x: drawingRect.minX, y: drawingRect.maxY - 1.0)) - context.withContext { c in - c.clear(CGRect(x: drawingRect.minX - 3.0, y: 0.0, width: 3.0, height: drawingRect.maxY - 6.0)) - c.setFillColor(color.cgColor) - c.fill(CGRect(x: 0.0, y: drawingRect.maxY - 6.0, width: 3.0, height: 6.0)) - } - context.blt(tail, at: CGPoint(x: drawingRect.minX - 3.0, y: drawingRect.maxY - radius)) - } else { - let corner = cornerContext(.BottomLeft(Int(radius))) - context.blt(corner, at: CGPoint(x: drawingRect.minX, y: drawingRect.maxY - radius)) + let color = context.colorAt(CGPoint(x: drawingRect.minX, y: drawingRect.maxY - 1.0)) + context.withContext { c in + c.clear(CGRect(x: drawingRect.minX - 4.0, y: 0.0, width: 4.0, height: drawingRect.maxY - 6.0)) + c.setFillColor(color.cgColor) + c.fill(CGRect(x: 0.0, y: drawingRect.maxY - 6.0, width: 4.0, height: 6.0)) + c.setBlendMode(.destinationIn) + let cornerRect = CGRect(origin: CGPoint(x: drawingRect.minX - 6.0, y: drawingRect.maxY - image.size.height), size: image.size) + c.translateBy(x: cornerRect.midX, y: cornerRect.midY) + c.scaleBy(x: 1.0, y: -1.0) + c.translateBy(x: -cornerRect.midX, y: -cornerRect.midY) + c.draw(image.cgImage!, in: cornerRect) + c.translateBy(x: cornerRect.midX, y: cornerRect.midY) + c.scaleBy(x: 1.0, y: -1.0) + c.translateBy(x: -cornerRect.midX, y: -cornerRect.midY) } } - } switch corners.bottomRight { @@ -248,20 +192,22 @@ public func addCorners(_ context: DrawingContext, arguments: TransformImageArgum let corner = cornerContext(.BottomRight(Int(radius))) context.blt(corner, at: CGPoint(x: drawingRect.maxX - radius, y: drawingRect.maxY - radius)) } - case let .Tail(radius, enabled): + case let .Tail(radius, image): if radius > CGFloat.ulpOfOne { - if enabled { - let tail = tailContext(.BottomRight(Int(radius))) - let color = context.colorAt(CGPoint(x: drawingRect.maxX - 1.0, y: drawingRect.maxY - 1.0)) - context.withContext { c in - c.clear(CGRect(x: drawingRect.maxX, y: 0.0, width: 3.0, height: drawingRect.maxY - 6.0)) - c.setFillColor(color.cgColor) - c.fill(CGRect(x: drawingRect.maxX, y: drawingRect.maxY - 6.0, width: 3.0, height: 6.0)) - } - context.blt(tail, at: CGPoint(x: drawingRect.maxX - radius, y: drawingRect.maxY - radius)) - } else { - let corner = cornerContext(.BottomRight(Int(radius))) - context.blt(corner, at: CGPoint(x: drawingRect.maxX - radius, y: drawingRect.maxY - radius)) + let color = context.colorAt(CGPoint(x: drawingRect.maxX - 1.0, y: drawingRect.maxY - 1.0)) + context.withContext { c in + c.clear(CGRect(x: drawingRect.maxX, y: 0.0, width: 4.0, height: drawingRect.maxY - image.size.height)) + c.setFillColor(color.cgColor) + c.fill(CGRect(x: drawingRect.maxX, y: drawingRect.maxY - 6.0, width: 4.0, height: 6.0)) + c.setBlendMode(.destinationIn) + let cornerRect = CGRect(origin: CGPoint(x: drawingRect.maxX - image.size.width + 6.0, y: drawingRect.maxY - image.size.height), size: image.size) + c.translateBy(x: cornerRect.midX, y: cornerRect.midY) + c.scaleBy(x: 1.0, y: -1.0) + c.translateBy(x: -cornerRect.midX, y: -cornerRect.midY) + c.draw(image.cgImage!, in: cornerRect) + c.translateBy(x: cornerRect.midX, y: cornerRect.midY) + c.scaleBy(x: 1.0, y: -1.0) + c.translateBy(x: -cornerRect.midX, y: -cornerRect.midY) } } } diff --git a/submodules/Display/Display/ImageNode.swift b/submodules/Display/Display/ImageNode.swift index 99192e4895..87422abbc6 100644 --- a/submodules/Display/Display/ImageNode.swift +++ b/submodules/Display/Display/ImageNode.swift @@ -8,12 +8,12 @@ private let dispatcher = displayLinkDispatcher public enum ImageCorner: Equatable { case Corner(CGFloat) - case Tail(CGFloat, Bool) + case Tail(CGFloat, UIImage) public var extendedInsets: CGSize { switch self { case .Tail: - return CGSize(width: 3.0, height: 0.0) + return CGSize(width: 4.0, height: 0.0) default: return CGSize() } @@ -36,15 +36,6 @@ public enum ImageCorner: Equatable { return radius } } - - public func scaledBy(_ scale: CGFloat) -> ImageCorner { - switch self { - case let .Corner(radius): - return .Corner(radius * scale) - case let .Tail(radius, enabled): - return .Tail(radius * scale, enabled) - } - } } public func ==(lhs: ImageCorner, rhs: ImageCorner) -> Bool { @@ -56,8 +47,8 @@ public func ==(lhs: ImageCorner, rhs: ImageCorner) -> Bool { default: return false } - case let .Tail(lhsRadius, lhsEnabled): - if case let .Tail(rhsRadius, rhsEnabled) = rhs, lhsRadius.isEqual(to: rhsRadius), lhsEnabled == rhsEnabled { + case let .Tail(lhsRadius, lhsImage): + if case let .Tail(rhsRadius, rhsImage) = rhs, lhsRadius.isEqual(to: rhsRadius), lhsImage === rhsImage { return true } else { return false @@ -124,10 +115,6 @@ public struct ImageCorners: Equatable { public func withRemovedTails() -> ImageCorners { return ImageCorners(topLeft: self.topLeft.withoutTail, topRight: self.topRight.withoutTail, bottomLeft: self.bottomLeft.withoutTail, bottomRight: self.bottomRight.withoutTail) } - - public func scaledBy(_ scale: CGFloat) -> ImageCorners { - return ImageCorners(topLeft: self.topLeft.scaledBy(scale), topRight: self.topRight.scaledBy(scale), bottomLeft: self.bottomLeft.scaledBy(scale), bottomRight: self.bottomRight.scaledBy(scale)) - } } public func ==(lhs: ImageCorners, rhs: ImageCorners) -> Bool { diff --git a/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift b/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift new file mode 100644 index 0000000000..769aa9f3c5 --- /dev/null +++ b/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift @@ -0,0 +1,578 @@ +import Foundation +import UIKit +import Display +import Postbox +import SwiftSignalKit +import AsyncDisplayKit +import TelegramCore +import SyncCore +import TelegramPresentationData +import TelegramUIPreferences +import AccountContext +import ChatListUI +import WallpaperResources +import LegacyComponents +import ItemListUI + +private func generateMaskImage(color: UIColor) -> UIImage? { + return generateImage(CGSize(width: 1.0, height: 80.0), opaque: false, rotatedContext: { size, context in + let bounds = CGRect(origin: CGPoint(), size: size) + context.clear(bounds) + + let gradientColors = [color.withAlphaComponent(0.0).cgColor, color.cgColor, color.cgColor] as CFArray + + var locations: [CGFloat] = [0.0, 0.75, 1.0] + let colorSpace = CGColorSpaceCreateDeviceRGB() + let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)! + + context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: 80.0), options: CGGradientDrawingOptions()) + }) +} + +private final class BubbleSettingsControllerNode: ASDisplayNode, UIScrollViewDelegate { + private let context: AccountContext + private var presentationThemeSettings: PresentationThemeSettings + private var presentationData: PresentationData + + private let referenceTimestamp: Int32 + + private let scrollNode: ASScrollNode + + private let maskNode: ASImageNode + private let chatBackgroundNode: WallpaperBackgroundNode + private let messagesContainerNode: ASDisplayNode + private var dateHeaderNode: ListViewItemHeaderNode? + private var messageNodes: [ListViewItemNode]? + private let toolbarNode: BubbleSettingsToolbarNode + + private var validLayout: (ContainerViewLayout, CGFloat)? + + init(context: AccountContext, presentationThemeSettings: PresentationThemeSettings, dismiss: @escaping () -> Void, apply: @escaping (PresentationChatBubbleSettings) -> Void) { + self.context = context + + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + self.presentationThemeSettings = presentationThemeSettings + + let calendar = Calendar(identifier: .gregorian) + var components = calendar.dateComponents(Set([.era, .year, .month, .day, .hour, .minute, .second]), from: Date()) + components.hour = 13 + components.minute = 0 + components.second = 0 + self.referenceTimestamp = Int32(calendar.date(from: components)?.timeIntervalSince1970 ?? 0.0) + + self.scrollNode = ASScrollNode() + + self.chatBackgroundNode = WallpaperBackgroundNode() + self.chatBackgroundNode.displaysAsynchronously = false + + self.messagesContainerNode = ASDisplayNode() + self.messagesContainerNode.clipsToBounds = true + self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0) + + self.chatBackgroundNode.image = chatControllerBackgroundImage(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false) + self.chatBackgroundNode.motionEnabled = self.presentationData.chatWallpaper.settings?.motion ?? false + if case .gradient = self.presentationData.chatWallpaper { + self.chatBackgroundNode.imageContentMode = .scaleToFill + } + + self.toolbarNode = BubbleSettingsToolbarNode(presentationThemeSettings: self.presentationThemeSettings, presentationData: self.presentationData) + + self.maskNode = ASImageNode() + self.maskNode.displaysAsynchronously = false + self.maskNode.displayWithoutProcessing = true + self.maskNode.contentMode = .scaleToFill + + + super.init() + + self.setViewBlock({ + return UITracingLayerView() + }) + + self.backgroundColor = self.presentationData.theme.list.plainBackgroundColor + + self.maskNode.image = generateMaskImage(color: self.presentationData.theme.chatList.backgroundColor) + + self.addSubnode(self.scrollNode) + self.addSubnode(self.toolbarNode) + + self.scrollNode.addSubnode(self.chatBackgroundNode) + self.scrollNode.addSubnode(self.messagesContainerNode) + + self.toolbarNode.cancel = { + dismiss() + } + var dismissed = false + self.toolbarNode.done = { [weak self] in + guard let strongSelf = self else { + return + } + if !dismissed { + dismissed = true + apply(strongSelf.presentationThemeSettings.chatBubbleSettings) + } + } + self.toolbarNode.updateMergeBubbleCorners = { [weak self] value in + guard let strongSelf = self else { + return + } + strongSelf.presentationThemeSettings.chatBubbleSettings.mergeBubbleCorners = value + strongSelf.updatePresentationThemeSettings(strongSelf.presentationThemeSettings) + } + self.toolbarNode.updateCornerRadius = { [weak self] value in + guard let strongSelf = self else { + return + } + strongSelf.presentationThemeSettings.chatBubbleSettings.mainRadius = Int32(value) + strongSelf.presentationThemeSettings.chatBubbleSettings.auxiliaryRadius = Int32(value / 2) + strongSelf.updatePresentationThemeSettings(strongSelf.presentationThemeSettings) + } + } + + override func didLoad() { + super.didLoad() + + self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true + self.scrollNode.view.showsHorizontalScrollIndicator = false + self.scrollNode.view.isPagingEnabled = true + self.scrollNode.view.delegate = self + self.scrollNode.view.alwaysBounceHorizontal = false + } + + func scrollViewDidScroll(_ scrollView: UIScrollView) { + } + + func animateIn(completion: (() -> Void)? = nil) { + if let (layout, _) = self.validLayout, case .compact = layout.metrics.widthClass { + self.layer.animatePosition(from: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring) + } + } + + func animateOut(completion: (() -> Void)? = nil) { + if let (layout, _) = self.validLayout, case .compact = layout.metrics.widthClass { + self.layer.animatePosition(from: self.layer.position, to: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), duration: 0.2, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, completion: { _ in + completion?() + }) + } else { + completion?() + } + } + + private func updateMessagesLayout(layout: ContainerViewLayout, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { + let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) + + var items: [ListViewItem] = [] + let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) + let otherPeerId = self.context.account.peerId + var peers = SimpleDictionary() + var messages = SimpleDictionary() + peers[peerId] = TelegramUser(id: peerId, accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_Chat_2_ReplyName, lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) + peers[otherPeerId] = TelegramUser(id: otherPeerId, accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_Chat_2_ReplyName, lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) + + let replyMessageId = MessageId(peerId: peerId, namespace: 0, id: 3) + messages[replyMessageId] = Message(stableId: 3, stableVersion: 0, id: replyMessageId, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) + + let message1 = Message(stableId: 4, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 4), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66003, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_3_Text, 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: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + + let message2 = Message(stableId: 3, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 3), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66002, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_2_Text, attributes: [ReplyMessageAttribute(messageId: replyMessageId)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + + let waveformBase64 = "DAAOAAkACQAGAAwADwAMABAADQAPABsAGAALAA0AGAAfABoAHgATABgAGQAYABQADAAVABEAHwANAA0ACQAWABkACQAOAAwACQAfAAAAGQAVAAAAEwATAAAACAAfAAAAHAAAABwAHwAAABcAGQAAABQADgAAABQAHwAAAB8AHwAAAAwADwAAAB8AEwAAABoAFwAAAB8AFAAAAAAAHwAAAAAAHgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAA=" + let voiceAttributes: [TelegramMediaFileAttribute] = [.Audio(isVoice: true, duration: 23, title: nil, performer: nil, waveform: MemoryBuffer(data: Data(base64Encoded: waveformBase64)!))] + let voiceMedia = TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: 0, attributes: voiceAttributes) + + let message3 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: "", attributes: [], media: [voiceMedia], peers: peers, associatedMessages: messages, associatedMessageIds: []) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message3, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil)) + + let message4 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message4, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + + let width: CGFloat + if case .regular = layout.metrics.widthClass { + width = layout.size.width / 2.0 + } else { + width = layout.size.width + } + + let params = ListViewItemLayoutParams(width: width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height) + if let messageNodes = self.messageNodes { + for i in 0 ..< items.count { + let itemNode = messageNodes[i] + items[i].updateNode(async: { $0() }, node: { + return itemNode + }, params: params, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], animation: .None, completion: { (layout, apply) in + let nodeFrame = CGRect(origin: itemNode.frame.origin, size: CGSize(width: width, height: layout.size.height)) + + itemNode.contentSize = layout.contentSize + itemNode.insets = layout.insets + itemNode.frame = nodeFrame + itemNode.isUserInteractionEnabled = false + + apply(ListViewItemApply(isOnScreen: true)) + }) + } + } else { + var messageNodes: [ListViewItemNode] = [] + for i in 0 ..< items.count { + var itemNode: ListViewItemNode? + items[i].nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: false, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], completion: { node, apply in + itemNode = node + apply().1(ListViewItemApply(isOnScreen: true)) + }) + itemNode!.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0) + itemNode!.isUserInteractionEnabled = false + messageNodes.append(itemNode!) + self.messagesContainerNode.addSubnode(itemNode!) + } + self.messageNodes = messageNodes + } + + var bottomOffset: CGFloat = 9.0 + bottomInset + if let messageNodes = self.messageNodes { + for itemNode in messageNodes { + transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: bottomOffset), size: itemNode.frame.size)) + bottomOffset += itemNode.frame.height + itemNode.updateFrame(itemNode.frame, within: layout.size) + } + } + + let dateHeaderNode: ListViewItemHeaderNode + if let currentDateHeaderNode = self.dateHeaderNode { + dateHeaderNode = currentDateHeaderNode + headerItem.updateNode(dateHeaderNode, previous: nil, next: headerItem) + } else { + dateHeaderNode = headerItem.node() + dateHeaderNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0) + self.messagesContainerNode.addSubnode(dateHeaderNode) + self.dateHeaderNode = dateHeaderNode + } + + transition.updateFrame(node: dateHeaderNode, frame: CGRect(origin: CGPoint(x: 0.0, y: bottomOffset), size: CGSize(width: layout.size.width, height: headerItem.height))) + dateHeaderNode.updateLayout(size: self.messagesContainerNode.frame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right) + } + + func updatePresentationThemeSettings(_ presentationThemeSettings: PresentationThemeSettings) { + let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(presentationThemeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(presentationThemeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: presentationThemeSettings.chatBubbleSettings.mergeBubbleCorners) + + self.presentationData = self.presentationData.withChatBubbleCorners(chatBubbleCorners) + self.toolbarNode.updatePresentationData(presentationData: self.presentationData) + self.toolbarNode.updatePresentationThemeSettings(presentationThemeSettings: self.presentationThemeSettings) + if let (layout, navigationBarHeight) = self.validLayout { + self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate) + self.recursivelyEnsureDisplaySynchronously(true) + } + } + + func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + self.validLayout = (layout, navigationBarHeight) + + let bounds = CGRect(origin: CGPoint(), size: layout.size) + self.scrollNode.frame = bounds + + let toolbarHeight = self.toolbarNode.updateLayout(width: layout.size.width, bottomInset: layout.intrinsicInsets.bottom, layout: layout, transition: transition) + + var chatFrame = CGRect(x: 0.0, y: 0.0, width: bounds.width, height: bounds.height) + + let bottomInset: CGFloat + chatFrame = CGRect(x: 0.0, y: 0.0, width: bounds.width, height: bounds.height) + self.scrollNode.view.contentSize = CGSize(width: bounds.width, height: bounds.height) + + bottomInset = 37.0 + + self.chatBackgroundNode.frame = chatFrame + self.chatBackgroundNode.updateLayout(size: chatFrame.size, transition: transition) + self.messagesContainerNode.frame = chatFrame + + transition.updateFrame(node: self.toolbarNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - toolbarHeight), size: CGSize(width: layout.size.width, height: toolbarHeight + layout.intrinsicInsets.bottom))) + + self.updateMessagesLayout(layout: layout, bottomInset: toolbarHeight + bottomInset, transition: transition) + + transition.updateFrame(node: self.maskNode, frame: CGRect(x: 0.0, y: layout.size.height - toolbarHeight - 80.0, width: bounds.width, height: 80.0)) + } +} + +final class BubbleSettingsController: ViewController { + private let context: AccountContext + + private var controllerNode: BubbleSettingsControllerNode { + return self.displayNode as! BubbleSettingsControllerNode + } + + private var didPlayPresentationAnimation = false + + private var presentationData: PresentationData + private var presentationDataDisposable: Disposable? + + private var presentationThemeSettings: PresentationThemeSettings + private var presentationThemeSettingsDisposable: Disposable? + + private var disposable: Disposable? + private var applyDisposable = MetaDisposable() + + public init(context: AccountContext, presentationThemeSettings: PresentationThemeSettings) { + self.context = context + + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + self.presentationThemeSettings = presentationThemeSettings + + super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationTheme: self.presentationData.theme, presentationStrings: self.presentationData.strings)) + + self.blocksBackgroundWhenInOverlay = true + self.navigationPresentation = .modal + + self.navigationItem.title = self.presentationData.strings.Appearance_BubbleCorners_Title + self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: UIView()) + + self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style + self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) + + self.presentationDataDisposable = (context.sharedContext.presentationData + |> deliverOnMainQueue).start(next: { [weak self] presentationData in + if let strongSelf = self { + strongSelf.presentationData = presentationData + } + }) + } + + required public init(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + deinit { + self.presentationDataDisposable?.dispose() + self.presentationThemeSettingsDisposable?.dispose() + self.disposable?.dispose() + self.applyDisposable.dispose() + } + + override public func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + + if let presentationArguments = self.presentationArguments as? ViewControllerPresentationArguments, !self.didPlayPresentationAnimation { + self.didPlayPresentationAnimation = true + if case .modalSheet = presentationArguments.presentationAnimation { + self.controllerNode.animateIn() + } + } + } + + override public func loadDisplayNode() { + super.loadDisplayNode() + + self.displayNode = BubbleSettingsControllerNode(context: self.context, presentationThemeSettings: self.presentationThemeSettings, dismiss: { [weak self] in + if let strongSelf = self { + strongSelf.dismiss() + } + }, apply: { [weak self] chatBubbleSettings in + if let strongSelf = self { + strongSelf.apply(chatBubbleSettings: chatBubbleSettings) + } + }) + self.displayNodeDidLoad() + } + + private func apply(chatBubbleSettings: PresentationChatBubbleSettings) { + let _ = (updatePresentationThemeSettingsInteractively(accountManager: self.context.sharedContext.accountManager, { current in + var current = current + current.chatBubbleSettings = chatBubbleSettings + return current + }) + |> deliverOnMainQueue).start(completed: { [weak self] in + self?.dismiss() + }) + } + + override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, transition: transition) + + self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition) + } +} + +private enum TextSelectionCustomMode { + case list + case chat +} + +private final class BubbleSettingsToolbarNode: ASDisplayNode { + private var presentationThemeSettings: PresentationThemeSettings + private var presentationData: PresentationData + + private let cancelButton = HighlightableButtonNode() + private let doneButton = HighlightableButtonNode() + private let separatorNode = ASDisplayNode() + private let topSeparatorNode = ASDisplayNode() + + private var switchItemNode: ItemListSwitchItemNode + private var cornerRadiusItemNode: ThemeSettingsFontSizeItemNode + + private(set) var customMode: TextSelectionCustomMode = .chat + + var cancel: (() -> Void)? + var done: (() -> Void)? + + var updateMergeBubbleCorners: ((Bool) -> Void)? + var updateCornerRadius: ((Int32) -> Void)? + + init(presentationThemeSettings: PresentationThemeSettings, presentationData: PresentationData) { + self.presentationThemeSettings = presentationThemeSettings + self.presentationData = presentationData + + self.switchItemNode = ItemListSwitchItemNode(type: .regular) + self.cornerRadiusItemNode = ThemeSettingsFontSizeItemNode() + + super.init() + + self.addSubnode(self.switchItemNode) + self.addSubnode(self.cornerRadiusItemNode) + self.addSubnode(self.cancelButton) + self.addSubnode(self.doneButton) + self.addSubnode(self.separatorNode) + self.addSubnode(self.topSeparatorNode) + + self.updatePresentationData(presentationData: self.presentationData) + + self.cancelButton.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.cancelButton.backgroundColor = strongSelf.presentationData.theme.list.itemHighlightedBackgroundColor + } else { + UIView.animate(withDuration: 0.3, animations: { + strongSelf.cancelButton.backgroundColor = .clear + }) + } + } + } + + self.doneButton.highligthedChanged = { [weak self] highlighted in + if let strongSelf = self { + if highlighted { + strongSelf.doneButton.backgroundColor = strongSelf.presentationData.theme.list.itemHighlightedBackgroundColor + } else { + UIView.animate(withDuration: 0.3, animations: { + strongSelf.doneButton.backgroundColor = .clear + }) + } + } + } + + self.cancelButton.addTarget(self, action: #selector(self.cancelPressed), forControlEvents: .touchUpInside) + self.doneButton.addTarget(self, action: #selector(self.donePressed), forControlEvents: .touchUpInside) + } + + func setDoneEnabled(_ enabled: Bool) { + self.doneButton.alpha = enabled ? 1.0 : 0.4 + self.doneButton.isUserInteractionEnabled = enabled + } + + func setCustomMode(_ customMode: TextSelectionCustomMode) { + self.customMode = customMode + } + + func updatePresentationData(presentationData: PresentationData) { + self.backgroundColor = presentationData.theme.rootController.tabBar.backgroundColor + self.separatorNode.backgroundColor = presentationData.theme.rootController.tabBar.separatorColor + self.topSeparatorNode.backgroundColor = presentationData.theme.rootController.tabBar.separatorColor + + self.cancelButton.setTitle(presentationData.strings.Common_Cancel, with: Font.regular(17.0), with: presentationData.theme.list.itemPrimaryTextColor, for: []) + self.doneButton.setTitle(presentationData.strings.Wallpaper_Set, with: Font.regular(17.0), with: presentationData.theme.list.itemPrimaryTextColor, for: []) + } + + func updatePresentationThemeSettings(presentationThemeSettings: PresentationThemeSettings) { + self.presentationThemeSettings = presentationThemeSettings + } + + func updateLayout(width: CGFloat, bottomInset: CGFloat, layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) -> CGFloat { + var contentHeight: CGFloat = 0.0 + + let switchItem = ItemListSwitchItem(presentationData: ItemListPresentationData(self.presentationData), title: self.presentationData.strings.Appearance_BubbleCorners_AdjustAdjacent, value: self.presentationThemeSettings.chatBubbleSettings.mergeBubbleCorners, disableLeadingInset: true, sectionId: 0, style: .blocks, updated: { [weak self] value in + self?.updateMergeBubbleCorners?(value) + }) + let fontSize: PresentationFontSize + switch Int(self.presentationData.chatBubbleCorners.mainRadius) { + case 4: + fontSize = .extraSmall + case 6: + fontSize = .small + case 8: + fontSize = .medium + case 10: + fontSize = .regular + case 12: + fontSize = .large + case 14: + fontSize = .extraLarge + case 16: + fontSize = .extraLargeX2 + default: + fontSize = .extraLargeX2 + } + let cornerRadiusItem = ThemeSettingsFontSizeItem(theme: self.presentationData.theme, fontSize: fontSize, enabled: true, disableLeadingInset: false, displayIcons: false, force: false, sectionId: 0, updated: { [weak self] value in + let numericValue: Int32 + switch value { + case .extraSmall: + numericValue = 4 + case .small: + numericValue = 6 + case .medium: + numericValue = 8 + case .regular: + numericValue = 10 + case .large: + numericValue = 12 + case .extraLarge: + numericValue = 14 + case .extraLargeX2: + numericValue = 16 + } + self?.updateCornerRadius?(numericValue) + }) + + /*switchItem.updateNode(async: { f in + f() + }, node: { + return self.switchItemNode + }, params: ListViewItemLayoutParams(width: width, leftInset: layout.intrinsicInsets.left, rightInset: layout.intrinsicInsets.right, availableHeight: 1000.0), previousItem: nil, nextItem: cornerRadiusItem, animation: .None, completion: { layout, apply in + self.switchItemNode.contentSize = layout.contentSize + self.switchItemNode.insets = layout.insets + transition.updateFrame(node: self.switchItemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: layout.contentSize)) + contentHeight += layout.contentSize.height + apply(ListViewItemApply(isOnScreen: true)) + })*/ + + cornerRadiusItem.updateNode(async: { f in + f() + }, node: { + return self.cornerRadiusItemNode + }, params: ListViewItemLayoutParams(width: width, leftInset: layout.intrinsicInsets.left, rightInset: layout.intrinsicInsets.right, availableHeight: 1000.0), previousItem: switchItem, nextItem: nil, animation: .None, completion: { layout, apply in + self.cornerRadiusItemNode.contentSize = layout.contentSize + self.cornerRadiusItemNode.insets = layout.insets + transition.updateFrame(node: self.cornerRadiusItemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: layout.contentSize)) + contentHeight += layout.contentSize.height + apply(ListViewItemApply(isOnScreen: true)) + }) + + self.cancelButton.frame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: floor(width / 2.0), height: 49.0)) + self.doneButton.frame = CGRect(origin: CGPoint(x: floor(width / 2.0), y: contentHeight), size: CGSize(width: width - floor(width / 2.0), height: 49.0)) + + contentHeight += 49.0 + + self.topSeparatorNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: width, height: UIScreenPixel)) + + let resultHeight = contentHeight + bottomInset + + self.separatorNode.frame = CGRect(origin: CGPoint(x: floor(width / 2.0), y: self.cancelButton.frame.minY), size: CGSize(width: UIScreenPixel, height: resultHeight - self.cancelButton.frame.minY)) + + return resultHeight + } + + @objc func cancelPressed() { + self.cancel?() + } + + @objc func donePressed() { + self.doneButton.isUserInteractionEnabled = false + self.done?() + } +} diff --git a/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift b/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift index dfdba0d1ea..ccc324d7ef 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift @@ -18,6 +18,7 @@ class ForwardPrivacyChatPreviewItem: ListViewItem, ItemListItem { let strings: PresentationStrings let sectionId: ItemListSectionId let fontSize: PresentationFontSize + let chatBubbleCorners: PresentationChatBubbleCorners let wallpaper: TelegramWallpaper let dateTimeFormat: PresentationDateTimeFormat let nameDisplayOrder: PresentationPersonNameOrder @@ -25,12 +26,13 @@ class ForwardPrivacyChatPreviewItem: ListViewItem, ItemListItem { let linkEnabled: Bool let tooltipText: String - init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, peerName: String, linkEnabled: Bool, tooltipText: String) { + init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, peerName: String, linkEnabled: Bool, tooltipText: String) { self.context = context self.theme = theme self.strings = strings self.sectionId = sectionId self.fontSize = fontSize + self.chatBubbleCorners = chatBubbleCorners self.wallpaper = wallpaper self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder @@ -157,7 +159,7 @@ class ForwardPrivacyChatPreviewItemNode: ListViewItemNode { let forwardInfo = MessageForwardInfo(author: item.linkEnabled ? peers[peerId] : nil, source: nil, sourceMessageId: nil, date: 0, authorSignature: item.linkEnabled ? nil : item.peerName) - let messageItem = item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: forwardInfo, author: nil, text: item.strings.Privacy_Forwards_PreviewMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), theme: item.theme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil) + let messageItem = item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: forwardInfo, author: nil, text: item.strings.Privacy_Forwards_PreviewMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), theme: item.theme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, chatBubbleCorners: item.chatBubbleCorners, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil) var node: ListViewItemNode? if let current = currentNode { diff --git a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift index 1a89bcca3c..3c7774bcc4 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift @@ -87,7 +87,7 @@ private func stringForUserCount(_ peers: [PeerId: SelectivePrivacyPeer], strings private enum SelectivePrivacySettingsEntry: ItemListNodeEntry { case forwardsPreviewHeader(PresentationTheme, String) - case forwardsPreview(PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, String, Bool, String) + case forwardsPreview(PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationChatBubbleCorners, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, String, Bool, String) case settingHeader(PresentationTheme, String) case everybody(PresentationTheme, String, Bool) case contacts(PresentationTheme, String, Bool) @@ -194,8 +194,8 @@ private enum SelectivePrivacySettingsEntry: ItemListNodeEntry { } else { return false } - case let .forwardsPreview(lhsTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsPeerName, lhsLinkEnabled, lhsTooltipText): - if case let .forwardsPreview(rhsTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsPeerName, rhsLinkEnabled, rhsTooltipText) = rhs, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsPeerName == rhsPeerName, lhsLinkEnabled == rhsLinkEnabled, lhsTooltipText == rhsTooltipText { + case let .forwardsPreview(lhsTheme, lhsWallpaper, lhsFontSize, lhsChatBubbleCorners, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsPeerName, lhsLinkEnabled, lhsTooltipText): + if case let .forwardsPreview(rhsTheme, rhsWallpaper, rhsFontSize, rhsChatBubbleCorners, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsPeerName, rhsLinkEnabled, rhsTooltipText) = rhs, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsChatBubbleCorners == rhsChatBubbleCorners, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsPeerName == rhsPeerName, lhsLinkEnabled == rhsLinkEnabled, lhsTooltipText == rhsTooltipText { return true } else { return false @@ -350,8 +350,8 @@ private enum SelectivePrivacySettingsEntry: ItemListNodeEntry { switch self { case let .forwardsPreviewHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, multiline: true, sectionId: self.section) - case let .forwardsPreview(theme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder, peerName, linkEnabled, tooltipText): - return ForwardPrivacyChatPreviewItem(context: arguments.context, theme: theme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, peerName: peerName, linkEnabled: linkEnabled, tooltipText: tooltipText) + case let .forwardsPreview(theme, wallpaper, fontSize, chatBubbleCorners, strings, dateTimeFormat, nameDisplayOrder, peerName, linkEnabled, tooltipText): + return ForwardPrivacyChatPreviewItem(context: arguments.context, theme: theme, strings: strings, sectionId: self.section, fontSize: fontSize, chatBubbleCorners: chatBubbleCorners, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, peerName: peerName, linkEnabled: linkEnabled, tooltipText: tooltipText) case let .settingHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, multiline: true, sectionId: self.section) case let .everybody(theme, text, value): @@ -591,7 +591,7 @@ private func selectivePrivacySettingsControllerEntries(presentationData: Present linkEnabled = false } entries.append(.forwardsPreviewHeader(presentationData.theme, presentationData.strings.Privacy_Forwards_Preview)) - entries.append(.forwardsPreview(presentationData.theme, presentationData.chatWallpaper, presentationData.chatFontSize, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, peerName, linkEnabled, tootipText)) + entries.append(.forwardsPreview(presentationData.theme, presentationData.chatWallpaper, presentationData.chatFontSize, presentationData.chatBubbleCorners, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, peerName, linkEnabled, tootipText)) } entries.append(.settingHeader(presentationData.theme, settingTitle)) diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift index 20a23a462b..675dc81df5 100644 --- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift +++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift @@ -303,7 +303,7 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView } private func updateMessagesLayout(layout: ContainerViewLayout, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { - let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) + let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) var items: [ListViewItem] = [] let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) @@ -317,20 +317,20 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView messages[replyMessageId] = Message(stableId: 3, stableVersion: 0, id: replyMessageId, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) let message1 = Message(stableId: 4, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 4), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66003, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_3_Text, 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: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message1, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let message2 = Message(stableId: 3, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 3), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66002, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_2_Text, attributes: [ReplyMessageAttribute(messageId: replyMessageId)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let waveformBase64 = "DAAOAAkACQAGAAwADwAMABAADQAPABsAGAALAA0AGAAfABoAHgATABgAGQAYABQADAAVABEAHwANAA0ACQAWABkACQAOAAwACQAfAAAAGQAVAAAAEwATAAAACAAfAAAAHAAAABwAHwAAABcAGQAAABQADgAAABQAHwAAAB8AHwAAAAwADwAAAB8AEwAAABoAFwAAAB8AFAAAAAAAHwAAAAAAHgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAA=" let voiceAttributes: [TelegramMediaFileAttribute] = [.Audio(isVoice: true, duration: 23, title: nil, performer: nil, waveform: MemoryBuffer(data: Data(base64Encoded: waveformBase64)!))] let voiceMedia = TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: 0, attributes: voiceAttributes) let message3 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: "", attributes: [], media: [voiceMedia], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message3, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message3, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil)) let message4 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message4, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message4, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let width: CGFloat if case .regular = layout.metrics.widthClass { diff --git a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift index b918e65d1a..f85e96e5ce 100644 --- a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift +++ b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift @@ -53,7 +53,7 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { case slug(PresentationTheme, PresentationStrings, String, String, Bool) case slugInfo(PresentationTheme, String) case chatPreviewHeader(PresentationTheme, String) - case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) + case chatPreview(PresentationTheme, PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationChatBubbleCorners, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) case changeColors(PresentationTheme, String) case uploadTheme(PresentationTheme, String) case uploadInfo(PresentationTheme, String) @@ -114,8 +114,8 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { } else { return false } - case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): - if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { + case let .chatPreview(lhsTheme, lhsComponentTheme, lhsWallpaper, lhsFontSize, lhsChatBubbleCorners, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): + if case let .chatPreview(rhsTheme, rhsComponentTheme, rhsWallpaper, rhsFontSize, rhsChatBubbleCorners, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsComponentTheme === rhsComponentTheme, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsChatBubbleCorners == rhsChatBubbleCorners, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { return true } else { return false @@ -172,8 +172,8 @@ private enum EditThemeControllerEntry: ItemListNodeEntry { return ItemListTextItem(presentationData: presentationData, text: .markdown(text), sectionId: self.section) case let .chatPreviewHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) - case let .chatPreview(theme, componentTheme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder, items): - return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) + case let .chatPreview(theme, componentTheme, wallpaper, fontSize, chatBubbleCorners, strings, dateTimeFormat, nameDisplayOrder, items): + return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: componentTheme, strings: strings, sectionId: self.section, fontSize: fontSize, chatBubbleCorners: chatBubbleCorners, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) case let .changeColors(theme, text): return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { arguments.openColors() @@ -253,7 +253,7 @@ private func editThemeControllerEntries(presentationData: PresentationData, stat entries.append(.slugInfo(presentationData.theme, infoText)) entries.append(.chatPreviewHeader(presentationData.theme, presentationData.strings.EditTheme_Preview.uppercased())) - entries.append(.chatPreview(presentationData.theme, previewTheme, previewTheme.chat.defaultWallpaper, presentationData.chatFontSize, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (previewIncomingReplyName, previewIncomingReplyText), text: previewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: previewOutgoingText)])) + entries.append(.chatPreview(presentationData.theme, previewTheme, previewTheme.chat.defaultWallpaper, presentationData.chatFontSize, presentationData.chatBubbleCorners, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (previewIncomingReplyName, previewIncomingReplyText), text: previewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: previewOutgoingText)])) entries.append(.changeColors(presentationData.theme, presentationData.strings.EditTheme_ChangeColors)) if !hasSettings { @@ -556,7 +556,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers themeSpecificChatWallpapers[themeReference.index] = nil - return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) |> deliverOnMainQueue).start(completed: { if !hasCustomFile { saveThemeTemplateFile(state.title, themeResource, { @@ -590,7 +590,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers themeSpecificChatWallpapers[themeReference.index] = nil - return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) |> deliverOnMainQueue).start(completed: { if let themeResource = themeResource, !hasCustomFile { saveThemeTemplateFile(state.title, themeResource, { diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift index 503d9005d3..21c9950124 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift @@ -276,7 +276,7 @@ final class ThemeAccentColorController: ViewController { var themeSpecificAccentColors = current.themeSpecificAccentColors themeSpecificAccentColors[baseThemeReference.index] = PresentationThemeAccentColor(themeIndex: themeReference.index) - return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) |> castError(CreateThemeError.self) } else { @@ -305,7 +305,7 @@ final class ThemeAccentColorController: ViewController { var themeSpecificAccentColors = current.themeSpecificAccentColors themeSpecificAccentColors[baseThemeReference.index] = PresentationThemeAccentColor(themeIndex: themeReference.index) - return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) |> castError(CreateThemeError.self) } else { diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift index beef472dec..57916acc46 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift @@ -226,6 +226,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate self.presentationData = context.sharedContext.currentPresentationData.with { $0 } self.theme = theme self.wallpaper = self.presentationData.chatWallpaper + let bubbleCorners = self.presentationData.chatBubbleCorners self.ready = ready @@ -498,7 +499,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate updatedTheme = theme } - let _ = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: updatedTheme!, wallpaper: wallpaper) + let _ = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: updatedTheme!, wallpaper: wallpaper, bubbleCorners: bubbleCorners) } else { updatedTheme = nil } @@ -836,7 +837,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate } private func updateMessagesLayout(layout: ContainerViewLayout, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { - let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) + let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) var items: [ListViewItem] = [] let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) @@ -878,7 +879,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate sampleMessages.append(message8) items = sampleMessages.reversed().map { message in - let item = self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: { [weak self] message in + let item = self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: { [weak self] message in if message.flags.contains(.Incoming) { self?.updateSection(.accent) self?.requestSectionUpdate?(.accent) diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift index b4b5cbaf2f..469477a0d6 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift @@ -442,7 +442,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { } private func updateMessagesLayout(layout: ContainerViewLayout, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) { - let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) + let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.referenceTimestamp, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder) var items: [ListViewItem] = [] let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1) @@ -484,7 +484,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate { sampleMessages.append(message8) items = sampleMessages.reversed().map { message in - self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.previewTheme.chat.defaultWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: nil, clickThroughMessage: nil) + self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.previewTheme.chat.defaultWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: nil, clickThroughMessage: nil) } let width: CGFloat diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift index 4a2a1361ad..47b4bbda37 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift @@ -40,18 +40,20 @@ class ThemeSettingsChatPreviewItem: ListViewItem, ItemListItem { let strings: PresentationStrings let sectionId: ItemListSectionId let fontSize: PresentationFontSize + let chatBubbleCorners: PresentationChatBubbleCorners let wallpaper: TelegramWallpaper let dateTimeFormat: PresentationDateTimeFormat let nameDisplayOrder: PresentationPersonNameOrder let messageItems: [ChatPreviewMessageItem] - init(context: AccountContext, theme: PresentationTheme, componentTheme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, messageItems: [ChatPreviewMessageItem]) { + init(context: AccountContext, theme: PresentationTheme, componentTheme: PresentationTheme, strings: PresentationStrings, sectionId: ItemListSectionId, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, wallpaper: TelegramWallpaper, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, messageItems: [ChatPreviewMessageItem]) { self.context = context self.theme = theme self.componentTheme = componentTheme self.strings = strings self.sectionId = sectionId self.fontSize = fontSize + self.chatBubbleCorners = chatBubbleCorners self.wallpaper = wallpaper self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder @@ -163,7 +165,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { } let message = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: messageItem.outgoing ? otherPeerId : peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: messageItem.outgoing ? [] : [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: messageItem.outgoing ? TelegramUser(id: otherPeerId, accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) : nil, text: messageItem.text, attributes: messageItem.reply != nil ? [ReplyMessageAttribute(messageId: replyMessageId)] : [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: message, theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, message: message, theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, chatBubbleCorners: item.chatBubbleCorners, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) } var nodes: [ListViewItemNode] = [] diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift index d45c21762c..6f8357dfba 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift @@ -76,6 +76,7 @@ private final class ThemeSettingsControllerArguments { let openAccentColorPicker: (PresentationThemeReference, Bool) -> Void let openAutoNightTheme: () -> Void let openTextSize: () -> Void + let openBubbleSettings: () -> Void let toggleLargeEmoji: (Bool) -> Void let disableAnimations: (Bool) -> Void let selectAppIcon: (String) -> Void @@ -83,7 +84,7 @@ private final class ThemeSettingsControllerArguments { let themeContextAction: (Bool, PresentationThemeReference, ASDisplayNode, ContextGesture?) -> Void let colorContextAction: (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void - init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor?) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference, Bool) -> 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 (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void) { + init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor?) -> Void, openAccentColorPicker: @escaping (PresentationThemeReference, Bool) -> Void, openAutoNightTheme: @escaping () -> Void, openTextSize: @escaping () -> Void, openBubbleSettings: @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 (Bool, PresentationThemeReference, ThemeSettingsColorOption?, ASDisplayNode, ContextGesture?) -> Void) { self.context = context self.selectTheme = selectTheme self.selectFontSize = selectFontSize @@ -92,6 +93,7 @@ private final class ThemeSettingsControllerArguments { self.openAccentColorPicker = openAccentColorPicker self.openAutoNightTheme = openAutoNightTheme self.openTextSize = openTextSize + self.openBubbleSettings = openBubbleSettings self.toggleLargeEmoji = toggleLargeEmoji self.disableAnimations = disableAnimations self.selectAppIcon = selectAppIcon @@ -131,11 +133,12 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { case themeListHeader(PresentationTheme, String) case fontSizeHeader(PresentationTheme, String) case fontSize(PresentationTheme, PresentationFontSize) - case chatPreview(PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) + case chatPreview(PresentationTheme, TelegramWallpaper, PresentationFontSize, PresentationChatBubbleCorners, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, [ChatPreviewMessageItem]) case wallpaper(PresentationTheme, String) case accentColor(PresentationTheme, PresentationThemeReference, PresentationThemeReference, [PresentationThemeReference], ThemeSettingsColorOption?) case autoNightTheme(PresentationTheme, String, String) case textSize(PresentationTheme, String, String) + case bubbleSettings(PresentationTheme, String, String) case themeItem(PresentationTheme, PresentationStrings, [PresentationThemeReference], [PresentationThemeReference], PresentationThemeReference, [Int64: PresentationThemeAccentColor], [Int64: TelegramWallpaper], PresentationThemeAccentColor?) case iconHeader(PresentationTheme, String) case iconItem(PresentationTheme, PresentationStrings, [PresentationAppIcon], String?) @@ -150,7 +153,7 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ThemeSettingsControllerSection.chatPreview.rawValue case .fontSizeHeader, .fontSize: return ThemeSettingsControllerSection.fontSize.rawValue - case .wallpaper, .autoNightTheme, .textSize: + case .wallpaper, .autoNightTheme, .textSize, .bubbleSettings: return ThemeSettingsControllerSection.background.rawValue case .iconHeader, .iconItem: return ThemeSettingsControllerSection.icon.rawValue @@ -175,29 +178,31 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return 6 case .textSize: return 7 - case .fontSizeHeader: + case .bubbleSettings: return 8 - case .fontSize: + case .fontSizeHeader: return 9 - case .iconHeader: + case .fontSize: return 10 - case .iconItem: + case .iconHeader: return 11 - case .otherHeader: + case .iconItem: return 12 - case .largeEmoji: + case .otherHeader: return 13 - case .animations: + case .largeEmoji: return 14 - case .animationsInfo: + case .animations: return 15 + case .animationsInfo: + return 16 } } static func ==(lhs: ThemeSettingsControllerEntry, rhs: ThemeSettingsControllerEntry) -> Bool { switch lhs { - case let .chatPreview(lhsTheme, lhsWallpaper, lhsFontSize, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): - if case let .chatPreview(rhsTheme, rhsWallpaper, rhsFontSize, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { + case let .chatPreview(lhsTheme, lhsWallpaper, lhsFontSize, lhsChatBubbleCorners, lhsStrings, lhsTimeFormat, lhsNameOrder, lhsItems): + if case let .chatPreview(rhsTheme, rhsWallpaper, rhsFontSize, rhsChatBubbleCorners, rhsStrings, rhsTimeFormat, rhsNameOrder, rhsItems) = rhs, lhsTheme === rhsTheme, lhsWallpaper == rhsWallpaper, lhsFontSize == rhsFontSize, lhsChatBubbleCorners == rhsChatBubbleCorners, lhsStrings === rhsStrings, lhsTimeFormat == rhsTimeFormat, lhsNameOrder == rhsNameOrder, lhsItems == rhsItems { return true } else { return false @@ -226,6 +231,12 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { } else { return false } + case let .bubbleSettings(lhsTheme, lhsText, lhsValue): + if case let .bubbleSettings(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue { + return true + } else { + return false + } case let .themeListHeader(lhsTheme, lhsText): if case let .themeListHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { return true @@ -302,8 +313,8 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ThemeSettingsFontSizeItem(theme: theme, fontSize: fontSize, sectionId: self.section, updated: { value in arguments.selectFontSize(value) }, tag: ThemeSettingsEntryTag.fontSize) - case let .chatPreview(theme, wallpaper, fontSize, strings, dateTimeFormat, nameDisplayOrder, items): - return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: theme, strings: strings, sectionId: self.section, fontSize: fontSize, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) + case let .chatPreview(theme, wallpaper, fontSize, chatBubbleCorners, strings, dateTimeFormat, nameDisplayOrder, items): + return ThemeSettingsChatPreviewItem(context: arguments.context, theme: theme, componentTheme: theme, strings: strings, sectionId: self.section, fontSize: fontSize, chatBubbleCorners: chatBubbleCorners, wallpaper: wallpaper, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, messageItems: items) case let .wallpaper(theme, text): return ItemListDisclosureItem(presentationData: presentationData, title: text, label: "", sectionId: self.section, style: .blocks, action: { arguments.openWallpaperSettings() @@ -387,6 +398,10 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { return ItemListDisclosureItem(presentationData: presentationData, icon: nil, title: text, label: value, labelStyle: .text, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { arguments.openTextSize() }) + case let .bubbleSettings(theme, text, value): + return ItemListDisclosureItem(presentationData: presentationData, icon: nil, title: text, label: value, labelStyle: .text, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { + arguments.openBubbleSettings() + }) case let .themeListHeader(theme, text): return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) case let .themeItem(theme, strings, themes, allThemes, currentTheme, themeSpecificAccentColors, themeSpecificChatWallpapers, _): @@ -429,7 +444,7 @@ private func themeSettingsControllerEntries(presentationData: PresentationData, let strings = presentationData.strings let title = presentationData.autoNightModeTriggered ? strings.Appearance_ColorThemeNight.uppercased() : strings.Appearance_ColorTheme.uppercased() entries.append(.themeListHeader(presentationData.theme, title)) - entries.append(.chatPreview(presentationData.theme, presentationData.chatWallpaper, presentationData.chatFontSize, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (presentationData.strings.Appearance_PreviewReplyAuthor, presentationData.strings.Appearance_PreviewReplyText), text: presentationData.strings.Appearance_PreviewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: presentationData.strings.Appearance_PreviewOutgoingText)])) + entries.append(.chatPreview(presentationData.theme, presentationData.chatWallpaper, presentationData.chatFontSize, presentationData.chatBubbleCorners, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, [ChatPreviewMessageItem(outgoing: false, reply: (presentationData.strings.Appearance_PreviewReplyAuthor, presentationData.strings.Appearance_PreviewReplyText), text: presentationData.strings.Appearance_PreviewIncomingText), ChatPreviewMessageItem(outgoing: true, reply: nil, text: presentationData.strings.Appearance_PreviewOutgoingText)])) let generalThemes: [PresentationThemeReference] = availableThemes.filter { reference in if case let .cloud(theme) = reference { @@ -497,6 +512,7 @@ private func themeSettingsControllerEntries(presentationData: PresentationData, } } entries.append(.textSize(presentationData.theme, strings.Appearance_TextSizeSetting, textSizeValue)) + entries.append(.bubbleSettings(presentationData.theme, strings.Appearance_BubbleCornersSetting, "")) if !availableAppIcons.isEmpty { entries.append(.iconHeader(presentationData.theme, strings.Appearance_AppIcon.uppercased())) @@ -570,6 +586,13 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The let settings = (view.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings pushControllerImpl?(TextSizeSelectionController(context: context, presentationThemeSettings: settings)) }) + }, openBubbleSettings: { + let _ = (context.sharedContext.accountManager.sharedData(keys: Set([ApplicationSpecificSharedDataKeys.presentationThemeSettings])) + |> take(1) + |> deliverOnMainQueue).start(next: { view in + let settings = (view.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings + pushControllerImpl?(BubbleSettingsController(context: context, presentationThemeSettings: settings)) + }) }, toggleLargeEmoji: { largeEmoji in let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in return current.withUpdatedLargeEmoji(largeEmoji) @@ -1272,7 +1295,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The } } - return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }).start() presentCrossfadeControllerImpl?(true) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift index b409c93e4b..61b07eabff 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift @@ -16,17 +16,19 @@ class ThemeSettingsFontSizeItem: ListViewItem, ItemListItem { let theme: PresentationTheme let fontSize: PresentationFontSize let disableLeadingInset: Bool + let displayIcons: Bool let force: Bool let enabled: Bool let sectionId: ItemListSectionId let updated: (PresentationFontSize) -> Void let tag: ItemListItemTag? - init(theme: PresentationTheme, fontSize: PresentationFontSize, enabled: Bool = true, disableLeadingInset: Bool = false, force: Bool = false, sectionId: ItemListSectionId, updated: @escaping (PresentationFontSize) -> Void, tag: ItemListItemTag? = nil) { + init(theme: PresentationTheme, fontSize: PresentationFontSize, enabled: Bool = true, disableLeadingInset: Bool = false, displayIcons: Bool = true, force: Bool = false, sectionId: ItemListSectionId, updated: @escaping (PresentationFontSize) -> Void, tag: ItemListItemTag? = nil) { self.theme = theme self.fontSize = fontSize self.enabled = enabled self.disableLeadingInset = disableLeadingInset + self.displayIcons = displayIcons self.force = force self.sectionId = sectionId self.updated = updated @@ -164,7 +166,9 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { sliderView.trackColor = item.enabled ? item.theme.list.itemAccentColor : item.theme.list.itemDisabledTextColor sliderView.knobImage = generateKnobImage() - sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + 38.0, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - 38.0 * 2.0, height: 44.0)) + let sliderInset: CGFloat = item.displayIcons ? 38.0 : 16.0 + + sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + sliderInset, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - sliderInset * 2.0, height: 44.0)) } self.view.insertSubview(sliderView, belowSubview: self.disabledOverlayNode.view) sliderView.addTarget(self, action: #selector(self.sliderValueChanged), for: .valueChanged) @@ -271,6 +275,9 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { strongSelf.rightIconNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 14.0 - image.size.width, y: 21.0), size: CGSize(width: image.size.width, height: image.size.height)) } + strongSelf.leftIconNode.isHidden = !item.displayIcons + strongSelf.rightIconNode.isHidden = !item.displayIcons + if let sliderView = strongSelf.sliderView { sliderView.isUserInteractionEnabled = item.enabled sliderView.trackColor = item.enabled ? item.theme.list.itemAccentColor : item.theme.list.itemDisabledTextColor @@ -302,7 +309,8 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { sliderView.value = value } - sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + 38.0, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - 38.0 * 2.0, height: 44.0)) + let sliderInset: CGFloat = item.displayIcons ? 38.0 : 16.0 + sliderView.frame = CGRect(origin: CGPoint(x: params.leftInset + sliderInset, y: 8.0), size: CGSize(width: params.width - params.leftInset - params.rightInset - sliderInset * 2.0, height: 44.0)) } } }) diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift index 9453bc392c..a159690102 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift @@ -832,10 +832,10 @@ final class WallpaperGalleryItemNode: GalleryItemNode { let theme = self.presentationData.theme.withUpdated(preview: true) 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: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message1, theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let message2 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: topMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []) - items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) + items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, message: message2, theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)) let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height) if let messageNodes = self.messageNodes { diff --git a/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift b/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift index 4ae705e92f..36850b476d 100644 --- a/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift +++ b/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift @@ -26,14 +26,253 @@ public func messageSingleBubbleLikeImage(fillColor: UIColor, strokeColor: UIColo })!.stretchableImage(withLeftCapWidth: Int(diameter / 2.0), topCapHeight: Int(diameter / 2.0)) } -public func messageBubbleImage(incoming: Bool, fillColor: UIColor, strokeColor: UIColor, neighbors: MessageBubbleImageNeighbors, theme: PresentationThemeChat, wallpaper: TelegramWallpaper, knockout knockoutValue: Bool, mask: Bool = false, extendedEdges: Bool = false, onlyOutline: Bool = false) -> UIImage { - let diameter: CGFloat = 36.0 - let corner: CGFloat = 7.0 +private let minRadiusForFullTailCorner: CGFloat = 14.0 + +func mediaBubbleCornerImage(incoming: Bool, radius: CGFloat, inset: CGFloat) -> UIImage { + let imageSize = CGSize(width: radius + 7.0, height: 8.0) + let fixedMainDiameter: CGFloat = 33.0 + + let formContext = DrawingContext(size: imageSize) + formContext.withFlippedContext { context in + context.clear(CGRect(origin: CGPoint(), size: imageSize)) + context.translateBy(x: imageSize.width / 2.0, y: imageSize.height / 2.0) + context.scaleBy(x: incoming ? -1.0 : 1.0, y: -1.0) + context.translateBy(x: -imageSize.width / 2.0, y: -imageSize.height / 2.0) + + context.setFillColor(UIColor.black.cgColor) + + let bottomEllipse = CGRect(origin: CGPoint(x: 24.0, y: 16.0), size: CGSize(width: 27.0, height: 17.0)).insetBy(dx: inset, dy: inset).offsetBy(dx: inset, dy: inset) + let topEllipse = CGRect(origin: CGPoint(x: 33.0, y: 14.0), size: CGSize(width: 23.0, height: 21.0)).insetBy(dx: -inset, dy: -inset).offsetBy(dx: inset, dy: inset) + + context.translateBy(x: -fixedMainDiameter + imageSize.width - 6.0, y: -fixedMainDiameter + imageSize.height) + + let topLeftRadius: CGFloat = 2.0 + let topRightRadius: CGFloat = 2.0 + let bottomLeftRadius: CGFloat = 2.0 + let bottomRightRadius: CGFloat = radius + + context.move(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: 0.0), tangent2End: CGPoint(x: topLeftRadius, y: 0.0), radius: topLeftRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter - topRightRadius, y: 0.0)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: 0.0), tangent2End: CGPoint(x: fixedMainDiameter, y: topRightRadius), radius: topRightRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter - bottomRightRadius)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter), tangent2End: CGPoint(x: fixedMainDiameter - bottomRightRadius, y: fixedMainDiameter), radius: bottomRightRadius) + context.addLine(to: CGPoint(x: bottomLeftRadius, y: fixedMainDiameter)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: fixedMainDiameter), tangent2End: CGPoint(x: 0.0, y: fixedMainDiameter - bottomLeftRadius), radius: bottomLeftRadius) + context.addLine(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.fillPath() + + if radius >= minRadiusForFullTailCorner { + context.move(to: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.midY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.midX, y: bottomEllipse.maxY), control: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.maxY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.midY), control: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.maxY)) + context.fillPath() + } else { + context.fill(CGRect(origin: CGPoint(x: bottomEllipse.minX - 5.0, y: bottomEllipse.midY), size: CGSize(width: bottomEllipse.width + 5.0, height: bottomEllipse.height / 2.0))) + } + context.fill(CGRect(origin: CGPoint(x: fixedMainDiameter / 2.0, y: fixedMainDiameter / 2.0), size: CGSize(width: fixedMainDiameter / 2.0, height: bottomEllipse.midY - fixedMainDiameter / 2.0))) + context.setFillColor(UIColor.clear.cgColor) + context.setBlendMode(.copy) + context.fillEllipse(in: topEllipse) + } + + return formContext.generateImage()! +} + +public func messageBubbleImage(maxCornerRadius: CGFloat, minCornerRadius: CGFloat, incoming: Bool, fillColor: UIColor, strokeColor: UIColor, neighbors: MessageBubbleImageNeighbors, theme: PresentationThemeChat, wallpaper: TelegramWallpaper, knockout knockoutValue: Bool, mask: Bool = false, extendedEdges: Bool = false, onlyOutline: Bool = false) -> UIImage { + let topLeftRadius: CGFloat + let topRightRadius: CGFloat + let bottomLeftRadius: CGFloat + let bottomRightRadius: CGFloat + let drawTail: Bool + + switch neighbors { + case .none: + topLeftRadius = maxCornerRadius + topRightRadius = maxCornerRadius + bottomLeftRadius = maxCornerRadius + bottomRightRadius = maxCornerRadius + drawTail = true + case .both: + topLeftRadius = maxCornerRadius + topRightRadius = minCornerRadius + bottomLeftRadius = maxCornerRadius + bottomRightRadius = minCornerRadius + drawTail = false + case .bottom: + topLeftRadius = maxCornerRadius + topRightRadius = minCornerRadius + bottomLeftRadius = maxCornerRadius + bottomRightRadius = maxCornerRadius + drawTail = true + case .side: + topLeftRadius = maxCornerRadius + topRightRadius = maxCornerRadius + bottomLeftRadius = maxCornerRadius + bottomRightRadius = maxCornerRadius + drawTail = false + case let .top(side): + topLeftRadius = maxCornerRadius + topRightRadius = side ? minCornerRadius : maxCornerRadius + bottomLeftRadius = maxCornerRadius + bottomRightRadius = minCornerRadius + drawTail = false + } + + let fixedMainDiameter: CGFloat = 33.0 + let innerSize = CGSize(width: fixedMainDiameter + 6.0, height: fixedMainDiameter) + let strokeInset: CGFloat = 1.0 + let sourceRawSize = CGSize(width: innerSize.width + strokeInset * 2.0, height: innerSize.height + strokeInset * 2.0) + let additionalInset: CGFloat = 1.0 + let imageSize = CGSize(width: sourceRawSize.width + additionalInset * 2.0, height: sourceRawSize.height + additionalInset * 2.0) + let outgoingStretchPoint: (x: Int, y: Int) = (Int(additionalInset + strokeInset + round(fixedMainDiameter / 2.0)) - 1, Int(additionalInset + strokeInset + round(fixedMainDiameter / 2.0))) + let incomingStretchPoint: (x: Int, y: Int) = (Int(sourceRawSize.width) - outgoingStretchPoint.x + 1, outgoingStretchPoint.y) + let knockout = knockoutValue && !mask - let inset: CGFloat = 1.0 + let rawSize = imageSize - return generateImage(CGSize(width: 42.0 + inset * 2.0, height: diameter + inset * 2.0), contextGenerator: { rawSize, context in + let bottomEllipse = CGRect(origin: CGPoint(x: 24.0, y: 16.0), size: CGSize(width: 27.0, height: 17.0)) + let topEllipse = CGRect(origin: CGPoint(x: 33.0, y: 14.0), size: CGSize(width: 23.0, height: 21.0)) + + let formContext = DrawingContext(size: imageSize) + formContext.withFlippedContext { context in + context.clear(CGRect(origin: CGPoint(), size: rawSize)) + context.translateBy(x: additionalInset + strokeInset, y: additionalInset + strokeInset) + + context.setFillColor(UIColor.black.cgColor) + + context.move(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: 0.0), tangent2End: CGPoint(x: topLeftRadius, y: 0.0), radius: topLeftRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter - topRightRadius, y: 0.0)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: 0.0), tangent2End: CGPoint(x: fixedMainDiameter, y: topRightRadius), radius: topRightRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter - bottomRightRadius)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter), tangent2End: CGPoint(x: fixedMainDiameter - bottomRightRadius, y: fixedMainDiameter), radius: bottomRightRadius) + context.addLine(to: CGPoint(x: bottomLeftRadius, y: fixedMainDiameter)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: fixedMainDiameter), tangent2End: CGPoint(x: 0.0, y: fixedMainDiameter - bottomLeftRadius), radius: bottomLeftRadius) + context.addLine(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.fillPath() + + if drawTail { + if maxCornerRadius >= minRadiusForFullTailCorner { + context.move(to: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.midY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.midX, y: bottomEllipse.maxY), control: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.maxY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.midY), control: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.maxY)) + context.fillPath() + } else { + context.fill(CGRect(origin: CGPoint(x: bottomEllipse.minX - 2.0, y: bottomEllipse.midY), size: CGSize(width: bottomEllipse.width + 2.0, height: bottomEllipse.height / 2.0))) + } + context.fill(CGRect(origin: CGPoint(x: fixedMainDiameter / 2.0, y: fixedMainDiameter / 2.0), size: CGSize(width: fixedMainDiameter / 2.0, height: bottomEllipse.midY - fixedMainDiameter / 2.0))) + context.setFillColor(UIColor.clear.cgColor) + context.setBlendMode(.copy) + context.fillEllipse(in: topEllipse) + } + } + let formImage = formContext.generateImage()! + + let outlineContext = DrawingContext(size: imageSize) + outlineContext.withFlippedContext { context in + context.clear(CGRect(origin: CGPoint(), size: rawSize)) + context.translateBy(x: additionalInset + strokeInset, y: additionalInset + strokeInset) + + context.setStrokeColor(UIColor.black.cgColor) + let borderWidth: CGFloat = UIScreenPixel * 2.0 + context.setLineWidth(borderWidth) + + let borderOffset: CGFloat = borderWidth / 2.0 + + context.move(to: CGPoint(x: -borderOffset, y: topLeftRadius + borderOffset)) + context.addArc(tangent1End: CGPoint(x: -borderOffset, y: -borderOffset), tangent2End: CGPoint(x: topLeftRadius + borderOffset, y: -borderOffset), radius: topLeftRadius + borderOffset * 2.0) + context.addLine(to: CGPoint(x: fixedMainDiameter - topRightRadius - borderOffset, y: -borderOffset)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter + borderOffset, y: -borderOffset), tangent2End: CGPoint(x: fixedMainDiameter + borderOffset, y: topRightRadius + borderOffset), radius: topRightRadius + borderOffset * 2.0) + context.addLine(to: CGPoint(x: fixedMainDiameter + borderOffset, y: fixedMainDiameter - bottomRightRadius - borderOffset)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter + borderOffset, y: fixedMainDiameter + borderOffset), tangent2End: CGPoint(x: fixedMainDiameter - bottomRightRadius - borderOffset, y: fixedMainDiameter + borderOffset), radius: bottomRightRadius + borderOffset * 2.0) + context.addLine(to: CGPoint(x: bottomLeftRadius + borderOffset, y: fixedMainDiameter + borderOffset)) + context.addArc(tangent1End: CGPoint(x: -borderOffset, y: fixedMainDiameter + borderOffset), tangent2End: CGPoint(x: -borderOffset, y: fixedMainDiameter - bottomLeftRadius - borderOffset), radius: bottomLeftRadius + borderOffset * 2.0) + context.closePath() + context.strokePath() + + if drawTail { + let outlineBottomEllipse = bottomEllipse.insetBy(dx: -borderOffset, dy: -borderOffset) + let outlineInnerTopEllipse = topEllipse.insetBy(dx: borderOffset, dy: borderOffset) + let outlineTopEllipse = topEllipse.insetBy(dx: -borderOffset, dy: -borderOffset) + + context.setBlendMode(.copy) + context.setFillColor(UIColor.clear.cgColor) + + if maxCornerRadius >= minRadiusForFullTailCorner { + context.move(to: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.midY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.midX, y: bottomEllipse.maxY), control: CGPoint(x: bottomEllipse.minX, y: bottomEllipse.maxY)) + context.addQuadCurve(to: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.midY), control: CGPoint(x: bottomEllipse.maxX, y: bottomEllipse.maxY)) + context.fillPath() + } else { + context.fill(CGRect(origin: CGPoint(x: bottomEllipse.minX - 2.0, y: bottomEllipse.midY), size: CGSize(width: bottomEllipse.width + 2.0, height: bottomEllipse.height / 2.0))) + } + context.fill(CGRect(origin: CGPoint(x: fixedMainDiameter / 2.0, y: fixedMainDiameter / 2.0), size: CGSize(width: fixedMainDiameter / 2.0 + borderWidth, height: bottomEllipse.midY - fixedMainDiameter / 2.0))) + + context.setBlendMode(.normal) + context.move(to: CGPoint(x: fixedMainDiameter + borderOffset, y: fixedMainDiameter / 2.0)) + context.addLine(to: CGPoint(x: fixedMainDiameter + borderOffset, y: outlineBottomEllipse.midY)) + context.strokePath() + + let bubbleTailContext = DrawingContext(size: imageSize) + bubbleTailContext.withFlippedContext { context in + context.clear(CGRect(origin: CGPoint(), size: rawSize)) + context.translateBy(x: additionalInset + strokeInset, y: additionalInset + strokeInset) + + context.setStrokeColor(UIColor.black.cgColor) + context.setLineWidth(borderWidth) + + if maxCornerRadius >= minRadiusForFullTailCorner { + context.move(to: CGPoint(x: outlineBottomEllipse.minX, y: outlineBottomEllipse.midY)) + context.addQuadCurve(to: CGPoint(x: outlineBottomEllipse.midX, y: outlineBottomEllipse.maxY), control: CGPoint(x: outlineBottomEllipse.minX, y: outlineBottomEllipse.maxY)) + context.addQuadCurve(to: CGPoint(x: outlineBottomEllipse.maxX, y: outlineBottomEllipse.midY), control: CGPoint(x: outlineBottomEllipse.maxX, y: outlineBottomEllipse.maxY)) + } else { + context.move(to: CGPoint(x: outlineBottomEllipse.minX - 2.0, y: outlineBottomEllipse.maxY)) + context.addLine(to: CGPoint(x: outlineBottomEllipse.minX, y: outlineBottomEllipse.maxY)) + context.addLine(to: CGPoint(x: outlineBottomEllipse.maxX, y: outlineBottomEllipse.maxY)) + } + context.strokePath() + context.setFillColor(UIColor.clear.cgColor) + context.setBlendMode(.copy) + context.fillEllipse(in: outlineInnerTopEllipse) + + context.move(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: 0.0), tangent2End: CGPoint(x: topLeftRadius, y: 0.0), radius: topLeftRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter - topRightRadius, y: 0.0)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: 0.0), tangent2End: CGPoint(x: fixedMainDiameter, y: topRightRadius), radius: topRightRadius) + context.addLine(to: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter - bottomRightRadius)) + context.addArc(tangent1End: CGPoint(x: fixedMainDiameter, y: fixedMainDiameter), tangent2End: CGPoint(x: fixedMainDiameter - bottomRightRadius, y: fixedMainDiameter), radius: bottomRightRadius) + context.addLine(to: CGPoint(x: bottomLeftRadius, y: fixedMainDiameter)) + context.addArc(tangent1End: CGPoint(x: 0.0, y: fixedMainDiameter), tangent2End: CGPoint(x: 0.0, y: fixedMainDiameter - bottomLeftRadius), radius: bottomLeftRadius) + context.addLine(to: CGPoint(x: 0.0, y: topLeftRadius)) + context.fillPath() + + let bottomEllipseMask = generateImage(bottomEllipse.insetBy(dx: -1.0, dy: -1.0).size, contextGenerator: { size, context in + context.clear(CGRect(origin: CGPoint(), size: size)) + context.setFillColor(UIColor.black.cgColor) + if maxCornerRadius >= minRadiusForFullTailCorner { + context.fillEllipse(in: CGRect(origin: CGPoint(x: 1.0 - borderOffset, y: 1.0 - borderOffset), size: CGSize(width: outlineBottomEllipse.width, height: outlineBottomEllipse.height))) + } else { + context.fill(CGRect(origin: CGPoint(x: 1.0 - borderOffset, y: 1.0 - borderOffset), size: CGSize(width: outlineBottomEllipse.width, height: outlineBottomEllipse.height))) + } + context.clear(CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height / 2.0))) + })! + + context.clip(to: bottomEllipse.insetBy(dx: -1.0, dy: -1.0), mask: bottomEllipseMask.cgImage!) + context.strokeEllipse(in: outlineInnerTopEllipse) + context.resetClip() + } + + context.translateBy(x: -(additionalInset + strokeInset), y: -(additionalInset + strokeInset)) + context.draw(bubbleTailContext.generateImage()!.cgImage!, in: CGRect(origin: CGPoint(), size: rawSize)) + context.translateBy(x: additionalInset + strokeInset, y: additionalInset + strokeInset) + } + } + let outlineImage = outlineContext.generateImage()! + + let drawingContext = DrawingContext(size: imageSize) + drawingContext.withFlippedContext { context in var drawWithClearColor = false if knockout { @@ -48,94 +287,33 @@ public func messageBubbleImage(incoming: Bool, fillColor: UIColor, strokeColor: context.clear(CGRect(origin: CGPoint(), size: rawSize)) } - let additionalOffset: CGFloat - switch neighbors { - case .none, .bottom: - additionalOffset = 0.0 - case .both, .side, .top: - additionalOffset = 6.0 - } - - context.translateBy(x: rawSize.width / 2.0, y: rawSize.height / 2.0) - context.scaleBy(x: incoming ? 1.0 : -1.0, y: -1.0) - context.translateBy(x: -rawSize.width / 2.0, y: -rawSize.height / 2.0) - - context.translateBy(x: additionalOffset + 0.5, y: 0.5) - - let size = CGSize(width: rawSize.width - inset * 2.0, height: rawSize.height - inset * 2.0) - context.translateBy(x: inset, y: inset) - - var lineWidth: CGFloat = 1.0 - if drawWithClearColor { context.setBlendMode(.copy) context.setFillColor(UIColor.clear.cgColor) - context.setStrokeColor(UIColor.clear.cgColor) } else { + context.setBlendMode(.normal) context.setFillColor(fillColor.cgColor) - context.setLineWidth(lineWidth) - context.setStrokeColor(strokeColor.cgColor) } - if onlyOutline { - if knockout { - lineWidth = max(UIScreenPixel, 1.0 - 0.5) - } - context.setLineWidth(lineWidth) - context.setStrokeColor(strokeColor.cgColor) + context.saveGState() + + context.translateBy(x: rawSize.width / 2.0, y: rawSize.height / 2.0) + context.scaleBy(x: incoming ? -1.0 : 1.0, y: -1.0) + context.translateBy(x: -rawSize.width / 2.0, y: -rawSize.height / 2.0) + + if !onlyOutline { + context.clip(to: CGRect(origin: CGPoint(), size: rawSize), mask: formImage.cgImage!) + context.fill(CGRect(origin: CGPoint(), size: rawSize)) + } else { + context.setFillColor(strokeColor.cgColor) + context.clip(to: CGRect(origin: CGPoint(), size: rawSize), mask: outlineImage.cgImage!) + context.fill(CGRect(origin: CGPoint(), size: rawSize)) } - switch neighbors { - case .none: - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M6,17.5 C6,7.83289181 13.8350169,0 23.5,0 C33.1671082,0 41,7.83501688 41,17.5 C41,27.1671082 33.1649831,35 23.5,35 C19.2941198,35 15.4354328,33.5169337 12.4179496,31.0453367 C9.05531719,34.9894816 -2.41102995e-08,35 0,35 C5.972003,31.5499861 6,26.8616169 6,26.8616169 L6,17.5 L6,17.5 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M6,17.5 C6,7.83289181 13.8350169,0 23.5,0 C33.1671082,0 41,7.83501688 41,17.5 C41,27.1671082 33.1649831,35 23.5,35 C19.2941198,35 15.4354328,33.5169337 12.4179496,31.0453367 C9.05531719,34.9894816 -2.41102995e-08,35 0,35 C5.972003,31.5499861 6,26.8616169 6,26.8616169 L6,17.5 L6,17.5 ") - context.fillPath() - } - case .side: - if onlyOutline { - context.strokeEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: 35.0, height: 35.0))) - } else { - context.fillEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: 35.0, height: 35.0))) - } - case let .top(side): - if side { - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M17.5,0 L17.5,0 C27.1649831,-1.7754286e-15 35,7.83501688 35,17.5 L35,29 C35,32.3137085 32.3137085,35 29,35 L6,35 C2.6862915,35 4.05812251e-16,32.3137085 0,29 L0,17.5 C-1.18361906e-15,7.83501688 7.83501688,1.7754286e-15 17.5,0 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M17.5,0 L17.5,0 C27.1649831,-1.7754286e-15 35,7.83501688 35,17.5 L35,29 C35,32.3137085 32.3137085,35 29,35 L6,35 C2.6862915,35 4.05812251e-16,32.3137085 0,29 L0,17.5 C-1.18361906e-15,7.83501688 7.83501688,1.7754286e-15 17.5,0 ") - context.fillPath() - } - } else { - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M35,17.5 C35,7.83501688 27.1671082,0 17.5,0 L17.5,0 C7.83501688,0 0,7.83289181 0,17.5 L0,29.0031815 C0,32.3151329 2.6882755,35 5.99681848,35 L17.5,35 C27.1649831,35 35,27.1671082 35,17.5 L35,17.5 L35,17.5 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M35,17.5 C35,7.83501688 27.1671082,0 17.5,0 L17.5,0 C7.83501688,0 0,7.83289181 0,17.5 L0,29.0031815 C0,32.3151329 2.6882755,35 5.99681848,35 L17.5,35 C27.1649831,35 35,27.1671082 35,17.5 L35,17.5 L35,17.5 ") - context.fillPath() - } - } - case .bottom: - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M6,17.5 L6,5.99681848 C6,2.6882755 8.68486709,0 11.9968185,0 L23.5,0 C33.1671082,0 41,7.83501688 41,17.5 C41,27.1671082 33.1649831,35 23.5,35 C19.2941198,35 15.4354328,33.5169337 12.4179496,31.0453367 C9.05531719,34.9894816 -2.41103066e-08,35 0,35 C5.972003,31.5499861 6,26.8616169 6,26.8616169 L6,17.5 L6,17.5 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M6,17.5 L6,5.99681848 C6,2.6882755 8.68486709,0 11.9968185,0 L23.5,0 C33.1671082,0 41,7.83501688 41,17.5 C41,27.1671082 33.1649831,35 23.5,35 C19.2941198,35 15.4354328,33.5169337 12.4179496,31.0453367 C9.05531719,34.9894816 -2.41103066e-08,35 0,35 C5.972003,31.5499861 6,26.8616169 6,26.8616169 L6,17.5 L6,17.5 ") - context.fillPath() - } - case .both: - if onlyOutline { - let _ = try? drawSvgPath(context, path: "M35,17.5 C35,7.83501688 27.1671082,0 17.5,0 L5.99681848,0 C2.68486709,0 0,2.6882755 0,5.99681848 L0,29.0031815 C0,32.3151329 2.6882755,35 5.99681848,35 L17.5,35 C27.1649831,35 35,27.1671082 35,17.5 L35,17.5 L35,17.5 ") - context.strokePath() - } else { - let _ = try? drawSvgPath(context, path: "M35,17.5 C35,7.83501688 27.1671082,0 17.5,0 L5.99681848,0 C2.68486709,0 0,2.6882755 0,5.99681848 L0,29.0031815 C0,32.3151329 2.6882755,35 5.99681848,35 L17.5,35 C27.1649831,35 35,27.1671082 35,17.5 L35,17.5 L35,17.5 ") - context.fillPath() - } - } - })!.stretchableImage(withLeftCapWidth: incoming ? Int(inset + corner + diameter / 2.0 - 1.0) : Int(inset + diameter / 2.0), topCapHeight: Int(inset + diameter / 2.0)) + context.restoreGState() + } + + return drawingContext.generateImage()!.stretchableImage(withLeftCapWidth: incoming ? incomingStretchPoint.x : outgoingStretchPoint.x, topCapHeight: incoming ? incomingStretchPoint.y : outgoingStretchPoint.y) } public enum MessageBubbleActionButtonPosition { diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift index c8e271e5cd..f33079da79 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationData.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift @@ -48,12 +48,25 @@ public enum PresentationDateFormat { case dayFirst } +public struct PresentationChatBubbleCorners: Equatable, Hashable { + public var mainRadius: CGFloat + public var auxiliaryRadius: CGFloat + public var mergeBubbleCorners: Bool + + public init(mainRadius: CGFloat, auxiliaryRadius: CGFloat, mergeBubbleCorners: Bool) { + self.mainRadius = mainRadius + self.auxiliaryRadius = auxiliaryRadius + self.mergeBubbleCorners = mergeBubbleCorners + } +} + public final class PresentationData: Equatable { public let strings: PresentationStrings public let theme: PresentationTheme public let autoNightModeTriggered: Bool public let chatWallpaper: TelegramWallpaper public let chatFontSize: PresentationFontSize + public let chatBubbleCorners: PresentationChatBubbleCorners public let listsFontSize: PresentationFontSize public let dateTimeFormat: PresentationDateTimeFormat public let nameDisplayOrder: PresentationPersonNameOrder @@ -61,12 +74,13 @@ public final class PresentationData: Equatable { public let disableAnimations: Bool public let largeEmoji: Bool - public init(strings: PresentationStrings, theme: PresentationTheme, autoNightModeTriggered: Bool, chatWallpaper: TelegramWallpaper, chatFontSize: PresentationFontSize, listsFontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, nameSortOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool) { + public init(strings: PresentationStrings, theme: PresentationTheme, autoNightModeTriggered: Bool, chatWallpaper: TelegramWallpaper, chatFontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, listsFontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, nameSortOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool) { self.strings = strings self.theme = theme self.autoNightModeTriggered = autoNightModeTriggered self.chatWallpaper = chatWallpaper self.chatFontSize = chatFontSize + self.chatBubbleCorners = chatBubbleCorners self.listsFontSize = listsFontSize self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder @@ -76,7 +90,7 @@ public final class PresentationData: Equatable { } public static func ==(lhs: PresentationData, rhs: PresentationData) -> Bool { - return lhs.strings === rhs.strings && lhs.theme === rhs.theme && lhs.autoNightModeTriggered == rhs.autoNightModeTriggered && lhs.chatWallpaper == rhs.chatWallpaper && lhs.chatFontSize == rhs.chatFontSize && lhs.listsFontSize == rhs.listsFontSize && lhs.dateTimeFormat == rhs.dateTimeFormat && lhs.disableAnimations == rhs.disableAnimations && lhs.largeEmoji == rhs.largeEmoji + return lhs.strings === rhs.strings && lhs.theme === rhs.theme && lhs.autoNightModeTriggered == rhs.autoNightModeTriggered && lhs.chatWallpaper == rhs.chatWallpaper && lhs.chatFontSize == rhs.chatFontSize && lhs.chatBubbleCorners == rhs.chatBubbleCorners && lhs.listsFontSize == rhs.listsFontSize && lhs.dateTimeFormat == rhs.dateTimeFormat && lhs.disableAnimations == rhs.disableAnimations && lhs.largeEmoji == rhs.largeEmoji } } @@ -268,7 +282,9 @@ public func currentPresentationDataAndSettings(accountManager: AccountManager, s let (chatFontSize, listsFontSize) = resolveFontSize(settings: themeSettings) - return InitialPresentationDataAndSettings(presentationData: PresentationData(strings: stringsValue, theme: theme, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji), automaticMediaDownloadSettings: automaticMediaDownloadSettings, autodownloadSettings: autodownloadSettings, callListSettings: callListSettings, inAppNotificationSettings: inAppNotificationSettings, mediaInputSettings: mediaInputSettings, experimentalUISettings: experimentalUISettings) + let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners) + + return InitialPresentationDataAndSettings(presentationData: PresentationData(strings: stringsValue, theme: theme, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji), automaticMediaDownloadSettings: automaticMediaDownloadSettings, autodownloadSettings: autodownloadSettings, callListSettings: callListSettings, inAppNotificationSettings: inAppNotificationSettings, mediaInputSettings: mediaInputSettings, experimentalUISettings: experimentalUISettings) } } @@ -601,7 +617,9 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI let (chatFontSize, listsFontSize) = resolveFontSize(settings: themeSettings) - return PresentationData(strings: stringsValue, theme: themeValue, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji) + let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners) + + return PresentationData(strings: stringsValue, theme: themeValue, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji) } } else { return .complete() @@ -634,15 +652,21 @@ public func defaultPresentationData() -> PresentationData { let (chatFontSize, listsFontSize) = resolveFontSize(settings: themeSettings) - return PresentationData(strings: defaultPresentationStrings, theme: defaultPresentationTheme, autoNightModeTriggered: false, chatWallpaper: .builtin(WallpaperSettings()), chatFontSize: chatFontSize, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji) + let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners) + + return PresentationData(strings: defaultPresentationStrings, theme: defaultPresentationTheme, autoNightModeTriggered: false, chatWallpaper: .builtin(WallpaperSettings()), chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji) } public extension PresentationData { func withFontSizes(chatFontSize: PresentationFontSize, listsFontSize: PresentationFontSize) -> PresentationData { - return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: chatFontSize, listsFontSize: listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) + return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: self.chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) + } + + func withChatBubbleCorners(_ chatBubbleCorners: PresentationChatBubbleCorners) -> PresentationData { + return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) } func withStrings(_ strings: PresentationStrings) -> PresentationData { - return PresentationData(strings: strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) + return PresentationData(strings: strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji) } } diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index d4e4d3501b..221c9c51a5 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -2403,2916 +2403,2920 @@ public final class PresentationStrings: Equatable { public var ScheduledMessages_SendNow: String { return self._s[2051]! } public var Checkout_NewCard_PaymentCard: String { return self._s[2053]! } public var Login_InfoHelp: String { return self._s[2054]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2055]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2056]! } + public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[2055]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[2056]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[2057]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2057]!, self._r[2057]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2058]!, self._r[2058]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[2060]! } - public var CreatePoll_Title: String { return self._s[2061]! } - public var MessagePoll_QuizNoUsers: String { return self._s[2062]! } - public var Conversation_ViewTheme: String { return self._s[2063]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2064]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2065]! } - public var TwoFactorSetup_Intro_Text: String { return self._s[2066]! } - public var UserInfo_GroupsInCommon: String { return self._s[2067]! } - public var TelegramWallet_Intro_TermsUrl: String { return self._s[2068]! } - public var Call_AudioRouteHide: String { return self._s[2069]! } + public var SocksProxySetup_AddProxy: String { return self._s[2061]! } + public var CreatePoll_Title: String { return self._s[2062]! } + public var MessagePoll_QuizNoUsers: String { return self._s[2063]! } + public var Conversation_ViewTheme: String { return self._s[2064]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2065]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[2066]! } + public var TwoFactorSetup_Intro_Text: String { return self._s[2067]! } + public var UserInfo_GroupsInCommon: String { return self._s[2068]! } + public var TelegramWallet_Intro_TermsUrl: String { return self._s[2069]! } + public var Call_AudioRouteHide: String { return self._s[2070]! } public func Wallet_Info_TransactionDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2071]!, self._r[2071]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2072]!, self._r[2072]!, [_1, _2]) } - public var ContactInfo_PhoneLabelMobile: String { return self._s[2072]! } - public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2073]! } - public var CreatePoll_QuizOptionsHeader: String { return self._s[2074]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[2073]! } + public var IntentsSettings_SuggestedChatsInfo: String { return self._s[2074]! } + public var CreatePoll_QuizOptionsHeader: String { return self._s[2075]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2075]!, self._r[2075]!, [_0]) + return formatWithArgumentRanges(self._s[2076]!, self._r[2076]!, [_0]) } - public var TextFormat_Bold: String { return self._s[2076]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[2077]! } - public var StickerPackActionInfo_AddedTitle: String { return self._s[2078]! } - public var Notifications_Title: String { return self._s[2079]! } - public var Group_Username_InvalidTooShort: String { return self._s[2080]! } - public var Channel_ErrorAddTooMuch: String { return self._s[2081]! } + public var TextFormat_Bold: String { return self._s[2077]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[2078]! } + public var StickerPackActionInfo_AddedTitle: String { return self._s[2079]! } + public var Notifications_Title: String { return self._s[2080]! } + public var Group_Username_InvalidTooShort: String { return self._s[2081]! } + public var Channel_ErrorAddTooMuch: String { return self._s[2082]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2082]!, self._r[2082]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2083]!, self._r[2083]!, ["\(_0)"]) } - public var VoiceOver_DiscardPreparedContent: String { return self._s[2084]! } - public var Stickers_SuggestAdded: String { return self._s[2085]! } - public var Login_CountryCode: String { return self._s[2086]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[2087]! } - public var Map_GetDirections: String { return self._s[2088]! } - public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2089]! } - public var Login_PhoneFloodError: String { return self._s[2090]! } + public var VoiceOver_DiscardPreparedContent: String { return self._s[2085]! } + public var Stickers_SuggestAdded: String { return self._s[2086]! } + public var Login_CountryCode: String { return self._s[2087]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[2088]! } + public var Map_GetDirections: String { return self._s[2089]! } + public var Wallet_Receive_ShareInvoiceUrl: String { return self._s[2090]! } + public var Login_PhoneFloodError: String { return self._s[2091]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2091]!, self._r[2091]!, [_0]) + return formatWithArgumentRanges(self._s[2092]!, self._r[2092]!, [_0]) } public func Wallet_Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2092]!, self._r[2092]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2093]!, self._r[2093]!, [_1, _2, _3]) } - public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2093]! } - public var Settings_SetUsername: String { return self._s[2095]! } - public var Group_Location_ChangeLocation: String { return self._s[2096]! } - public var Notification_GroupInviterSelf: String { return self._s[2097]! } - public var InstantPage_TapToOpenLink: String { return self._s[2098]! } + public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2094]! } + public var Settings_SetUsername: String { return self._s[2096]! } + public var Group_Location_ChangeLocation: String { return self._s[2097]! } + public var Notification_GroupInviterSelf: String { return self._s[2098]! } + public var InstantPage_TapToOpenLink: String { return self._s[2099]! } public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2099]!, self._r[2099]!, [_0]) + return formatWithArgumentRanges(self._s[2100]!, self._r[2100]!, [_0]) } - public var Watch_Suggestion_TalkLater: String { return self._s[2100]! } - public var SecretChat_Title: String { return self._s[2101]! } - public var Group_UpgradeNoticeText1: String { return self._s[2102]! } - public var AuthSessions_Title: String { return self._s[2103]! } + public var Watch_Suggestion_TalkLater: String { return self._s[2101]! } + public var SecretChat_Title: String { return self._s[2102]! } + public var Group_UpgradeNoticeText1: String { return self._s[2103]! } + public var AuthSessions_Title: String { return self._s[2104]! } public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2104]!, self._r[2104]!, [_0]) + return formatWithArgumentRanges(self._s[2105]!, self._r[2105]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[2105]! } - public var Channel_About_Title: String { return self._s[2106]! } - public var Theme_ThemeChanged: String { return self._s[2107]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[2108]! } + public var PhotoEditor_CropAuto: String { return self._s[2106]! } + public var Channel_About_Title: String { return self._s[2107]! } + public var Theme_ThemeChanged: String { return self._s[2108]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[2109]! } public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2110]!, self._r[2110]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2111]!, self._r[2111]!, ["\(_0)"]) } - public var VoiceOver_MessageContextReport: String { return self._s[2111]! } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2113]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[2114]! } + public var VoiceOver_MessageContextReport: String { return self._s[2112]! } + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[2114]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[2115]! } public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2115]!, self._r[2115]!, [_1]) + return formatWithArgumentRanges(self._s[2116]!, self._r[2116]!, [_1]) } public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2117]!, self._r[2117]!, [_0]) - } - public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2118]!, self._r[2118]!, [_0]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[2119]! } - public var Presence_online: String { return self._s[2122]! } - public var PasscodeSettings_Title: String { return self._s[2123]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2124]! } - public var Web_OpenExternal: String { return self._s[2125]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[2127]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2128]! } - public var LocalGroup_Title: String { return self._s[2129]! } + public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2119]!, self._r[2119]!, [_0]) + } + public var Privacy_PaymentsClearInfoHelp: String { return self._s[2120]! } + public var Presence_online: String { return self._s[2123]! } + public var PasscodeSettings_Title: String { return self._s[2124]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[2125]! } + public var Web_OpenExternal: String { return self._s[2126]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[2128]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[2129]! } + public var LocalGroup_Title: String { return self._s[2130]! } public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2130]!, self._r[2130]!, [_0]) + return formatWithArgumentRanges(self._s[2131]!, self._r[2131]!, [_0]) } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2131]! } - public var Conversation_StopQuizConfirmation: String { return self._s[2132]! } - public var Map_YouAreHere: String { return self._s[2133]! } + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[2132]! } + public var Conversation_StopQuizConfirmation: String { return self._s[2133]! } + public var Map_YouAreHere: String { return self._s[2134]! } public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2134]!, self._r[2134]!, [_0]) - } - public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2135]!, self._r[2135]!, [_0]) } - public var Theme_Context_ChangeColors: String { return self._s[2136]! } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2137]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2138]! } - public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2139]!, self._r[2139]!, [_0]) + public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2136]!, self._r[2136]!, [_0]) } - public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Theme_Context_ChangeColors: String { return self._s[2137]! } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[2138]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2139]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2140]!, self._r[2140]!, [_0]) } - public var SocksProxySetup_Username: String { return self._s[2141]! } - public var Bot_Start: String { return self._s[2142]! } - public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2143]!, self._r[2143]!, [_0]) + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2141]!, self._r[2141]!, [_0]) } - public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + public var SocksProxySetup_Username: String { return self._s[2142]! } + public var Bot_Start: String { return self._s[2143]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2144]!, self._r[2144]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[2145]! } - public var AccentColor_Title: String { return self._s[2147]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2148]! } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2145]!, self._r[2145]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[2146]! } + public var AccentColor_Title: String { return self._s[2148]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[2149]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2149]!, self._r[2149]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2150]!, self._r[2150]!, [_1, _2]) } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2150]!, self._r[2150]!, [_0]) + return formatWithArgumentRanges(self._s[2151]!, self._r[2151]!, [_0]) } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2151]!, self._r[2151]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2152]!, self._r[2152]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[2152]! } - public var Login_InfoAvatarPhoto: String { return self._s[2153]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2154]! } - public var Tour_Title4: String { return self._s[2155]! } - public var Passport_Identity_Translation: String { return self._s[2156]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2157]! } - public var Login_TermsOfServiceLabel: String { return self._s[2159]! } - public var Passport_Language_it: String { return self._s[2160]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2161]! } - public var Passport_Identity_SelfieHelp: String { return self._s[2162]! } - public var Conversation_ClearAll: String { return self._s[2164]! } - public var Wallet_Send_UninitializedText: String { return self._s[2166]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[2167]! } - public var TwoStepAuth_FloodError: String { return self._s[2168]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[2153]! } + public var Login_InfoAvatarPhoto: String { return self._s[2154]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2155]! } + public var Tour_Title4: String { return self._s[2156]! } + public var Passport_Identity_Translation: String { return self._s[2157]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[2158]! } + public var Login_TermsOfServiceLabel: String { return self._s[2160]! } + public var Passport_Language_it: String { return self._s[2161]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[2162]! } + public var Passport_Identity_SelfieHelp: String { return self._s[2163]! } + public var Conversation_ClearAll: String { return self._s[2165]! } + public var Wallet_Send_UninitializedText: String { return self._s[2167]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[2168]! } + public var TwoStepAuth_FloodError: String { return self._s[2169]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2169]!, self._r[2169]!, [_1]) + return formatWithArgumentRanges(self._s[2170]!, self._r[2170]!, [_1]) } - public var Paint_Delete: String { return self._s[2170]! } + public var Paint_Delete: String { return self._s[2171]! } public func Wallet_Sent_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2171]!, self._r[2171]!, [_0]) + return formatWithArgumentRanges(self._s[2172]!, self._r[2172]!, [_0]) } - public var Privacy_AddNewPeer: String { return self._s[2172]! } + public var Privacy_AddNewPeer: String { return self._s[2173]! } public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2173]!, self._r[2173]!, [_1]) + return formatWithArgumentRanges(self._s[2174]!, self._r[2174]!, [_1]) } - public var LogoutOptions_SetPasscodeText: String { return self._s[2174]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[2175]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2175]!, self._r[2175]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2176]!, self._r[2176]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[2176]! } + public var Message_PinnedAudioMessage: String { return self._s[2177]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2177]!, self._r[2177]!, [_0]) + return formatWithArgumentRanges(self._s[2178]!, self._r[2178]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[2178]! } - public var Notifications_GroupNotificationsSound: String { return self._s[2179]! } - public var Wallet_Month_GenNovember: String { return self._s[2180]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[2181]! } - public var Conversation_MessageEditedLabel: String { return self._s[2182]! } + public var Notification_Mute1hMin: String { return self._s[2179]! } + public var Notifications_GroupNotificationsSound: String { return self._s[2180]! } + public var Wallet_Month_GenNovember: String { return self._s[2181]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[2182]! } + public var Conversation_MessageEditedLabel: String { return self._s[2183]! } public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2183]!, self._r[2183]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2184]!, self._r[2184]!, [_0, _1]) } - public var Notification_Exceptions_AlwaysOff: String { return self._s[2184]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2185]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[2185]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[2186]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2186]!, self._r[2186]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[2187]!, self._r[2187]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[2187]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[2188]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2188]!, self._r[2188]!, [_1]) + return formatWithArgumentRanges(self._s[2189]!, self._r[2189]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[2189]! } - public var Month_GenOctober: String { return self._s[2190]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2191]! } - public var EnterPasscode_EnterPasscode: String { return self._s[2192]! } - public var MediaPicker_TimerTooltip: String { return self._s[2194]! } - public var SharedMedia_TitleAll: String { return self._s[2195]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2198]! } - public var Conversation_RestrictedMedia: String { return self._s[2199]! } - public var AccessDenied_PhotosRestricted: String { return self._s[2200]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[2202]! } - public var ChangePhoneNumberCode_Called: String { return self._s[2203]! } + public var AccessDenied_LocationTracking: String { return self._s[2190]! } + public var Month_GenOctober: String { return self._s[2191]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[2192]! } + public var EnterPasscode_EnterPasscode: String { return self._s[2193]! } + public var MediaPicker_TimerTooltip: String { return self._s[2195]! } + public var SharedMedia_TitleAll: String { return self._s[2196]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[2199]! } + public var Conversation_RestrictedMedia: String { return self._s[2200]! } + public var AccessDenied_PhotosRestricted: String { return self._s[2201]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[2203]! } + public var ChangePhoneNumberCode_Called: String { return self._s[2204]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2204]!, self._r[2204]!, [_0]) + return formatWithArgumentRanges(self._s[2205]!, self._r[2205]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[2207]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[2209]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2210]! } + public var Conversation_SavedMessages: String { return self._s[2208]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[2210]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[2211]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2212]!, self._r[2212]!, [_0]) + return formatWithArgumentRanges(self._s[2213]!, self._r[2213]!, [_0]) } - public var VoiceOver_Chat_YourMessage: String { return self._s[2213]! } + public var VoiceOver_Chat_YourMessage: String { return self._s[2214]! } public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2214]!, self._r[2214]!, [_0]) + return formatWithArgumentRanges(self._s[2215]!, self._r[2215]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[2215]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2216]! } + public var ReportPeer_AlertSuccess: String { return self._s[2216]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2217]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2217]!, self._r[2217]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[2218]! } - public var PhotoEditor_FadeTool: String { return self._s[2219]! } - public var Privacy_ContactsReset: String { return self._s[2220]! } + public var Checkout_PasswordEntry_Title: String { return self._s[2219]! } + public var PhotoEditor_FadeTool: String { return self._s[2220]! } + public var Privacy_ContactsReset: String { return self._s[2221]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2222]!, self._r[2222]!, [_0]) + return formatWithArgumentRanges(self._s[2223]!, self._r[2223]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[2223]! } - public var ChatList_Mute: String { return self._s[2224]! } + public var Message_PinnedVideoMessage: String { return self._s[2224]! } + public var ChatList_Mute: String { return self._s[2225]! } public func Wallet_Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2225]!, self._r[2225]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2226]!, self._r[2226]!, [_1, _2, _3]) } - public var Permissions_CellularDataText_v0: String { return self._s[2226]! } - public var Conversation_PinnedQuiz: String { return self._s[2228]! } - public var ShareMenu_SelectChats: String { return self._s[2230]! } - public var ChatList_Context_Unarchive: String { return self._s[2231]! } - public var MusicPlayer_VoiceNote: String { return self._s[2232]! } - public var Conversation_RestrictedText: String { return self._s[2233]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2234]! } - public var Wallet_Month_GenApril: String { return self._s[2235]! } - public var Wallet_Month_ShortMarch: String { return self._s[2236]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[2237]! } - public var Cache_Videos: String { return self._s[2238]! } - public var PrivacySettings_PhoneNumber: String { return self._s[2239]! } - public var Wallet_Month_GenFebruary: String { return self._s[2240]! } - public var FeatureDisabled_Oops: String { return self._s[2242]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[2243]! } + public var Permissions_CellularDataText_v0: String { return self._s[2227]! } + public var Conversation_PinnedQuiz: String { return self._s[2229]! } + public var ShareMenu_SelectChats: String { return self._s[2231]! } + public var ChatList_Context_Unarchive: String { return self._s[2232]! } + public var MusicPlayer_VoiceNote: String { return self._s[2233]! } + public var Conversation_RestrictedText: String { return self._s[2234]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[2235]! } + public var Wallet_Month_GenApril: String { return self._s[2236]! } + public var Wallet_Month_ShortMarch: String { return self._s[2237]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[2238]! } + public var Cache_Videos: String { return self._s[2239]! } + public var PrivacySettings_PhoneNumber: String { return self._s[2240]! } + public var Wallet_Month_GenFebruary: String { return self._s[2241]! } + public var FeatureDisabled_Oops: String { return self._s[2243]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[2244]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2244]!, self._r[2244]!, [_0]) + return formatWithArgumentRanges(self._s[2245]!, self._r[2245]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[2245]! } - public var GroupPermission_NoSendPolls: String { return self._s[2246]! } - public var Wallet_Qr_ScanCode: String { return self._s[2247]! } - public var Message_VideoExpired: String { return self._s[2249]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[2250]! } - public var Notifications_Badge: String { return self._s[2251]! } - public var Wallet_Receive_AddressCopied: String { return self._s[2252]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[2253]! } - public var Username_InvalidTooShort: String { return self._s[2254]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2255]! } - public var Channel_AdminLog_PinMessages: String { return self._s[2256]! } - public var ArchivedChats_IntroTitle3: String { return self._s[2257]! } + public var Stickers_GroupStickersHelp: String { return self._s[2246]! } + public var GroupPermission_NoSendPolls: String { return self._s[2247]! } + public var Wallet_Qr_ScanCode: String { return self._s[2248]! } + public var Message_VideoExpired: String { return self._s[2250]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[2251]! } + public var Notifications_Badge: String { return self._s[2252]! } + public var Wallet_Receive_AddressCopied: String { return self._s[2253]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[2254]! } + public var Username_InvalidTooShort: String { return self._s[2255]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[2256]! } + public var Channel_AdminLog_PinMessages: String { return self._s[2257]! } + public var ArchivedChats_IntroTitle3: String { return self._s[2258]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2258]!, self._r[2258]!, [_1]) + return formatWithArgumentRanges(self._s[2259]!, self._r[2259]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[2259]! } - public var Conversation_DefaultRestrictedText: String { return self._s[2260]! } - public var SharedMedia_CategoryDocs: String { return self._s[2263]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[2260]! } + public var Conversation_DefaultRestrictedText: String { return self._s[2261]! } + public var SharedMedia_CategoryDocs: String { return self._s[2264]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2264]!, self._r[2264]!, [_1]) + return formatWithArgumentRanges(self._s[2265]!, self._r[2265]!, [_1]) } - public var Wallet_Send_UninitializedTitle: String { return self._s[2265]! } - public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2266]! } - public var Privacy_Forwards_NeverLink: String { return self._s[2268]! } + public var Wallet_Send_UninitializedTitle: String { return self._s[2266]! } + public var StickerPackActionInfo_ArchivedTitle: String { return self._s[2267]! } + public var Privacy_Forwards_NeverLink: String { return self._s[2269]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2269]!, self._r[2269]!, [_1]) + return formatWithArgumentRanges(self._s[2270]!, self._r[2270]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2270]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2271]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2271]!, self._r[2271]!, [_0]) + return formatWithArgumentRanges(self._s[2272]!, self._r[2272]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[2272]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2273]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[2274]! } - public var Channel_UpdatePhotoItem: String { return self._s[2275]! } - public var GroupInfo_LeftStatus: String { return self._s[2276]! } - public var Watch_MessageView_Forward: String { return self._s[2278]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[2279]! } - public var Cache_ClearEmpty: String { return self._s[2281]! } - public var Localization_LanguageName: String { return self._s[2282]! } - public var Wallet_AccessDenied_Title: String { return self._s[2283]! } - public var WebSearch_GIFs: String { return self._s[2284]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2285]! } - public var Wallet_AccessDenied_Settings: String { return self._s[2286]! } - public var Username_InvalidStartsWithNumber: String { return self._s[2287]! } - public var Common_Back: String { return self._s[2288]! } - public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2289]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2290]! } - public var Wallet_Send_Send: String { return self._s[2291]! } + public var ChatSettings_PrivateChats: String { return self._s[2273]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[2274]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[2275]! } + public var Channel_UpdatePhotoItem: String { return self._s[2276]! } + public var GroupInfo_LeftStatus: String { return self._s[2277]! } + public var Watch_MessageView_Forward: String { return self._s[2279]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[2280]! } + public var Cache_ClearEmpty: String { return self._s[2282]! } + public var Localization_LanguageName: String { return self._s[2283]! } + public var Wallet_AccessDenied_Title: String { return self._s[2284]! } + public var WebSearch_GIFs: String { return self._s[2285]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[2286]! } + public var Wallet_AccessDenied_Settings: String { return self._s[2287]! } + public var Username_InvalidStartsWithNumber: String { return self._s[2288]! } + public var Common_Back: String { return self._s[2289]! } + public var GroupInfo_Permissions_EditingDisabled: String { return self._s[2290]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[2291]! } + public var Wallet_Send_Send: String { return self._s[2292]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2293]!, self._r[2293]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2294]!, self._r[2294]!, [_1, _2]) } - public var Wallet_Info_RefreshErrorTitle: String { return self._s[2294]! } - public var Wallet_Month_GenJune: String { return self._s[2295]! } - public var Passport_Email_Help: String { return self._s[2296]! } - public var Watch_Conversation_Reply: String { return self._s[2298]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[2301]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2302]! } - public var Channel_BanUser_Unban: String { return self._s[2304]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2305]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[2306]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2308]! } - public var Wallet_Send_AddressHeader: String { return self._s[2309]! } - public var Passport_Identity_Name: String { return self._s[2310]! } + public var Wallet_Info_RefreshErrorTitle: String { return self._s[2295]! } + public var Wallet_Month_GenJune: String { return self._s[2296]! } + public var Passport_Email_Help: String { return self._s[2297]! } + public var Watch_Conversation_Reply: String { return self._s[2299]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[2302]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2303]! } + public var Channel_BanUser_Unban: String { return self._s[2305]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[2306]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[2307]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[2309]! } + public var Wallet_Send_AddressHeader: String { return self._s[2310]! } + public var Passport_Identity_Name: String { return self._s[2311]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2311]!, self._r[2311]!, [_0]) + return formatWithArgumentRanges(self._s[2312]!, self._r[2312]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[2312]! } - public var Conversation_BlockUser: String { return self._s[2313]! } - public var Month_GenJanuary: String { return self._s[2314]! } - public var ChatSettings_TextSize: String { return self._s[2315]! } - public var Notification_PassportValuePhone: String { return self._s[2316]! } - public var MediaPlayer_UnknownArtist: String { return self._s[2317]! } - public var Passport_Language_ne: String { return self._s[2318]! } - public var Notification_CallBack: String { return self._s[2319]! } - public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2320]! } - public var TwoStepAuth_EmailHelp: String { return self._s[2321]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[2313]! } + public var Conversation_BlockUser: String { return self._s[2314]! } + public var Month_GenJanuary: String { return self._s[2315]! } + public var ChatSettings_TextSize: String { return self._s[2316]! } + public var Notification_PassportValuePhone: String { return self._s[2317]! } + public var MediaPlayer_UnknownArtist: String { return self._s[2318]! } + public var Passport_Language_ne: String { return self._s[2319]! } + public var Notification_CallBack: String { return self._s[2320]! } + public var Wallet_SecureStorageReset_BiometryTouchId: String { return self._s[2321]! } + public var TwoStepAuth_EmailHelp: String { return self._s[2322]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2322]!, self._r[2322]!, [_0]) + return formatWithArgumentRanges(self._s[2323]!, self._r[2323]!, [_0]) } - public var Channel_Info_Management: String { return self._s[2323]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[2324]! } - public var Stickers_FrequentlyUsed: String { return self._s[2325]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[2326]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2328]! } + public var Channel_Info_Management: String { return self._s[2324]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[2325]! } + public var Stickers_FrequentlyUsed: String { return self._s[2326]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[2327]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[2329]! } public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2329]!, self._r[2329]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2330]!, self._r[2330]!, [_1, "\(_2)"]) } - public var TwoFactorSetup_Password_Title: String { return self._s[2330]! } - public var Passport_Address_EditResidentialAddress: String { return self._s[2331]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[2332]! } - public var CreatePoll_TextHeader: String { return self._s[2333]! } + public var TwoFactorSetup_Password_Title: String { return self._s[2331]! } + public var Passport_Address_EditResidentialAddress: String { return self._s[2332]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[2333]! } + public var CreatePoll_TextHeader: String { return self._s[2334]! } public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2334]!, self._r[2334]!, [_0]) + return formatWithArgumentRanges(self._s[2335]!, self._r[2335]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[2335]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2336]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[2338]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[2339]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[2340]! } + public var PhotoEditor_QualityMedium: String { return self._s[2336]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2337]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[2339]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[2340]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[2341]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2341]!, self._r[2341]!, [_0]) + return formatWithArgumentRanges(self._s[2342]!, self._r[2342]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2342]!, self._r[2342]!, [_1]) + return formatWithArgumentRanges(self._s[2343]!, self._r[2343]!, [_1]) } - public var LogoutOptions_LogOutWalletInfo: String { return self._s[2343]! } - public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2344]! } - public var Conversation_LinkDialogOpen: String { return self._s[2346]! } - public var TwoFactorSetup_Hint_Title: String { return self._s[2347]! } - public var VoiceOver_Chat_PollNoVotes: String { return self._s[2348]! } - public var Settings_Username: String { return self._s[2350]! } - public var Conversation_Block: String { return self._s[2352]! } - public var Wallpaper_Wallpaper: String { return self._s[2353]! } - public var SocksProxySetup_UseProxy: String { return self._s[2355]! } - public var Wallet_Send_Confirmation: String { return self._s[2356]! } - public var EditTheme_UploadEditedTheme: String { return self._s[2357]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[2358]! } - public var MessageTimer_Forever: String { return self._s[2359]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[2360]! } - public var PhotoEditor_DiscardChanges: String { return self._s[2361]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2362]! } - public var Passport_Language_da: String { return self._s[2363]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[2364]! } + public var LogoutOptions_LogOutWalletInfo: String { return self._s[2344]! } + public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[2345]! } + public var Conversation_LinkDialogOpen: String { return self._s[2347]! } + public var TwoFactorSetup_Hint_Title: String { return self._s[2348]! } + public var VoiceOver_Chat_PollNoVotes: String { return self._s[2349]! } + public var Settings_Username: String { return self._s[2351]! } + public var Conversation_Block: String { return self._s[2353]! } + public var Wallpaper_Wallpaper: String { return self._s[2354]! } + public var SocksProxySetup_UseProxy: String { return self._s[2356]! } + public var Wallet_Send_Confirmation: String { return self._s[2357]! } + public var EditTheme_UploadEditedTheme: String { return self._s[2358]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[2359]! } + public var MessageTimer_Forever: String { return self._s[2360]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[2361]! } + public var PhotoEditor_DiscardChanges: String { return self._s[2362]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[2363]! } + public var Passport_Language_da: String { return self._s[2364]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[2365]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2365]!, self._r[2365]!, [_0]) + return formatWithArgumentRanges(self._s[2366]!, self._r[2366]!, [_0]) } - public var Passport_Address_EditPassportRegistration: String { return self._s[2366]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[2367]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2368]!, self._r[2368]!, [_0]) + return formatWithArgumentRanges(self._s[2369]!, self._r[2369]!, [_0]) } - public var Settings_AddDevice: String { return self._s[2369]! } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2371]! } - public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2372]! } - public var Conversation_SearchByName_Prefix: String { return self._s[2373]! } - public var Conversation_PinnedPoll: String { return self._s[2374]! } - public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2375]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2376]! } - public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2377]! } + public var Settings_AddDevice: String { return self._s[2370]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[2372]! } + public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[2373]! } + public var Conversation_SearchByName_Prefix: String { return self._s[2374]! } + public var Conversation_PinnedPoll: String { return self._s[2375]! } + public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[2376]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2377]! } + public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[2378]! } public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2378]!, self._r[2378]!, [_1]) + return formatWithArgumentRanges(self._s[2379]!, self._r[2379]!, [_1]) } - public var WallpaperSearch_ColorPurple: String { return self._s[2379]! } - public var Cache_ByPeerHeader: String { return self._s[2380]! } + public var WallpaperSearch_ColorPurple: String { return self._s[2380]! } + public var Cache_ByPeerHeader: String { return self._s[2381]! } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2381]!, self._r[2381]!, [_0]) + return formatWithArgumentRanges(self._s[2382]!, self._r[2382]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[2382]! } - public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2385]! } - public var Wallet_Completed_Title: String { return self._s[2386]! } - public var Notification_PinnedMessage: String { return self._s[2387]! } - public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2388]! } - public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2390]! } - public var Contacts_SortBy: String { return self._s[2391]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2383]! } + public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[2386]! } + public var Wallet_Completed_Title: String { return self._s[2387]! } + public var Notification_PinnedMessage: String { return self._s[2388]! } + public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[2389]! } + public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[2391]! } + public var Contacts_SortBy: String { return self._s[2392]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2392]!, self._r[2392]!, [_1]) + return formatWithArgumentRanges(self._s[2393]!, self._r[2393]!, [_1]) } - public var Appearance_ColorThemeNight: String { return self._s[2394]! } + public var Appearance_ColorThemeNight: String { return self._s[2395]! } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2395]!, self._r[2395]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2396]!, self._r[2396]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[2396]! } - public var Watch_UserInfo_Service: String { return self._s[2397]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2399]! } - public var Conversation_Unpin: String { return self._s[2401]! } - public var CancelResetAccount_Title: String { return self._s[2402]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2403]! } + public var Call_EncryptionKey_Title: String { return self._s[2397]! } + public var Watch_UserInfo_Service: String { return self._s[2398]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2400]! } + public var Conversation_Unpin: String { return self._s[2402]! } + public var CancelResetAccount_Title: String { return self._s[2403]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2404]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2405]!, self._r[2405]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2406]!, self._r[2406]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2406]! } - public var CallSettings_Title: String { return self._s[2407]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2408]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2410]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2411]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2407]! } + public var Appearance_BubbleCorners_Title: String { return self._s[2408]! } + public var CallSettings_Title: String { return self._s[2409]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2410]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2412]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2413]! } public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2412]!, self._r[2412]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2414]!, self._r[2414]!, [_1, _2]) } - public var Passport_Identity_DocumentDetails: String { return self._s[2413]! } - public var LoginPassword_PasswordHelp: String { return self._s[2414]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2415]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2416]! } - public var ChatContextMenu_TextSelectionTip: String { return self._s[2417]! } - public var Checkout_TotalPaidAmount: String { return self._s[2418]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2415]! } + public var LoginPassword_PasswordHelp: String { return self._s[2416]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2417]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2418]! } + public var ChatContextMenu_TextSelectionTip: String { return self._s[2419]! } + public var Checkout_TotalPaidAmount: String { return self._s[2420]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2419]!, self._r[2419]!, [_0]) + return formatWithArgumentRanges(self._s[2421]!, self._r[2421]!, [_0]) } - public var PasscodeSettings_ChangePasscode: String { return self._s[2420]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2422]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2423]! } + public var PasscodeSettings_ChangePasscode: String { return self._s[2422]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2424]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2425]! } public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2424]!, self._r[2424]!, [_1]) + return formatWithArgumentRanges(self._s[2426]!, self._r[2426]!, [_1]) } - public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2425]! } - public var Contacts_InviteFriends: String { return self._s[2427]! } - public var Map_ChooseLocationTitle: String { return self._s[2428]! } - public var Conversation_StopPoll: String { return self._s[2430]! } + public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[2427]! } + public var Contacts_InviteFriends: String { return self._s[2429]! } + public var Map_ChooseLocationTitle: String { return self._s[2430]! } + public var Conversation_StopPoll: String { return self._s[2432]! } public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2431]!, self._r[2431]!, [_0]) + return formatWithArgumentRanges(self._s[2433]!, self._r[2433]!, [_0]) } - public var Call_Camera: String { return self._s[2432]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2433]! } - public var AppWallet_Intro_Text: String { return self._s[2434]! } - public var Calls_RatingFeedback: String { return self._s[2435]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2437]! } - public var Wallet_Alert_OK: String { return self._s[2438]! } - public var NotificationsSound_Pulse: String { return self._s[2439]! } - public var Watch_LastSeen_Lately: String { return self._s[2440]! } - public var ReportGroupLocation_Report: String { return self._s[2443]! } - public var Widget_NoUsers: String { return self._s[2444]! } - public var Conversation_UnvotePoll: String { return self._s[2445]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2447]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2448]! } - public var NotificationsSound_Circles: String { return self._s[2449]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2452]! } - public var Wallet_Settings_DeleteWallet: String { return self._s[2453]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2454]! } - public var Proxy_TooltipUnavailable: String { return self._s[2455]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2457]! } - public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2459]! } - public var Conversation_FileDropbox: String { return self._s[2460]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2461]! } - public var Tour_Text3: String { return self._s[2463]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2465]! } - public var GroupPermission_NoSendMessages: String { return self._s[2466]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2467]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2468]! } + public var Call_Camera: String { return self._s[2434]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2435]! } + public var AppWallet_Intro_Text: String { return self._s[2436]! } + public var Appearance_BubbleCornersSetting: String { return self._s[2437]! } + public var Calls_RatingFeedback: String { return self._s[2438]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2440]! } + public var Wallet_Alert_OK: String { return self._s[2441]! } + public var NotificationsSound_Pulse: String { return self._s[2442]! } + public var Watch_LastSeen_Lately: String { return self._s[2443]! } + public var ReportGroupLocation_Report: String { return self._s[2446]! } + public var Widget_NoUsers: String { return self._s[2447]! } + public var Conversation_UnvotePoll: String { return self._s[2448]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2450]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2451]! } + public var NotificationsSound_Circles: String { return self._s[2452]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2455]! } + public var Wallet_Settings_DeleteWallet: String { return self._s[2456]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2457]! } + public var Proxy_TooltipUnavailable: String { return self._s[2458]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2460]! } + public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[2462]! } + public var Conversation_FileDropbox: String { return self._s[2463]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2464]! } + public var Tour_Text3: String { return self._s[2466]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2468]! } + public var GroupPermission_NoSendMessages: String { return self._s[2469]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2470]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2471]! } public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2470]!, self._r[2470]!, [_0]) + return formatWithArgumentRanges(self._s[2473]!, self._r[2473]!, [_0]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2471]! } - public var Checkout_ShippingOption_Title: String { return self._s[2472]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2473]! } + public var GroupInfo_AddParticipantTitle: String { return self._s[2474]! } + public var Checkout_ShippingOption_Title: String { return self._s[2475]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2476]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2474]!, self._r[2474]!, [_0]) + return formatWithArgumentRanges(self._s[2477]!, self._r[2477]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2475]!, self._r[2475]!, [_0]) + return formatWithArgumentRanges(self._s[2478]!, self._r[2478]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2476]! } - public var EditTheme_FileReadError: String { return self._s[2477]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2478]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2479]! } - public var AutoDownloadSettings_Photos: String { return self._s[2481]! } - public var Appearance_PreviewIncomingText: String { return self._s[2482]! } - public var ChatList_Context_MarkAllAsRead: String { return self._s[2483]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2484]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2485]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2486]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2487]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2488]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2489]! } - public var Notification_SecretChatScreenshot: String { return self._s[2490]! } - public var AccessDenied_Wallpapers: String { return self._s[2491]! } - public var ChatList_Context_Mute: String { return self._s[2493]! } - public var Passport_Address_City: String { return self._s[2494]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2495]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2496]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2497]! } - public var AccessDenied_LocationDisabled: String { return self._s[2498]! } - public var Group_Location_Title: String { return self._s[2499]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2501]! } - public var GroupInfo_Sound: String { return self._s[2502]! } - public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2503]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2504]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2505]! } - public var Contacts_Title: String { return self._s[2506]! } - public var EditTheme_ThemeTemplateAlertText: String { return self._s[2507]! } - public var Passport_Language_fr: String { return self._s[2508]! } - public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2509]! } - public var Notifications_ResetAllNotifications: String { return self._s[2510]! } - public var IntentsSettings_SuggestedChats: String { return self._s[2512]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2514]! } - public var Checkout_NewCard_Title: String { return self._s[2515]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2516]! } - public var Conversation_ForwardChats: String { return self._s[2517]! } - public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2519]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2520]! } - public var Settings_FAQ: String { return self._s[2522]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2523]! } - public var Conversation_ContextMenuForward: String { return self._s[2524]! } - public var VoiceOver_Chat_YourPhoto: String { return self._s[2527]! } - public var PrivacyPolicy_Title: String { return self._s[2530]! } - public var Notifications_TextTone: String { return self._s[2531]! } - public var Profile_CreateNewContact: String { return self._s[2532]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2533]! } - public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2535]! } - public var Call_Speaker: String { return self._s[2536]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2537]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2539]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2540]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2479]! } + public var EditTheme_FileReadError: String { return self._s[2480]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2481]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2482]! } + public var AutoDownloadSettings_Photos: String { return self._s[2484]! } + public var Appearance_PreviewIncomingText: String { return self._s[2485]! } + public var ChatList_Context_MarkAllAsRead: String { return self._s[2486]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2487]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2488]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2489]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2490]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2491]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2492]! } + public var Notification_SecretChatScreenshot: String { return self._s[2493]! } + public var AccessDenied_Wallpapers: String { return self._s[2494]! } + public var ChatList_Context_Mute: String { return self._s[2496]! } + public var Passport_Address_City: String { return self._s[2497]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2498]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2499]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2500]! } + public var AccessDenied_LocationDisabled: String { return self._s[2501]! } + public var Group_Location_Title: String { return self._s[2502]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2504]! } + public var GroupInfo_Sound: String { return self._s[2505]! } + public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[2506]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2507]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2508]! } + public var Contacts_Title: String { return self._s[2509]! } + public var EditTheme_ThemeTemplateAlertText: String { return self._s[2510]! } + public var Passport_Language_fr: String { return self._s[2511]! } + public var TwoFactorSetup_EmailVerification_Action: String { return self._s[2512]! } + public var Notifications_ResetAllNotifications: String { return self._s[2513]! } + public var IntentsSettings_SuggestedChats: String { return self._s[2515]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2517]! } + public var Checkout_NewCard_Title: String { return self._s[2518]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2519]! } + public var Conversation_ForwardChats: String { return self._s[2520]! } + public var Wallet_SecureStorageReset_PasscodeText: String { return self._s[2522]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2523]! } + public var Settings_FAQ: String { return self._s[2525]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2526]! } + public var Conversation_ContextMenuForward: String { return self._s[2527]! } + public var VoiceOver_Chat_YourPhoto: String { return self._s[2530]! } + public var PrivacyPolicy_Title: String { return self._s[2533]! } + public var Notifications_TextTone: String { return self._s[2534]! } + public var Profile_CreateNewContact: String { return self._s[2535]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2536]! } + public var TwoFactorSetup_EmailVerification_Title: String { return self._s[2538]! } + public var Call_Speaker: String { return self._s[2539]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2540]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2542]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2543]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2541]!, self._r[2541]!, [_0]) + return formatWithArgumentRanges(self._s[2544]!, self._r[2544]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2542]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2543]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2544]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2545]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2546]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2547]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2548]! } - public var Bot_Unblock: String { return self._s[2549]! } - public var TextFormat_Italic: String { return self._s[2550]! } - public var WallpaperSearch_ColorPink: String { return self._s[2551]! } - public var Settings_About_Help: String { return self._s[2553]! } - public var SearchImages_Title: String { return self._s[2554]! } - public var Weekday_Wednesday: String { return self._s[2555]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2556]! } - public var ExplicitContent_AlertTitle: String { return self._s[2557]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2545]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2546]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2547]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2548]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2549]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2550]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2551]! } + public var Bot_Unblock: String { return self._s[2552]! } + public var TextFormat_Italic: String { return self._s[2553]! } + public var WallpaperSearch_ColorPink: String { return self._s[2554]! } + public var Settings_About_Help: String { return self._s[2556]! } + public var SearchImages_Title: String { return self._s[2557]! } + public var Weekday_Wednesday: String { return self._s[2558]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2559]! } + public var ExplicitContent_AlertTitle: String { return self._s[2560]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2558]!, self._r[2558]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2561]!, self._r[2561]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2559]! } - public var Weekday_Thursday: String { return self._s[2560]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2561]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2562]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2562]! } + public var Weekday_Thursday: String { return self._s[2563]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2564]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2565]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2563]!, self._r[2563]!, [_0]) + return formatWithArgumentRanges(self._s[2566]!, self._r[2566]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2564]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2565]! } - public var Passport_RequestedInformation: String { return self._s[2566]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2567]! } - public var Conversation_EncryptionProcessing: String { return self._s[2569]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2570]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2572]! } - public var Channel_Setup_Title: String { return self._s[2573]! } - public var Conversation_SearchPlaceholder: String { return self._s[2574]! } - public var OldChannels_GroupEmptyFormat: String { return self._s[2575]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2576]! } - public var Checkout_ErrorGeneric: String { return self._s[2577]! } - public var Passport_Language_hu: String { return self._s[2578]! } - public var GroupPermission_EditingDisabled: String { return self._s[2579]! } - public var Wallet_Month_ShortSeptember: String { return self._s[2581]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2567]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2568]! } + public var Passport_RequestedInformation: String { return self._s[2569]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2570]! } + public var Conversation_EncryptionProcessing: String { return self._s[2572]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2573]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2575]! } + public var Channel_Setup_Title: String { return self._s[2576]! } + public var Conversation_SearchPlaceholder: String { return self._s[2577]! } + public var OldChannels_GroupEmptyFormat: String { return self._s[2578]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2579]! } + public var Checkout_ErrorGeneric: String { return self._s[2580]! } + public var Passport_Language_hu: String { return self._s[2581]! } + public var GroupPermission_EditingDisabled: String { return self._s[2582]! } + public var Wallet_Month_ShortSeptember: String { return self._s[2584]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2582]!, self._r[2582]!, [_0]) + return formatWithArgumentRanges(self._s[2585]!, self._r[2585]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2585]!, self._r[2585]!, [_1]) + return formatWithArgumentRanges(self._s[2588]!, self._r[2588]!, [_1]) } - public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2586]! } + public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2589]! } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2587]!, self._r[2587]!, [_0]) + return formatWithArgumentRanges(self._s[2590]!, self._r[2590]!, [_0]) } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2588]! } - public var Group_Location_Info: String { return self._s[2589]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2590]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2591]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2591]! } + public var Group_Location_Info: String { return self._s[2592]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2593]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2594]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2592]!, self._r[2592]!, [_0]) + return formatWithArgumentRanges(self._s[2595]!, self._r[2595]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2593]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2594]! } - public var Appearance_RemoveThemeConfirmation: String { return self._s[2595]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2596]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2596]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2597]! } + public var Appearance_RemoveThemeConfirmation: String { return self._s[2598]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2599]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2597]!, self._r[2597]!, [_0]) + return formatWithArgumentRanges(self._s[2600]!, self._r[2600]!, [_0]) } public func Notification_PinnedQuizMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2598]!, self._r[2598]!, [_0]) + return formatWithArgumentRanges(self._s[2601]!, self._r[2601]!, [_0]) } - public var Passport_Language_cs: String { return self._s[2599]! } - public var Message_PinnedAnimationMessage: String { return self._s[2601]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2603]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2604]! } - public var Wallet_Info_TransactionTo: String { return self._s[2606]! } - public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2607]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2608]! } - public var Embed_PlayingInPIP: String { return self._s[2609]! } - public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2610]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2611]! } + public var Passport_Language_cs: String { return self._s[2602]! } + public var Message_PinnedAnimationMessage: String { return self._s[2604]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2606]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2607]! } + public var Wallet_Info_TransactionTo: String { return self._s[2609]! } + public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[2610]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2611]! } + public var Embed_PlayingInPIP: String { return self._s[2612]! } + public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[2613]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2614]! } public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2612]!, self._r[2612]!, [_0]) + return formatWithArgumentRanges(self._s[2615]!, self._r[2615]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2613]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2616]! } public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2614]!, self._r[2614]!, [_1]) + return formatWithArgumentRanges(self._s[2617]!, self._r[2617]!, [_1]) } - public var Notification_PaymentSent: String { return self._s[2615]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2616]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2617]! } - public var AutoNightTheme_System: String { return self._s[2618]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2619]! } - public var CreatePoll_QuizTitle: String { return self._s[2620]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2621]! } - public var VoiceOver_Chat_PagePreview: String { return self._s[2622]! } + public var Notification_PaymentSent: String { return self._s[2618]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2619]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2620]! } + public var AutoNightTheme_System: String { return self._s[2621]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2622]! } + public var CreatePoll_QuizTitle: String { return self._s[2623]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2624]! } + public var VoiceOver_Chat_PagePreview: String { return self._s[2625]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2625]!, self._r[2625]!, [_1]) + return formatWithArgumentRanges(self._s[2628]!, self._r[2628]!, [_1]) } public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2626]!, self._r[2626]!, [_1]) + return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_1]) } public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2627]!, self._r[2627]!, [_1]) + return formatWithArgumentRanges(self._s[2630]!, self._r[2630]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2629]! } - public var PasscodeSettings_HelpTop: String { return self._s[2630]! } - public var Conversation_WalletRequiredTitle: String { return self._s[2631]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2632]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2633]! } - public var EditTheme_ShortLink: String { return self._s[2634]! } - public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2635]! } - public var ProxyServer_VoiceOver_Active: String { return self._s[2636]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2637]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2638]! } - public var Call_Accept: String { return self._s[2640]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2641]! } - public var Month_GenMarch: String { return self._s[2643]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2644]! } - public var LoginPassword_Title: String { return self._s[2645]! } - public var Call_End: String { return self._s[2646]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2647]! } - public var VoiceOver_Chat_Contact: String { return self._s[2648]! } - public var EditTheme_Create_Preview_IncomingText: String { return self._s[2649]! } - public var CallSettings_Always: String { return self._s[2650]! } - public var CallFeedback_Success: String { return self._s[2651]! } - public var TwoStepAuth_SetupHint: String { return self._s[2652]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2632]! } + public var PasscodeSettings_HelpTop: String { return self._s[2633]! } + public var Conversation_WalletRequiredTitle: String { return self._s[2634]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2635]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2636]! } + public var EditTheme_ShortLink: String { return self._s[2637]! } + public var Theme_Colors_ColorWallpaperWarning: String { return self._s[2638]! } + public var ProxyServer_VoiceOver_Active: String { return self._s[2639]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2640]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2641]! } + public var Call_Accept: String { return self._s[2643]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2644]! } + public var Month_GenMarch: String { return self._s[2646]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2647]! } + public var LoginPassword_Title: String { return self._s[2648]! } + public var Call_End: String { return self._s[2649]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2650]! } + public var VoiceOver_Chat_Contact: String { return self._s[2651]! } + public var EditTheme_Create_Preview_IncomingText: String { return self._s[2652]! } + public var CallSettings_Always: String { return self._s[2653]! } + public var CallFeedback_Success: String { return self._s[2654]! } + public var TwoStepAuth_SetupHint: String { return self._s[2655]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2653]!, self._r[2653]!, [_1]) + return formatWithArgumentRanges(self._s[2656]!, self._r[2656]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2654]! } - public var Login_PhoneTitle: String { return self._s[2655]! } - public var Passport_FieldPhoneHelp: String { return self._s[2656]! } - public var Weekday_ShortSunday: String { return self._s[2657]! } - public var Passport_InfoFAQ_URL: String { return self._s[2658]! } - public var ContactInfo_Job: String { return self._s[2660]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2661]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2662]! } - public var CreatePoll_QuizTip: String { return self._s[2663]! } - public var TwoFactorSetup_Email_Text: String { return self._s[2664]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2665]! } - public var Invite_ChannelsTooMuch: String { return self._s[2666]! } - public var Wallet_Send_ConfirmationConfirm: String { return self._s[2667]! } - public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2668]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2669]! } - public var Wallet_Receive_AmountText: String { return self._s[2670]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2671]! } - public var CallFeedback_ReasonNoise: String { return self._s[2672]! } - public var Appearance_AppIconDefault: String { return self._s[2674]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2675]! } - public var MediaPicker_AddCaption: String { return self._s[2676]! } - public var CallSettings_TabIconDescription: String { return self._s[2677]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2657]! } + public var Login_PhoneTitle: String { return self._s[2658]! } + public var Passport_FieldPhoneHelp: String { return self._s[2659]! } + public var Weekday_ShortSunday: String { return self._s[2660]! } + public var Passport_InfoFAQ_URL: String { return self._s[2661]! } + public var ContactInfo_Job: String { return self._s[2663]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2664]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2665]! } + public var CreatePoll_QuizTip: String { return self._s[2666]! } + public var TwoFactorSetup_Email_Text: String { return self._s[2667]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2668]! } + public var Invite_ChannelsTooMuch: String { return self._s[2669]! } + public var Wallet_Send_ConfirmationConfirm: String { return self._s[2670]! } + public var Wallet_TransactionInfo_OtherFeeInfo: String { return self._s[2671]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2672]! } + public var Wallet_Receive_AmountText: String { return self._s[2673]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2674]! } + public var CallFeedback_ReasonNoise: String { return self._s[2675]! } + public var Appearance_AppIconDefault: String { return self._s[2677]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2678]! } + public var MediaPicker_AddCaption: String { return self._s[2679]! } + public var CallSettings_TabIconDescription: String { return self._s[2680]! } public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2678]!, self._r[2678]!, [_0]) + return formatWithArgumentRanges(self._s[2681]!, self._r[2681]!, [_0]) } - public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2679]! } + public var IntentsSettings_SuggestedChatsGroups: String { return self._s[2682]! } public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2680]!, self._r[2680]!, [_0]) + return formatWithArgumentRanges(self._s[2683]!, self._r[2683]!, [_0]) } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2681]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2682]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2683]! } - public var DialogList_SearchSectionRecent: String { return self._s[2684]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2685]! } - public var CreatePoll_Anonymous: String { return self._s[2686]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2689]! } - public var LastSeen_WithinAWeek: String { return self._s[2690]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2691]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2693]! } - public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2694]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2684]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2685]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2686]! } + public var DialogList_SearchSectionRecent: String { return self._s[2687]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2688]! } + public var CreatePoll_Anonymous: String { return self._s[2689]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2692]! } + public var LastSeen_WithinAWeek: String { return self._s[2693]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2694]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2696]! } + public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[2697]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2695]!, self._r[2695]!, [_0]) + return formatWithArgumentRanges(self._s[2698]!, self._r[2698]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2696]! } - public var Conversation_StatusLeftGroup: String { return self._s[2697]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2698]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2700]! } - public var GroupPermission_AddSuccess: String { return self._s[2701]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2703]! } - public var Conversation_ContextMenuCopy: String { return self._s[2704]! } - public var AccessDenied_CallMicrophone: String { return self._s[2705]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2699]! } + public var Conversation_StatusLeftGroup: String { return self._s[2700]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2701]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2703]! } + public var GroupPermission_AddSuccess: String { return self._s[2704]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2706]! } + public var Conversation_ContextMenuCopy: String { return self._s[2707]! } + public var AccessDenied_CallMicrophone: String { return self._s[2708]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2706]!, self._r[2706]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2709]!, self._r[2709]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2707]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2708]! } - public var Checkout_PaymentMethod_New: String { return self._s[2709]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2710]! } - public var PhotoEditor_QualityTool: String { return self._s[2711]! } - public var Login_SendCodeViaSms: String { return self._s[2712]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2713]! } - public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2714]! } - public var Wallet_Receive_CopyAddress: String { return self._s[2715]! } - public var Login_EmailNotConfiguredError: String { return self._s[2716]! } - public var SocksProxySetup_Status: String { return self._s[2717]! } - public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2718]! } - public var PrivacyPolicy_Accept: String { return self._s[2719]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2720]! } - public var Appearance_AppIconClassicX: String { return self._s[2721]! } + public var Login_InvalidFirstNameError: String { return self._s[2710]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2711]! } + public var Checkout_PaymentMethod_New: String { return self._s[2712]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2713]! } + public var PhotoEditor_QualityTool: String { return self._s[2714]! } + public var Login_SendCodeViaSms: String { return self._s[2715]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2716]! } + public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[2717]! } + public var Wallet_Receive_CopyAddress: String { return self._s[2718]! } + public var Login_EmailNotConfiguredError: String { return self._s[2719]! } + public var SocksProxySetup_Status: String { return self._s[2720]! } + public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[2721]! } + public var PrivacyPolicy_Accept: String { return self._s[2722]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2723]! } + public var Appearance_AppIconClassicX: String { return self._s[2724]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2722]!, self._r[2722]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2725]!, self._r[2725]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2723]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2725]! } - public var AutoNightTheme_Automatic: String { return self._s[2726]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2727]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2728]! } - public var Cache_Help: String { return self._s[2729]! } - public var Group_ErrorAccessDenied: String { return self._s[2730]! } - public var Passport_Language_fa: String { return self._s[2731]! } - public var Wallet_Intro_Text: String { return self._s[2732]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2733]! } - public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2734]! } - public var PrivacySettings_LastSeen: String { return self._s[2735]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2726]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2728]! } + public var AutoNightTheme_Automatic: String { return self._s[2729]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2730]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2731]! } + public var Cache_Help: String { return self._s[2732]! } + public var Group_ErrorAccessDenied: String { return self._s[2733]! } + public var Passport_Language_fa: String { return self._s[2734]! } + public var Wallet_Intro_Text: String { return self._s[2735]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2736]! } + public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2737]! } + public var PrivacySettings_LastSeen: String { return self._s[2738]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2736]!, self._r[2736]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2739]!, self._r[2739]!, [_0, _1]) } - public var Wallet_Configuration_Apply: String { return self._s[2740]! } - public var Preview_SaveGif: String { return self._s[2741]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2742]! } - public var Profile_About: String { return self._s[2743]! } - public var Channel_About_Placeholder: String { return self._s[2744]! } - public var Login_InfoTitle: String { return self._s[2745]! } + public var Wallet_Configuration_Apply: String { return self._s[2743]! } + public var Preview_SaveGif: String { return self._s[2744]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2745]! } + public var Profile_About: String { return self._s[2746]! } + public var Channel_About_Placeholder: String { return self._s[2747]! } + public var Login_InfoTitle: String { return self._s[2748]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2746]!, self._r[2746]!, [_0]) + return formatWithArgumentRanges(self._s[2749]!, self._r[2749]!, [_0]) } - public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2747]! } - public var Watch_Suggestion_CantTalk: String { return self._s[2749]! } - public var ContactInfo_Title: String { return self._s[2750]! } - public var Media_ShareThisVideo: String { return self._s[2751]! } - public var Weekday_ShortFriday: String { return self._s[2752]! } - public var AccessDenied_Contacts: String { return self._s[2754]! } - public var Notification_CallIncomingShort: String { return self._s[2755]! } - public var Group_Setup_TypePublic: String { return self._s[2756]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2757]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2758]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2761]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2762]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2763]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2764]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2765]! } + public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[2750]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2752]! } + public var ContactInfo_Title: String { return self._s[2753]! } + public var Media_ShareThisVideo: String { return self._s[2754]! } + public var Weekday_ShortFriday: String { return self._s[2755]! } + public var AccessDenied_Contacts: String { return self._s[2757]! } + public var Notification_CallIncomingShort: String { return self._s[2758]! } + public var Group_Setup_TypePublic: String { return self._s[2759]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2760]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2761]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2764]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2765]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2766]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2767]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2768]! } public func Wallet_SecureStorageChanged_BiometryText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2766]!, self._r[2766]!, [_0]) + return formatWithArgumentRanges(self._s[2769]!, self._r[2769]!, [_0]) } - public var DialogList_Typing: String { return self._s[2767]! } - public var CallFeedback_IncludeLogs: String { return self._s[2769]! } - public var Checkout_Phone: String { return self._s[2771]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2774]! } - public var Privacy_Calls_Integration: String { return self._s[2775]! } - public var Notifications_PermissionsAllow: String { return self._s[2776]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2780]! } - public var Settings_ChatSettings: String { return self._s[2781]! } - public var Conversation_SendingOptionsTooltip: String { return self._s[2782]! } + public var DialogList_Typing: String { return self._s[2770]! } + public var CallFeedback_IncludeLogs: String { return self._s[2772]! } + public var Checkout_Phone: String { return self._s[2774]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2777]! } + public var Privacy_Calls_Integration: String { return self._s[2778]! } + public var Notifications_PermissionsAllow: String { return self._s[2779]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2783]! } + public var Settings_ChatSettings: String { return self._s[2784]! } + public var Conversation_SendingOptionsTooltip: String { return self._s[2785]! } public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2784]!, self._r[2784]!, [_0]) + return formatWithArgumentRanges(self._s[2787]!, self._r[2787]!, [_0]) } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2785]!, self._r[2785]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2788]!, self._r[2788]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2787]! } + public var GroupRemoved_DeleteUser: String { return self._s[2790]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2788]!, self._r[2788]!, [_0]) + return formatWithArgumentRanges(self._s[2791]!, self._r[2791]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2789]!, self._r[2789]!, [_1]) + return formatWithArgumentRanges(self._s[2792]!, self._r[2792]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2790]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2791]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2793]! } - public var Conversation_Unblock: String { return self._s[2794]! } - public var PrivacySettings_DataSettings: String { return self._s[2795]! } - public var WallpaperPreview_PatternPaternApply: String { return self._s[2796]! } - public var Group_PublicLink_Info: String { return self._s[2797]! } + public var Login_ContinueWithLocalization: String { return self._s[2793]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2794]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2796]! } + public var Conversation_Unblock: String { return self._s[2797]! } + public var PrivacySettings_DataSettings: String { return self._s[2798]! } + public var WallpaperPreview_PatternPaternApply: String { return self._s[2799]! } + public var Group_PublicLink_Info: String { return self._s[2800]! } public func Wallet_Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2798]!, self._r[2798]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2801]!, self._r[2801]!, [_1, _2, _3]) } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2799]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2802]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2800]!, self._r[2800]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2803]!, self._r[2803]!, [_0, _1]) } - public var OldChannels_ChannelsHeader: String { return self._s[2802]! } - public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2803]! } - public var PrivacySettings_Passcode: String { return self._s[2805]! } - public var Call_Mute: String { return self._s[2806]! } - public var Wallet_Weekday_Yesterday: String { return self._s[2807]! } - public var Passport_Language_dz: String { return self._s[2808]! } - public var Wallet_Receive_AmountHeader: String { return self._s[2809]! } - public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2810]! } - public var Passport_Language_tk: String { return self._s[2811]! } + public var OldChannels_ChannelsHeader: String { return self._s[2805]! } + public var Wallet_RestoreFailed_CreateWallet: String { return self._s[2806]! } + public var PrivacySettings_Passcode: String { return self._s[2808]! } + public var Call_Mute: String { return self._s[2809]! } + public var Wallet_Weekday_Yesterday: String { return self._s[2810]! } + public var Passport_Language_dz: String { return self._s[2811]! } + public var Wallet_Receive_AmountHeader: String { return self._s[2812]! } + public var Wallet_TransactionInfo_OtherFeeInfoUrl: String { return self._s[2813]! } + public var Passport_Language_tk: String { return self._s[2814]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2812]!, self._r[2812]!, [_0]) + return formatWithArgumentRanges(self._s[2815]!, self._r[2815]!, [_0]) } - public var Settings_Search: String { return self._s[2813]! } - public var Wallet_Month_ShortFebruary: String { return self._s[2814]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2815]! } - public var Wallet_Configuration_SourceJSON: String { return self._s[2816]! } - public var Conversation_ContextMenuReply: String { return self._s[2817]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2818]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2819]! } - public var Tour_Title1: String { return self._s[2820]! } - public var Wallet_Alert_Cancel: String { return self._s[2821]! } - public var Conversation_ClearGroupHistory: String { return self._s[2823]! } - public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2824]! } - public var WallpaperPreview_Motion: String { return self._s[2825]! } + public var Settings_Search: String { return self._s[2816]! } + public var Wallet_Month_ShortFebruary: String { return self._s[2817]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2818]! } + public var Wallet_Configuration_SourceJSON: String { return self._s[2819]! } + public var Conversation_ContextMenuReply: String { return self._s[2820]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2821]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2822]! } + public var Tour_Title1: String { return self._s[2823]! } + public var Wallet_Alert_Cancel: String { return self._s[2824]! } + public var Conversation_ClearGroupHistory: String { return self._s[2826]! } + public var Wallet_TransactionInfo_RecipientHeader: String { return self._s[2827]! } + public var WallpaperPreview_Motion: String { return self._s[2828]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2826]!, self._r[2826]!, [_0]) + return formatWithArgumentRanges(self._s[2829]!, self._r[2829]!, [_0]) } - public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2827]! } - public var Call_RateCall: String { return self._s[2828]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2829]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2830]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2831]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2833]! } + public var Wallet_Configuration_ApplyErrorTextJSONInvalidData: String { return self._s[2830]! } + public var Call_RateCall: String { return self._s[2831]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2832]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2833]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2834]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2836]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2835]!, self._r[2835]!, [_0]) + return formatWithArgumentRanges(self._s[2838]!, self._r[2838]!, [_0]) } - public var Compose_Create: String { return self._s[2836]! } - public var Contacts_InviteToTelegram: String { return self._s[2837]! } - public var GroupInfo_Notifications: String { return self._s[2838]! } - public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2840]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2841]! } - public var Month_GenApril: String { return self._s[2842]! } - public var Appearance_AutoNightTheme: String { return self._s[2843]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2845]! } - public var Login_CodeSentSms: String { return self._s[2847]! } + public var Compose_Create: String { return self._s[2839]! } + public var Contacts_InviteToTelegram: String { return self._s[2840]! } + public var GroupInfo_Notifications: String { return self._s[2841]! } + public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[2843]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2844]! } + public var Month_GenApril: String { return self._s[2845]! } + public var Appearance_AutoNightTheme: String { return self._s[2846]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2848]! } + public var Login_CodeSentSms: String { return self._s[2850]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2848]!, self._r[2848]!, [_0]) + return formatWithArgumentRanges(self._s[2851]!, self._r[2851]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2849]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2850]! } - public var Passport_Language_hr: String { return self._s[2851]! } - public var Common_ActionNotAllowedError: String { return self._s[2852]! } + public var EmptyGroupInfo_Line3: String { return self._s[2852]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2853]! } + public var Passport_Language_hr: String { return self._s[2854]! } + public var Common_ActionNotAllowedError: String { return self._s[2855]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2853]!, self._r[2853]!, [_0]) + return formatWithArgumentRanges(self._s[2856]!, self._r[2856]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2854]! } - public var Wallet_Info_TransactionFrom: String { return self._s[2855]! } - public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2856]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2857]! } - public var Privacy_SecretChatsTitle: String { return self._s[2858]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2860]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2861]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2862]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2863]! } - public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2864]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2865]! } - public var Preview_DeleteGif: String { return self._s[2866]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2867]! } - public var Group_ErrorNotMutualContact: String { return self._s[2868]! } - public var Notification_MessageLifetime5s: String { return self._s[2869]! } - public var Wallet_Send_OwnAddressAlertText: String { return self._s[2870]! } - public var OldChannels_ChannelFormat: String { return self._s[2871]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2857]! } + public var Wallet_Info_TransactionFrom: String { return self._s[2858]! } + public var Wallet_Send_ErrorDecryptionFailed: String { return self._s[2859]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2860]! } + public var Privacy_SecretChatsTitle: String { return self._s[2861]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2863]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2864]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2865]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2866]! } + public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[2867]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2868]! } + public var Preview_DeleteGif: String { return self._s[2869]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2870]! } + public var Group_ErrorNotMutualContact: String { return self._s[2871]! } + public var Notification_MessageLifetime5s: String { return self._s[2872]! } + public var Wallet_Send_OwnAddressAlertText: String { return self._s[2873]! } + public var OldChannels_ChannelFormat: String { return self._s[2874]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2872]!, self._r[2872]!, [_0]) + return formatWithArgumentRanges(self._s[2875]!, self._r[2875]!, [_0]) } - public var VoiceOver_Chat_Video: String { return self._s[2873]! } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2875]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2876]! } - public var Passport_Address_AddBankStatement: String { return self._s[2877]! } - public var Notification_CallIncoming: String { return self._s[2878]! } - public var Wallet_Words_NotDoneTitle: String { return self._s[2879]! } - public var Compose_NewGroupTitle: String { return self._s[2880]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2882]! } - public var Passport_Address_Postcode: String { return self._s[2884]! } + public var VoiceOver_Chat_Video: String { return self._s[2876]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2878]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2879]! } + public var Passport_Address_AddBankStatement: String { return self._s[2880]! } + public var Notification_CallIncoming: String { return self._s[2881]! } + public var Wallet_Words_NotDoneTitle: String { return self._s[2882]! } + public var Compose_NewGroupTitle: String { return self._s[2883]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2885]! } + public var Passport_Address_Postcode: String { return self._s[2887]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2885]!, self._r[2885]!, [_0]) + return formatWithArgumentRanges(self._s[2888]!, self._r[2888]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2886]! } - public var Wallet_Month_ShortOctober: String { return self._s[2887]! } - public var VoiceOver_Chat_YourMusic: String { return self._s[2888]! } - public var WallpaperColors_Title: String { return self._s[2889]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2890]! } - public var VoiceOver_MessageContextForward: String { return self._s[2891]! } - public var GroupPermission_Duration: String { return self._s[2892]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2889]! } + public var Wallet_Month_ShortOctober: String { return self._s[2890]! } + public var VoiceOver_Chat_YourMusic: String { return self._s[2891]! } + public var WallpaperColors_Title: String { return self._s[2892]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2893]! } + public var VoiceOver_MessageContextForward: String { return self._s[2894]! } + public var GroupPermission_Duration: String { return self._s[2895]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2893]!, self._r[2893]!, [_0]) + return formatWithArgumentRanges(self._s[2896]!, self._r[2896]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2894]! } - public var Username_Placeholder: String { return self._s[2895]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2896]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2897]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2898]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2897]! } + public var Username_Placeholder: String { return self._s[2898]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2899]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2900]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2901]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2900]!, self._r[2900]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2903]!, self._r[2903]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2901]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2902]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2903]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2904]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2905]! } - public var Conversation_ContextMenuMore: String { return self._s[2906]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2907]! } - public var CallSettings_TabIcon: String { return self._s[2908]! } - public var KeyCommand_Find: String { return self._s[2909]! } - public var ClearCache_FreeSpaceDescription: String { return self._s[2910]! } - public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2911]! } - public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2912]! } - public var Message_PinnedGame: String { return self._s[2913]! } - public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2914]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2916]! } - public var Login_CallRequestState2: String { return self._s[2918]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2920]! } + public var Passport_PasswordDescription: String { return self._s[2904]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2905]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2906]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2907]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2908]! } + public var Conversation_ContextMenuMore: String { return self._s[2909]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2910]! } + public var CallSettings_TabIcon: String { return self._s[2911]! } + public var KeyCommand_Find: String { return self._s[2912]! } + public var ClearCache_FreeSpaceDescription: String { return self._s[2913]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2914]! } + public var EditTheme_Edit_Preview_IncomingText: String { return self._s[2915]! } + public var Message_PinnedGame: String { return self._s[2916]! } + public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[2917]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2919]! } + public var Login_CallRequestState2: String { return self._s[2921]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2923]! } public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2921]!, self._r[2921]!, [_0]) + return formatWithArgumentRanges(self._s[2924]!, self._r[2924]!, [_0]) } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2923]!, self._r[2923]!, [_0]) + return formatWithArgumentRanges(self._s[2926]!, self._r[2926]!, [_0]) } - public var AuthSessions_AddDevice: String { return self._s[2924]! } - public var WallpaperPreview_Blurred: String { return self._s[2925]! } - public var Conversation_InstantPagePreview: String { return self._s[2926]! } + public var AuthSessions_AddDevice: String { return self._s[2927]! } + public var WallpaperPreview_Blurred: String { return self._s[2928]! } + public var Conversation_InstantPagePreview: String { return self._s[2929]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2927]!, self._r[2927]!, [_0]) + return formatWithArgumentRanges(self._s[2930]!, self._r[2930]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2930]! } - public var WallpaperSearch_ColorRed: String { return self._s[2931]! } - public var GroupPermission_NoPinMessages: String { return self._s[2932]! } - public var Passport_Language_es: String { return self._s[2933]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2935]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2936]! } + public var SecretTimer_VideoDescription: String { return self._s[2933]! } + public var WallpaperSearch_ColorRed: String { return self._s[2934]! } + public var GroupPermission_NoPinMessages: String { return self._s[2935]! } + public var Passport_Language_es: String { return self._s[2936]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2938]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2939]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2937]!, self._r[2937]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2940]!, self._r[2940]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2938]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2939]! } - public var Watch_UserInfo_Unmute: String { return self._s[2940]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2941]! } - public var AccessDenied_CameraRestricted: String { return self._s[2943]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2941]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2942]! } + public var Watch_UserInfo_Unmute: String { return self._s[2943]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2944]! } + public var AccessDenied_CameraRestricted: String { return self._s[2946]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2944]!, self._r[2944]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2947]!, self._r[2947]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2946]! } - public var Settings_CopyUsername: String { return self._s[2947]! } - public var Contacts_SearchLabel: String { return self._s[2948]! } - public var Map_OpenInYandexNavigator: String { return self._s[2950]! } - public var PasscodeSettings_EncryptData: String { return self._s[2951]! } - public var Settings_Wallet: String { return self._s[2952]! } - public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2953]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2954]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2955]! } - public var DialogList_AdNoticeAlert: String { return self._s[2956]! } - public var Wallet_Month_GenMay: String { return self._s[2958]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2959]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2960]! } - public var Localization_LanguageCustom: String { return self._s[2961]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2962]! } - public var CallFeedback_Title: String { return self._s[2963]! } - public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2966]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2967]! } - public var Wallet_Intro_CreateErrorTitle: String { return self._s[2968]! } - public var Conversation_InfoGroup: String { return self._s[2969]! } - public var Compose_NewMessage: String { return self._s[2970]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2971]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2972]! } - public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2973]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2974]! } + public var ChatList_ReadAll: String { return self._s[2949]! } + public var Settings_CopyUsername: String { return self._s[2950]! } + public var Contacts_SearchLabel: String { return self._s[2951]! } + public var Map_OpenInYandexNavigator: String { return self._s[2953]! } + public var PasscodeSettings_EncryptData: String { return self._s[2954]! } + public var Settings_Wallet: String { return self._s[2955]! } + public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2956]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2957]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2958]! } + public var DialogList_AdNoticeAlert: String { return self._s[2959]! } + public var Wallet_Month_GenMay: String { return self._s[2961]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2962]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2963]! } + public var Localization_LanguageCustom: String { return self._s[2964]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2965]! } + public var CallFeedback_Title: String { return self._s[2966]! } + public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[2969]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2970]! } + public var Wallet_Intro_CreateErrorTitle: String { return self._s[2971]! } + public var Conversation_InfoGroup: String { return self._s[2972]! } + public var Compose_NewMessage: String { return self._s[2973]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2974]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2975]! } + public var Wallet_SecureStorageReset_BiometryFaceId: String { return self._s[2976]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2977]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2975]!, self._r[2975]!, [_0]) + return formatWithArgumentRanges(self._s[2978]!, self._r[2978]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2976]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2977]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2978]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2979]! } - public var Channel_BlackList_Title: String { return self._s[2980]! } - public var UserInfo_PhoneCall: String { return self._s[2981]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2983]! } - public var Wallet_Month_ShortJanuary: String { return self._s[2984]! } - public var State_connecting: String { return self._s[2985]! } - public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2986]! } - public var Wallet_Month_GenMarch: String { return self._s[2987]! } - public var EditTheme_Expand_BottomInfo: String { return self._s[2988]! } - public var AuthSessions_AddedDeviceTerminate: String { return self._s[2989]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2979]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2980]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2981]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2982]! } + public var Channel_BlackList_Title: String { return self._s[2983]! } + public var UserInfo_PhoneCall: String { return self._s[2984]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2986]! } + public var Wallet_Month_ShortJanuary: String { return self._s[2987]! } + public var State_connecting: String { return self._s[2988]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2989]! } + public var Wallet_Month_GenMarch: String { return self._s[2990]! } + public var EditTheme_Expand_BottomInfo: String { return self._s[2991]! } + public var AuthSessions_AddedDeviceTerminate: String { return self._s[2992]! } public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2990]!, self._r[2990]!, [_0]) + return formatWithArgumentRanges(self._s[2993]!, self._r[2993]!, [_0]) } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2991]!, self._r[2991]!, [_0]) + return formatWithArgumentRanges(self._s[2994]!, self._r[2994]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2992]! } - public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2993]! } - public var Passport_Identity_EditPassport: String { return self._s[2994]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2996]! } - public var Localization_EnglishLanguageName: String { return self._s[2997]! } - public var Share_AuthDescription: String { return self._s[2998]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2999]! } - public var Passport_Identity_Surname: String { return self._s[3000]! } - public var Compose_TokenListPlaceholder: String { return self._s[3001]! } - public var Wallet_AccessDenied_Camera: String { return self._s[3002]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[3003]! } - public var Settings_AboutEmpty: String { return self._s[3004]! } - public var Conversation_Unmute: String { return self._s[3005]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[3007]! } - public var Wallet_Sending_Text: String { return self._s[3008]! } + public var Notifications_GroupNotifications: String { return self._s[2995]! } + public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[2996]! } + public var Passport_Identity_EditPassport: String { return self._s[2997]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2999]! } + public var Localization_EnglishLanguageName: String { return self._s[3000]! } + public var Share_AuthDescription: String { return self._s[3001]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3002]! } + public var Passport_Identity_Surname: String { return self._s[3003]! } + public var Compose_TokenListPlaceholder: String { return self._s[3004]! } + public var Wallet_AccessDenied_Camera: String { return self._s[3005]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[3006]! } + public var Settings_AboutEmpty: String { return self._s[3007]! } + public var Conversation_Unmute: String { return self._s[3008]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[3010]! } + public var Wallet_Sending_Text: String { return self._s[3011]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3009]!, self._r[3009]!, [_1]) + return formatWithArgumentRanges(self._s[3012]!, self._r[3012]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[3010]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3012]! } - public var ChatSettings_Appearance: String { return self._s[3013]! } - public var ClearCache_StorageUsage: String { return self._s[3014]! } - public var Appearance_PickAccentColor: String { return self._s[3015]! } + public var Login_CodeSentCall: String { return self._s[3013]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3015]! } + public var ChatSettings_Appearance: String { return self._s[3016]! } + public var ClearCache_StorageUsage: String { return self._s[3017]! } + public var Appearance_PickAccentColor: String { return self._s[3018]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3016]!, self._r[3016]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3019]!, self._r[3019]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3017]!, self._r[3017]!, [_1]) + return formatWithArgumentRanges(self._s[3020]!, self._r[3020]!, [_1]) } - public var Notification_CallMissed: String { return self._s[3018]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3019]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3020]! } - public var Wallet_Month_GenOctober: String { return self._s[3022]! } - public var ChatAdmins_AdminLabel: String { return self._s[3023]! } - public var KeyCommand_JumpToNextChat: String { return self._s[3024]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[3026]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3027]! } - public var Month_GenJune: String { return self._s[3028]! } - public var IntentsSettings_MainAccountInfo: String { return self._s[3029]! } - public var Watch_Location_Current: String { return self._s[3030]! } - public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3031]! } - public var Conversation_TitleMute: String { return self._s[3032]! } - public var Map_PlacesInThisArea: String { return self._s[3033]! } + public var Notification_CallMissed: String { return self._s[3021]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[3022]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[3023]! } + public var Wallet_Month_GenOctober: String { return self._s[3025]! } + public var ChatAdmins_AdminLabel: String { return self._s[3026]! } + public var KeyCommand_JumpToNextChat: String { return self._s[3027]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[3029]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[3030]! } + public var Month_GenJune: String { return self._s[3031]! } + public var IntentsSettings_MainAccountInfo: String { return self._s[3032]! } + public var Watch_Location_Current: String { return self._s[3033]! } + public var Wallet_Receive_CopyInvoiceUrl: String { return self._s[3034]! } + public var Conversation_TitleMute: String { return self._s[3035]! } + public var Map_PlacesInThisArea: String { return self._s[3036]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3034]!, self._r[3034]!, [_1]) + return formatWithArgumentRanges(self._s[3037]!, self._r[3037]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[3035]! } + public var GroupInfo_DeleteAndExit: String { return self._s[3038]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3036]!, self._r[3036]!, [_0]) + return formatWithArgumentRanges(self._s[3039]!, self._r[3039]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[3037]! } - public var Chat_SlowmodeSendError: String { return self._s[3038]! } - public var MaskStickerSettings_Info: String { return self._s[3039]! } - public var EditTheme_Expand_TopInfo: String { return self._s[3040]! } + public var Call_ReportPlaceholder: String { return self._s[3040]! } + public var Chat_SlowmodeSendError: String { return self._s[3041]! } + public var MaskStickerSettings_Info: String { return self._s[3042]! } + public var EditTheme_Expand_TopInfo: String { return self._s[3043]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3041]!, self._r[3041]!, [_0]) + return formatWithArgumentRanges(self._s[3044]!, self._r[3044]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[3042]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[3044]! } - public var Contacts_ShareTelegram: String { return self._s[3045]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3046]! } - public var Map_AddressOnMap: String { return self._s[3047]! } - public var Channel_ErrorAccessDenied: String { return self._s[3048]! } - public var UserInfo_ScamBotWarning: String { return self._s[3050]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[3051]! } - public var Call_ConnectionErrorTitle: String { return self._s[3052]! } - public var UserInfo_NotificationsEnable: String { return self._s[3053]! } - public var ArchivedChats_IntroText1: String { return self._s[3054]! } - public var Tour_Text4: String { return self._s[3057]! } - public var WallpaperSearch_Recent: String { return self._s[3058]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[3059]! } - public var Profile_MessageLifetime2s: String { return self._s[3061]! } - public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3062]! } - public var Notification_MessageLifetime2s: String { return self._s[3063]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[3045]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[3047]! } + public var Contacts_ShareTelegram: String { return self._s[3048]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[3049]! } + public var Map_AddressOnMap: String { return self._s[3050]! } + public var Channel_ErrorAccessDenied: String { return self._s[3051]! } + public var UserInfo_ScamBotWarning: String { return self._s[3053]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[3054]! } + public var Call_ConnectionErrorTitle: String { return self._s[3055]! } + public var UserInfo_NotificationsEnable: String { return self._s[3056]! } + public var ArchivedChats_IntroText1: String { return self._s[3057]! } + public var Tour_Text4: String { return self._s[3060]! } + public var WallpaperSearch_Recent: String { return self._s[3061]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[3062]! } + public var Profile_MessageLifetime2s: String { return self._s[3064]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[3065]! } + public var Notification_MessageLifetime2s: String { return self._s[3066]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3064]!, self._r[3064]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3067]!, self._r[3067]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[3065]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[3066]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3067]! } + public var Cache_ClearCache: String { return self._s[3068]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[3069]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[3070]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3071]!, self._r[3071]!, [_0]) + return formatWithArgumentRanges(self._s[3074]!, self._r[3074]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3073]!, self._r[3073]!, [_0]) + return formatWithArgumentRanges(self._s[3076]!, self._r[3076]!, [_0]) } - public var LocalGroup_Text: String { return self._s[3074]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3075]! } - public var SocksProxySetup_TypeSocks: String { return self._s[3076]! } - public var ChatList_UnarchiveAction: String { return self._s[3077]! } - public var AutoNightTheme_Title: String { return self._s[3078]! } - public var InstantPage_FeedbackButton: String { return self._s[3079]! } - public var Passport_FieldAddress: String { return self._s[3080]! } + public var LocalGroup_Text: String { return self._s[3077]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[3078]! } + public var SocksProxySetup_TypeSocks: String { return self._s[3079]! } + public var ChatList_UnarchiveAction: String { return self._s[3080]! } + public var AutoNightTheme_Title: String { return self._s[3081]! } + public var InstantPage_FeedbackButton: String { return self._s[3082]! } + public var Passport_FieldAddress: String { return self._s[3083]! } public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3081]!, self._r[3081]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3084]!, self._r[3084]!, [_1, _2]) } - public var Month_ShortMarch: String { return self._s[3082]! } + public var Month_ShortMarch: String { return self._s[3085]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3083]!, self._r[3083]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3086]!, self._r[3086]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3084]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3085]! } - public var Passport_FloodError: String { return self._s[3086]! } - public var SecretGif_Title: String { return self._s[3087]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3088]! } - public var ChatList_Context_UnhideArchive: String { return self._s[3089]! } - public var Passport_Language_th: String { return self._s[3091]! } - public var Passport_Address_Address: String { return self._s[3092]! } - public var Login_InvalidLastNameError: String { return self._s[3093]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[3094]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[3095]! } - public var ChatList_Context_Archive: String { return self._s[3096]! } - public var SettingsSearch_FAQ: String { return self._s[3097]! } - public var ShareMenu_Send: String { return self._s[3098]! } - public var WallpaperSearch_ColorYellow: String { return self._s[3100]! } - public var Month_GenNovember: String { return self._s[3102]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3104]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[3087]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[3088]! } + public var Passport_FloodError: String { return self._s[3089]! } + public var SecretGif_Title: String { return self._s[3090]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[3091]! } + public var ChatList_Context_UnhideArchive: String { return self._s[3092]! } + public var Passport_Language_th: String { return self._s[3094]! } + public var Passport_Address_Address: String { return self._s[3095]! } + public var Login_InvalidLastNameError: String { return self._s[3096]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[3097]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[3098]! } + public var ChatList_Context_Archive: String { return self._s[3099]! } + public var SettingsSearch_FAQ: String { return self._s[3100]! } + public var ShareMenu_Send: String { return self._s[3101]! } + public var WallpaperSearch_ColorYellow: String { return self._s[3103]! } + public var Month_GenNovember: String { return self._s[3105]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3107]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3105]!, self._r[3105]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3108]!, self._r[3108]!, [_1, _2]) } - public var Conversation_SwipeToReplyHintText: String { return self._s[3106]! } - public var Checkout_Email: String { return self._s[3107]! } - public var NotificationsSound_Tritone: String { return self._s[3108]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[3110]! } - public var Wallet_ContextMenuCopy: String { return self._s[3112]! } + public var Conversation_SwipeToReplyHintText: String { return self._s[3109]! } + public var Checkout_Email: String { return self._s[3110]! } + public var NotificationsSound_Tritone: String { return self._s[3111]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[3113]! } + public var Wallet_ContextMenuCopy: String { return self._s[3115]! } public func Wallet_Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3114]!, self._r[3114]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3117]!, self._r[3117]!, [_1, _2, _3]) } - public var Appearance_TextSize_Automatic: String { return self._s[3115]! } + public var Appearance_TextSize_Automatic: String { return self._s[3118]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3116]!, self._r[3116]!, [_1]) + return formatWithArgumentRanges(self._s[3119]!, self._r[3119]!, [_1]) } public func StickerPackActionInfo_AddedText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3117]!, self._r[3117]!, [_0]) + return formatWithArgumentRanges(self._s[3120]!, self._r[3120]!, [_0]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[3118]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[3121]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3119]!, self._r[3119]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[3122]!, self._r[3122]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[3120]! } - public var Notification_Exceptions_Add: String { return self._s[3121]! } - public var DialogList_You: String { return self._s[3122]! } - public var MediaPicker_Send: String { return self._s[3125]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3126]! } - public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3127]! } - public var Call_AudioRouteSpeaker: String { return self._s[3128]! } - public var Watch_UserInfo_Title: String { return self._s[3129]! } - public var VoiceOver_Chat_PollFinalResults: String { return self._s[3130]! } - public var Appearance_AccentColor: String { return self._s[3132]! } + public var ChatList_UndoArchiveTitle: String { return self._s[3123]! } + public var Notification_Exceptions_Add: String { return self._s[3124]! } + public var DialogList_You: String { return self._s[3125]! } + public var MediaPicker_Send: String { return self._s[3128]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3129]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[3130]! } + public var Call_AudioRouteSpeaker: String { return self._s[3131]! } + public var Watch_UserInfo_Title: String { return self._s[3132]! } + public var VoiceOver_Chat_PollFinalResults: String { return self._s[3133]! } + public var Appearance_AccentColor: String { return self._s[3135]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3133]!, self._r[3133]!, [_0]) + return formatWithArgumentRanges(self._s[3136]!, self._r[3136]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3134]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[3137]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3135]!, self._r[3135]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3138]!, self._r[3138]!, [_1, _2]) } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[3136]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[3137]! } - public var Notification_CallOutgoing: String { return self._s[3138]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3139]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3140]! } - public var Call_RecordingDisabledMessage: String { return self._s[3141]! } - public var Message_Game: String { return self._s[3142]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[3143]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3144]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3145]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3146]! } - public var Date_DialogDateFormat: String { return self._s[3148]! } - public var WallpaperColors_SetCustomColor: String { return self._s[3149]! } - public var Notifications_InAppNotifications: String { return self._s[3150]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[3139]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[3140]! } + public var Notification_CallOutgoing: String { return self._s[3141]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3142]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[3143]! } + public var Call_RecordingDisabledMessage: String { return self._s[3144]! } + public var Message_Game: String { return self._s[3145]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[3146]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3147]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[3148]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[3149]! } + public var Date_DialogDateFormat: String { return self._s[3151]! } + public var WallpaperColors_SetCustomColor: String { return self._s[3152]! } + public var Notifications_InAppNotifications: String { return self._s[3153]! } public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3151]!, self._r[3151]!, [_0]) - } - public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3152]!, self._r[3152]!, [_1, _2]) - } - public var NewContact_Title: String { return self._s[3153]! } - public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3154]!, self._r[3154]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[3155]! } + public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3155]!, self._r[3155]!, [_1, _2]) + } + public var NewContact_Title: String { return self._s[3156]! } + public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3157]!, self._r[3157]!, [_0]) + } + public var Conversation_ViewContactDetails: String { return self._s[3158]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3157]!, self._r[3157]!, [_1]) + return formatWithArgumentRanges(self._s[3160]!, self._r[3160]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3158]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[3159]! } - public var PrivacySettings_Title: String { return self._s[3160]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3163]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[3164]! } - public var VoiceOver_Chat_ContactEmail: String { return self._s[3165]! } - public var Contacts_PhoneNumber: String { return self._s[3166]! } - public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3168]! } - public var Map_ShowPlaces: String { return self._s[3169]! } - public var ChatAdmins_Title: String { return self._s[3170]! } - public var InstantPage_Reference: String { return self._s[3172]! } - public var Wallet_Info_Updating: String { return self._s[3173]! } - public var ReportGroupLocation_Text: String { return self._s[3174]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[3161]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[3162]! } + public var PrivacySettings_Title: String { return self._s[3163]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[3166]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[3167]! } + public var VoiceOver_Chat_ContactEmail: String { return self._s[3168]! } + public var Contacts_PhoneNumber: String { return self._s[3169]! } + public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[3171]! } + public var Map_ShowPlaces: String { return self._s[3172]! } + public var ChatAdmins_Title: String { return self._s[3173]! } + public var InstantPage_Reference: String { return self._s[3175]! } + public var Wallet_Info_Updating: String { return self._s[3176]! } + public var ReportGroupLocation_Text: String { return self._s[3177]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3175]!, self._r[3175]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3178]!, self._r[3178]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[3176]! } - public var Watch_UserInfo_Block: String { return self._s[3177]! } - public var ChatSettings_Stickers: String { return self._s[3178]! } - public var ChatSettings_DownloadInBackground: String { return self._s[3179]! } - public var Appearance_ThemeCarouselTintedNight: String { return self._s[3180]! } + public var Camera_FlashOff: String { return self._s[3179]! } + public var Watch_UserInfo_Block: String { return self._s[3180]! } + public var ChatSettings_Stickers: String { return self._s[3181]! } + public var ChatSettings_DownloadInBackground: String { return self._s[3182]! } + public var Appearance_ThemeCarouselTintedNight: String { return self._s[3183]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3181]!, self._r[3181]!, [_0]) + return formatWithArgumentRanges(self._s[3184]!, self._r[3184]!, [_0]) } - public var Settings_ViewPhoto: String { return self._s[3182]! } - public var Login_CheckOtherSessionMessages: String { return self._s[3183]! } - public var AutoDownloadSettings_Cellular: String { return self._s[3184]! } - public var Wallet_Created_ExportErrorTitle: String { return self._s[3185]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3186]! } - public var VoiceOver_MessageContextShare: String { return self._s[3187]! } + public var Settings_ViewPhoto: String { return self._s[3185]! } + public var Login_CheckOtherSessionMessages: String { return self._s[3186]! } + public var AutoDownloadSettings_Cellular: String { return self._s[3187]! } + public var Wallet_Created_ExportErrorTitle: String { return self._s[3188]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[3189]! } + public var VoiceOver_MessageContextShare: String { return self._s[3190]! } public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3189]!, self._r[3189]!, [_0]) - } - public var Privacy_DeleteDrafts: String { return self._s[3190]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3191]! } - public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3192]!, self._r[3192]!, [_0]) } - public var DialogList_SavedMessagesHelp: String { return self._s[3193]! } - public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3194]! } - public var DialogList_SavedMessages: String { return self._s[3195]! } - public var GroupInfo_UpgradeButton: String { return self._s[3196]! } - public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3198]! } - public var DialogList_Pin: String { return self._s[3199]! } + public var Privacy_DeleteDrafts: String { return self._s[3193]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[3194]! } + public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3195]!, self._r[3195]!, [_0]) + } + public var DialogList_SavedMessagesHelp: String { return self._s[3196]! } + public var Wallet_SecureStorageNotAvailable_Title: String { return self._s[3197]! } + public var DialogList_SavedMessages: String { return self._s[3198]! } + public var GroupInfo_UpgradeButton: String { return self._s[3199]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[3201]! } + public var DialogList_Pin: String { return self._s[3202]! } public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3200]!, self._r[3200]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3203]!, self._r[3203]!, [_0, _1]) } public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3201]!, self._r[3201]!, [_0]) + return formatWithArgumentRanges(self._s[3204]!, self._r[3204]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[3202]! } - public var UserInfo_NotificationsDisable: String { return self._s[3203]! } - public var Conversation_ContextMenuCancelEditing: String { return self._s[3204]! } - public var Paint_Outlined: String { return self._s[3205]! } - public var Activity_PlayingGame: String { return self._s[3206]! } - public var SearchImages_NoImagesFound: String { return self._s[3207]! } - public var SocksProxySetup_ProxyType: String { return self._s[3208]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[3210]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[3211]! } - public var Settings_AppLanguage: String { return self._s[3212]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[3213]! } - public var Common_ChoosePhoto: String { return self._s[3214]! } - public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3215]! } - public var CallFeedback_ReasonEcho: String { return self._s[3216]! } + public var Notification_Exceptions_AlwaysOn: String { return self._s[3205]! } + public var UserInfo_NotificationsDisable: String { return self._s[3206]! } + public var Conversation_ContextMenuCancelEditing: String { return self._s[3207]! } + public var Paint_Outlined: String { return self._s[3208]! } + public var Activity_PlayingGame: String { return self._s[3209]! } + public var SearchImages_NoImagesFound: String { return self._s[3210]! } + public var SocksProxySetup_ProxyType: String { return self._s[3211]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[3213]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[3214]! } + public var Settings_AppLanguage: String { return self._s[3215]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[3216]! } + public var Common_ChoosePhoto: String { return self._s[3217]! } + public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[3218]! } + public var CallFeedback_ReasonEcho: String { return self._s[3219]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3217]!, self._r[3217]!, [_1]) + return formatWithArgumentRanges(self._s[3220]!, self._r[3220]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[3218]! } - public var PollResults_Collapse: String { return self._s[3219]! } - public var Activity_UploadingVideo: String { return self._s[3220]! } - public var Conversation_WalletRequiredNotNow: String { return self._s[3221]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3222]! } - public var NetworkUsageSettings_Wifi: String { return self._s[3223]! } - public var VoiceOver_Editing_ClearText: String { return self._s[3224]! } - public var PUSH_SENDER_YOU: String { return self._s[3225]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[3226]! } - public var Checkout_PayWithTouchId: String { return self._s[3227]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3228]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[3221]! } + public var PollResults_Collapse: String { return self._s[3222]! } + public var Activity_UploadingVideo: String { return self._s[3223]! } + public var Conversation_WalletRequiredNotNow: String { return self._s[3224]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3225]! } + public var NetworkUsageSettings_Wifi: String { return self._s[3226]! } + public var VoiceOver_Editing_ClearText: String { return self._s[3227]! } + public var PUSH_SENDER_YOU: String { return self._s[3228]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[3229]! } + public var Checkout_PayWithTouchId: String { return self._s[3230]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[3231]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3230]!, self._r[3230]!, [_1]) - } - public var Notifications_ExceptionsNone: String { return self._s[3231]! } - public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3232]!, self._r[3232]!, [_0]) - } - public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3233]!, self._r[3233]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[3235]! } - public var Passport_Address_Region: String { return self._s[3238]! } - public var ChatList_DeleteChat: String { return self._s[3239]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[3240]! } - public var PhotoEditor_TiltShift: String { return self._s[3241]! } - public var Settings_FAQ_URL: String { return self._s[3242]! } - public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3243]! } - public var Passport_Language_sl: String { return self._s[3244]! } - public var Settings_PrivacySettings: String { return self._s[3246]! } - public var SharedMedia_TitleLink: String { return self._s[3247]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[3248]! } - public var Settings_SetProfilePhoto: String { return self._s[3249]! } - public var Channel_About_Help: String { return self._s[3250]! } - public var Contacts_PermissionsEnable: String { return self._s[3251]! } - public var Wallet_Sending_Title: String { return self._s[3252]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3253]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[3254]! } - public var CallFeedback_ReasonInterruption: String { return self._s[3256]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[3257]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3258]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3259]! } - public var OldChannels_Title: String { return self._s[3260]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[3261]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[3263]! } - public var Map_OpenInYandexMaps: String { return self._s[3265]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3266]! } - public var VoiceOver_MessageContextReply: String { return self._s[3267]! } - public var PhotoEditor_SaturationTool: String { return self._s[3269]! } + public var Notifications_ExceptionsNone: String { return self._s[3234]! } + public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3235]!, self._r[3235]!, [_0]) + } + public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3236]!, self._r[3236]!, [_1]) + } + public var AuthSessions_IncompleteAttempts: String { return self._s[3238]! } + public var Passport_Address_Region: String { return self._s[3241]! } + public var ChatList_DeleteChat: String { return self._s[3242]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[3243]! } + public var PhotoEditor_TiltShift: String { return self._s[3244]! } + public var Settings_FAQ_URL: String { return self._s[3245]! } + public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[3246]! } + public var Passport_Language_sl: String { return self._s[3247]! } + public var Settings_PrivacySettings: String { return self._s[3249]! } + public var SharedMedia_TitleLink: String { return self._s[3250]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[3251]! } + public var Settings_SetProfilePhoto: String { return self._s[3252]! } + public var Channel_About_Help: String { return self._s[3253]! } + public var Contacts_PermissionsEnable: String { return self._s[3254]! } + public var Wallet_Sending_Title: String { return self._s[3255]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[3256]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[3257]! } + public var CallFeedback_ReasonInterruption: String { return self._s[3259]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[3260]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[3261]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[3262]! } + public var OldChannels_Title: String { return self._s[3263]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[3264]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[3266]! } + public var Map_OpenInYandexMaps: String { return self._s[3268]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[3269]! } + public var VoiceOver_MessageContextReply: String { return self._s[3270]! } + public var PhotoEditor_SaturationTool: String { return self._s[3272]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3270]!, self._r[3270]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3273]!, self._r[3273]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3271]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3272]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3273]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[3274]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3275]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[3276]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3274]!, self._r[3274]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3277]!, self._r[3277]!, [_1, "\(_2)"]) } - public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3275]! } - public var Channel_Username_InvalidTooShort: String { return self._s[3277]! } - public var SettingsSearch_Synonyms_Wallet: String { return self._s[3278]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[3278]! } + public var Channel_Username_InvalidTooShort: String { return self._s[3280]! } + public var SettingsSearch_Synonyms_Wallet: String { return self._s[3281]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3279]!, self._r[3279]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3282]!, self._r[3282]!, [_1, _2]) } - public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3280]! } + public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3283]! } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3281]!, self._r[3281]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3284]!, self._r[3284]!, [_1, _2, _3]) } - public var WallpaperPreview_PatternTitle: String { return self._s[3282]! } - public var GroupInfo_PublicLinkAdd: String { return self._s[3283]! } - public var Passport_PassportInformation: String { return self._s[3286]! } - public var Theme_Unsupported: String { return self._s[3287]! } - public var WatchRemote_AlertTitle: String { return self._s[3288]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3289]! } - public var ConvertToSupergroup_HelpText: String { return self._s[3291]! } + public var WallpaperPreview_PatternTitle: String { return self._s[3285]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[3286]! } + public var Passport_PassportInformation: String { return self._s[3289]! } + public var Theme_Unsupported: String { return self._s[3290]! } + public var WatchRemote_AlertTitle: String { return self._s[3291]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[3292]! } + public var ConvertToSupergroup_HelpText: String { return self._s[3294]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3292]!, self._r[3292]!, [_0]) + return formatWithArgumentRanges(self._s[3295]!, self._r[3295]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3293]!, self._r[3293]!, [_1]) + return formatWithArgumentRanges(self._s[3296]!, self._r[3296]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3294]! } - public var Wallet_Navigation_Done: String { return self._s[3296]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3297]! } - public var AccessDenied_CameraDisabled: String { return self._s[3298]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[3297]! } + public var Wallet_Navigation_Done: String { return self._s[3299]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3300]! } + public var AccessDenied_CameraDisabled: String { return self._s[3301]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3299]!, self._r[3299]!, [_0]) + return formatWithArgumentRanges(self._s[3302]!, self._r[3302]!, [_0]) } - public var ClearCache_Forever: String { return self._s[3300]! } - public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3301]! } - public var CreatePoll_Quiz: String { return self._s[3302]! } - public var PhotoEditor_ContrastTool: String { return self._s[3305]! } + public var ClearCache_Forever: String { return self._s[3303]! } + public var AuthSessions_AddDeviceIntro_Title: String { return self._s[3304]! } + public var CreatePoll_Quiz: String { return self._s[3305]! } + public var PhotoEditor_ContrastTool: String { return self._s[3308]! } public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3306]!, self._r[3306]!, [_1]) + return formatWithArgumentRanges(self._s[3309]!, self._r[3309]!, [_1]) } - public var DialogList_Draft: String { return self._s[3307]! } - public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3308]! } - public var Privacy_TopPeersDelete: String { return self._s[3310]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[3311]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3312]! } - public var WebSearch_RecentSectionClear: String { return self._s[3313]! } - public var EditTheme_ErrorInvalidCharacters: String { return self._s[3314]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[3316]! } - public var Common_Done: String { return self._s[3318]! } - public var Shortcut_SwitchAccount: String { return self._s[3319]! } - public var AuthSessions_EmptyText: String { return self._s[3320]! } - public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3321]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[3322]! } - public var Tour_Title5: String { return self._s[3323]! } - public var Wallet_Settings_Title: String { return self._s[3324]! } + public var DialogList_Draft: String { return self._s[3310]! } + public var Wallet_Configuration_BlockchainIdInfo: String { return self._s[3311]! } + public var Privacy_TopPeersDelete: String { return self._s[3313]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[3314]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3315]! } + public var WebSearch_RecentSectionClear: String { return self._s[3316]! } + public var EditTheme_ErrorInvalidCharacters: String { return self._s[3317]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[3319]! } + public var Common_Done: String { return self._s[3321]! } + public var Shortcut_SwitchAccount: String { return self._s[3322]! } + public var AuthSessions_EmptyText: String { return self._s[3323]! } + public var Wallet_Configuration_BlockchainNameChangedTitle: String { return self._s[3324]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[3325]! } + public var Tour_Title5: String { return self._s[3326]! } + public var Wallet_Settings_Title: String { return self._s[3327]! } public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3325]!, self._r[3325]!, [_0]) + return formatWithArgumentRanges(self._s[3328]!, self._r[3328]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3326]! } - public var Conversation_LinkDialogSave: String { return self._s[3327]! } - public var GroupInfo_ActionRestrict: String { return self._s[3328]! } - public var Checkout_Title: String { return self._s[3329]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3331]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[3333]! } - public var Notification_RenamedGroup: String { return self._s[3334]! } - public var PeopleNearby_Groups: String { return self._s[3335]! } - public var Checkout_PayWithFaceId: String { return self._s[3336]! } - public var Channel_BanList_BlockedTitle: String { return self._s[3337]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3339]! } - public var Checkout_WebConfirmation_Title: String { return self._s[3340]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[3341]! } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[3329]! } + public var Conversation_LinkDialogSave: String { return self._s[3330]! } + public var GroupInfo_ActionRestrict: String { return self._s[3331]! } + public var Checkout_Title: String { return self._s[3332]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[3334]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[3336]! } + public var Notification_RenamedGroup: String { return self._s[3337]! } + public var PeopleNearby_Groups: String { return self._s[3338]! } + public var Checkout_PayWithFaceId: String { return self._s[3339]! } + public var Channel_BanList_BlockedTitle: String { return self._s[3340]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[3342]! } + public var Checkout_WebConfirmation_Title: String { return self._s[3343]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[3344]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3342]!, self._r[3342]!, [_0]) + return formatWithArgumentRanges(self._s[3345]!, self._r[3345]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[3344]! } + public var Profile_AddToExisting: String { return self._s[3347]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3345]!, self._r[3345]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3348]!, self._r[3348]!, [_0, _1]) } - public var Cache_Files: String { return self._s[3347]! } - public var Permissions_PrivacyPolicy: String { return self._s[3348]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[3349]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3350]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[3352]! } - public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3354]! } - public var Calls_NoCallsPlaceholder: String { return self._s[3355]! } + public var Cache_Files: String { return self._s[3350]! } + public var Permissions_PrivacyPolicy: String { return self._s[3351]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[3352]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[3353]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[3355]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3357]! } + public var Calls_NoCallsPlaceholder: String { return self._s[3358]! } public func Wallet_Receive_ShareInvoiceUrlInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3356]!, self._r[3356]!, [_0]) + return formatWithArgumentRanges(self._s[3359]!, self._r[3359]!, [_0]) } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3357]! } - public var VoiceOver_AttachMedia: String { return self._s[3360]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3361]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[3360]! } + public var VoiceOver_AttachMedia: String { return self._s[3363]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[3364]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3362]!, self._r[3362]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3365]!, self._r[3365]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3363]! } - public var Conversation_SetReminder_Title: String { return self._s[3364]! } - public var Passport_FieldAddressHelp: String { return self._s[3365]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3366]! } - public var PUSH_REMINDER_TITLE: String { return self._s[3367]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[3366]! } + public var Conversation_SetReminder_Title: String { return self._s[3367]! } + public var Passport_FieldAddressHelp: String { return self._s[3368]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3369]! } + public var PUSH_REMINDER_TITLE: String { return self._s[3370]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3368]!, self._r[3368]!, [_0]) + return formatWithArgumentRanges(self._s[3371]!, self._r[3371]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[3369]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[3370]! } - public var Login_UnknownError: String { return self._s[3371]! } - public var Group_UpgradeNoticeText2: String { return self._s[3374]! } - public var Watch_Compose_AddContact: String { return self._s[3375]! } - public var ClearCache_StorageServiceFiles: String { return self._s[3376]! } - public var Web_Error: String { return self._s[3377]! } - public var Gif_Search: String { return self._s[3378]! } - public var Profile_MessageLifetime1h: String { return self._s[3379]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3380]! } - public var Channel_Username_CheckingUsername: String { return self._s[3381]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[3382]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[3383]! } - public var Channel_AboutItem: String { return self._s[3384]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3386]! } - public var VoiceOver_Chat_VoiceMessage: String { return self._s[3387]! } - public var GroupInfo_SharedMedia: String { return self._s[3388]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[3372]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[3373]! } + public var Login_UnknownError: String { return self._s[3374]! } + public var Group_UpgradeNoticeText2: String { return self._s[3377]! } + public var Watch_Compose_AddContact: String { return self._s[3378]! } + public var ClearCache_StorageServiceFiles: String { return self._s[3379]! } + public var Web_Error: String { return self._s[3380]! } + public var Gif_Search: String { return self._s[3381]! } + public var Profile_MessageLifetime1h: String { return self._s[3382]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[3383]! } + public var Channel_Username_CheckingUsername: String { return self._s[3384]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[3385]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[3386]! } + public var Channel_AboutItem: String { return self._s[3387]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[3389]! } + public var VoiceOver_Chat_VoiceMessage: String { return self._s[3390]! } + public var GroupInfo_SharedMedia: String { return self._s[3391]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3389]!, self._r[3389]!, [_1]) + return formatWithArgumentRanges(self._s[3392]!, self._r[3392]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[3390]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[3393]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3391]!, self._r[3391]!, [_1]) + return formatWithArgumentRanges(self._s[3394]!, self._r[3394]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[3392]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3393]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[3394]! } - public var CreatePoll_AddOption: String { return self._s[3395]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3396]! } - public var Group_UpgradeNoticeHeader: String { return self._s[3397]! } - public var Channel_Management_AddModerator: String { return self._s[3398]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[3399]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[3400]! } - public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3401]! } - public var Theme_Colors_Background: String { return self._s[3402]! } - public var NotificationsSound_Hello: String { return self._s[3404]! } - public var SocksProxySetup_SavedProxies: String { return self._s[3405]! } - public var Channel_Stickers_Placeholder: String { return self._s[3407]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[3395]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[3396]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[3397]! } + public var CreatePoll_AddOption: String { return self._s[3398]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[3399]! } + public var Group_UpgradeNoticeHeader: String { return self._s[3400]! } + public var Channel_Management_AddModerator: String { return self._s[3401]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[3402]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[3403]! } + public var Wallet_Info_RefreshErrorNetworkText: String { return self._s[3404]! } + public var Theme_Colors_Background: String { return self._s[3405]! } + public var NotificationsSound_Hello: String { return self._s[3407]! } + public var SocksProxySetup_SavedProxies: String { return self._s[3408]! } + public var Channel_Stickers_Placeholder: String { return self._s[3410]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3408]!, self._r[3408]!, [_0]) + return formatWithArgumentRanges(self._s[3411]!, self._r[3411]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3409]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[3410]! } - public var ContactInfo_BirthdayLabel: String { return self._s[3411]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3412]! } - public var AutoDownloadSettings_Channels: String { return self._s[3413]! } - public var Passport_Language_mn: String { return self._s[3414]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[3417]! } - public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3418]! } - public var Passport_Language_ja: String { return self._s[3420]! } - public var Settings_About_Title: String { return self._s[3421]! } - public var Settings_NotificationsAndSounds: String { return self._s[3422]! } - public var ChannelInfo_DeleteGroup: String { return self._s[3423]! } - public var Settings_BlockedUsers: String { return self._s[3424]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3412]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[3413]! } + public var ContactInfo_BirthdayLabel: String { return self._s[3414]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[3415]! } + public var AutoDownloadSettings_Channels: String { return self._s[3416]! } + public var Passport_Language_mn: String { return self._s[3417]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[3420]! } + public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[3421]! } + public var Passport_Language_ja: String { return self._s[3423]! } + public var Settings_About_Title: String { return self._s[3424]! } + public var Settings_NotificationsAndSounds: String { return self._s[3425]! } + public var ChannelInfo_DeleteGroup: String { return self._s[3426]! } + public var Settings_BlockedUsers: String { return self._s[3427]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3425]!, self._r[3425]!, [_0]) + return formatWithArgumentRanges(self._s[3428]!, self._r[3428]!, [_0]) } - public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3426]! } - public var Wallet_Weekday_Today: String { return self._s[3427]! } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[3428]! } - public var Widget_ApplicationLocked: String { return self._s[3429]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[3430]! } - public var Channel_Username_Title: String { return self._s[3431]! } + public var EditTheme_Create_Preview_OutgoingText: String { return self._s[3429]! } + public var Wallet_Weekday_Today: String { return self._s[3430]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[3431]! } + public var Widget_ApplicationLocked: String { return self._s[3432]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[3433]! } + public var Channel_Username_Title: String { return self._s[3434]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3432]!, self._r[3432]!, [_0]) + return formatWithArgumentRanges(self._s[3435]!, self._r[3435]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[3434]! } - public var AppleWatch_Title: String { return self._s[3435]! } - public var Activity_RecordingVideoMessage: String { return self._s[3436]! } + public var AttachmentMenu_File: String { return self._s[3437]! } + public var AppleWatch_Title: String { return self._s[3438]! } + public var Activity_RecordingVideoMessage: String { return self._s[3439]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3437]!, self._r[3437]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3440]!, self._r[3440]!, [_1, _2]) } - public var Theme_Colors_Messages: String { return self._s[3438]! } - public var Weekday_Saturday: String { return self._s[3439]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3440]! } - public var Profile_CreateEncryptedChatError: String { return self._s[3441]! } - public var Common_Next: String { return self._s[3443]! } - public var Channel_Stickers_YourStickers: String { return self._s[3445]! } - public var Message_Theme: String { return self._s[3446]! } - public var Call_AudioRouteHeadphones: String { return self._s[3447]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3449]! } - public var Watch_Contacts_NoResults: String { return self._s[3451]! } - public var PhotoEditor_TintTool: String { return self._s[3454]! } - public var LoginPassword_ResetAccount: String { return self._s[3456]! } - public var Settings_SavedMessages: String { return self._s[3457]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3458]! } - public var Bot_GenericSupportStatus: String { return self._s[3459]! } - public var StickerPack_Add: String { return self._s[3460]! } - public var Checkout_TotalAmount: String { return self._s[3461]! } - public var Your_cards_number_is_invalid: String { return self._s[3462]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3463]! } - public var VoiceOver_Chat_VideoMessage: String { return self._s[3464]! } + public var Theme_Colors_Messages: String { return self._s[3441]! } + public var Weekday_Saturday: String { return self._s[3442]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[3443]! } + public var Profile_CreateEncryptedChatError: String { return self._s[3444]! } + public var Common_Next: String { return self._s[3446]! } + public var Channel_Stickers_YourStickers: String { return self._s[3448]! } + public var Message_Theme: String { return self._s[3449]! } + public var Call_AudioRouteHeadphones: String { return self._s[3450]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3452]! } + public var Watch_Contacts_NoResults: String { return self._s[3454]! } + public var PhotoEditor_TintTool: String { return self._s[3457]! } + public var LoginPassword_ResetAccount: String { return self._s[3459]! } + public var Settings_SavedMessages: String { return self._s[3460]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[3461]! } + public var Bot_GenericSupportStatus: String { return self._s[3462]! } + public var StickerPack_Add: String { return self._s[3463]! } + public var Checkout_TotalAmount: String { return self._s[3464]! } + public var Your_cards_number_is_invalid: String { return self._s[3465]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[3466]! } + public var VoiceOver_Chat_VideoMessage: String { return self._s[3467]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3465]!, self._r[3465]!, [_0]) + return formatWithArgumentRanges(self._s[3468]!, self._r[3468]!, [_0]) } public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3466]!, self._r[3466]!, [_1, _2]) - } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3467]! } - public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3469]!, self._r[3469]!, [_1, _2]) } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[3470]! } + public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3472]!, self._r[3472]!, [_1, _2]) + } public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3470]!, self._r[3470]!, [_0]) + return formatWithArgumentRanges(self._s[3473]!, self._r[3473]!, [_0]) } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[3471]! } - public var StickerPack_Share: String { return self._s[3472]! } - public var Passport_DeleteAddress: String { return self._s[3473]! } - public var Settings_Passport: String { return self._s[3474]! } - public var SharedMedia_EmptyFilesText: String { return self._s[3475]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[3476]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3477]! } - public var Contacts_PermissionsText: String { return self._s[3478]! } - public var Group_Setup_HistoryVisible: String { return self._s[3479]! } - public var Wallet_Month_ShortDecember: String { return self._s[3481]! } - public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3482]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[3483]! } - public var SocksProxySetup_Title: String { return self._s[3484]! } - public var Notification_Mute1h: String { return self._s[3485]! } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[3474]! } + public var StickerPack_Share: String { return self._s[3475]! } + public var Passport_DeleteAddress: String { return self._s[3476]! } + public var Settings_Passport: String { return self._s[3477]! } + public var SharedMedia_EmptyFilesText: String { return self._s[3478]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[3479]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3480]! } + public var Contacts_PermissionsText: String { return self._s[3481]! } + public var Group_Setup_HistoryVisible: String { return self._s[3482]! } + public var Wallet_Month_ShortDecember: String { return self._s[3484]! } + public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3485]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[3486]! } + public var SocksProxySetup_Title: String { return self._s[3487]! } + public var Notification_Mute1h: String { return self._s[3488]! } public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3486]!, self._r[3486]!, [_0]) + return formatWithArgumentRanges(self._s[3489]!, self._r[3489]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3487]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[3490]! } public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3488]!, self._r[3488]!, [_1]) + return formatWithArgumentRanges(self._s[3491]!, self._r[3491]!, [_1]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[3489]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3492]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3494]! } - public var DialogList_NoMessagesText: String { return self._s[3495]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[3496]! } - public var Privacy_Calls_P2PHelp: String { return self._s[3497]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3499]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[3500]! } - public var Common_TakePhotoOrVideo: String { return self._s[3501]! } - public var Wallet_Words_Text: String { return self._s[3502]! } - public var Call_StatusBusy: String { return self._s[3503]! } - public var Conversation_PinnedMessage: String { return self._s[3504]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3505]! } - public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3506]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3507]! } - public var Undo_ChatCleared: String { return self._s[3508]! } - public var AppleWatch_ReplyPresets: String { return self._s[3509]! } - public var Passport_DiscardMessageDescription: String { return self._s[3511]! } - public var Login_NetworkError: String { return self._s[3512]! } + public var FastTwoStepSetup_PasswordSection: String { return self._s[3492]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[3495]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[3497]! } + public var DialogList_NoMessagesText: String { return self._s[3498]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[3499]! } + public var Privacy_Calls_P2PHelp: String { return self._s[3500]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[3502]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[3503]! } + public var Common_TakePhotoOrVideo: String { return self._s[3504]! } + public var Wallet_Words_Text: String { return self._s[3505]! } + public var Call_StatusBusy: String { return self._s[3506]! } + public var Conversation_PinnedMessage: String { return self._s[3507]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[3508]! } + public var Wallet_Configuration_BlockchainNameChangedProceed: String { return self._s[3509]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[3510]! } + public var Undo_ChatCleared: String { return self._s[3511]! } + public var AppleWatch_ReplyPresets: String { return self._s[3512]! } + public var Passport_DiscardMessageDescription: String { return self._s[3514]! } + public var Login_NetworkError: String { return self._s[3515]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3513]!, self._r[3513]!, [_0]) + return formatWithArgumentRanges(self._s[3516]!, self._r[3516]!, [_0]) } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3514]!, self._r[3514]!, [_0]) + return formatWithArgumentRanges(self._s[3517]!, self._r[3517]!, [_0]) } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3515]! } - public var Wallet_WordCheck_ViewWords: String { return self._s[3517]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3518]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3518]! } + public var Wallet_WordCheck_ViewWords: String { return self._s[3520]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[3521]! } public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3520]!, self._r[3520]!, [_0]) + return formatWithArgumentRanges(self._s[3523]!, self._r[3523]!, [_0]) } - public var Call_ConnectionErrorMessage: String { return self._s[3521]! } - public var VoiceOver_Chat_Music: String { return self._s[3522]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3523]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[3525]! } - public var ConversationMedia_Title: String { return self._s[3526]! } - public var EncryptionKey_Title: String { return self._s[3528]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3529]! } - public var Notification_Exceptions_AddException: String { return self._s[3530]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3531]! } - public var Profile_MessageLifetime1m: String { return self._s[3532]! } + public var Call_ConnectionErrorMessage: String { return self._s[3524]! } + public var VoiceOver_Chat_Music: String { return self._s[3525]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[3526]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[3528]! } + public var ConversationMedia_Title: String { return self._s[3529]! } + public var EncryptionKey_Title: String { return self._s[3531]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[3532]! } + public var Notification_Exceptions_AddException: String { return self._s[3533]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[3534]! } + public var Profile_MessageLifetime1m: String { return self._s[3535]! } public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3533]!, self._r[3533]!, [_1]) + return formatWithArgumentRanges(self._s[3536]!, self._r[3536]!, [_1]) } - public var Month_GenMay: String { return self._s[3534]! } + public var Month_GenMay: String { return self._s[3537]! } public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3535]!, self._r[3535]!, [_0]) + return formatWithArgumentRanges(self._s[3538]!, self._r[3538]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[3536]! } - public var Wallet_Send_AddressInfo: String { return self._s[3537]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3538]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[3539]! } + public var PeopleNearby_Users: String { return self._s[3539]! } + public var Wallet_Send_AddressInfo: String { return self._s[3540]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[3541]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[3542]! } public func Wallet_Updated_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3541]!, self._r[3541]!, [_0]) + return formatWithArgumentRanges(self._s[3544]!, self._r[3544]!, [_0]) } - public var Conversation_EmptyPlaceholder: String { return self._s[3542]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[3543]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[3544]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3545]! } - public var Camera_TapAndHoldForVideo: String { return self._s[3546]! } - public var Channel_JoinChannel: String { return self._s[3548]! } - public var Appearance_Animations: String { return self._s[3551]! } + public var Conversation_EmptyPlaceholder: String { return self._s[3545]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[3546]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[3547]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[3548]! } + public var Camera_TapAndHoldForVideo: String { return self._s[3549]! } + public var Channel_JoinChannel: String { return self._s[3551]! } + public var Appearance_Animations: String { return self._s[3554]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3552]!, self._r[3552]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3555]!, self._r[3555]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[3554]! } - public var Appearance_ShareTheme: String { return self._s[3555]! } - public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3556]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[3558]! } - public var StickerPackActionInfo_RemovedTitle: String { return self._s[3559]! } - public var Passport_Address_Street: String { return self._s[3560]! } - public var Conversation_AddContact: String { return self._s[3561]! } - public var Login_PhonePlaceholder: String { return self._s[3562]! } - public var Channel_Members_InviteLink: String { return self._s[3564]! } - public var Bot_Stop: String { return self._s[3565]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3567]! } - public var Notification_PassportValueAddress: String { return self._s[3568]! } - public var Month_ShortJuly: String { return self._s[3569]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3570]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[3571]! } - public var Passport_Identity_ReverseSide: String { return self._s[3572]! } - public var Watch_Stickers_Recents: String { return self._s[3575]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3577]! } - public var Map_SendThisLocation: String { return self._s[3578]! } + public var Stickers_GroupStickers: String { return self._s[3557]! } + public var Appearance_ShareTheme: String { return self._s[3558]! } + public var TwoFactorSetup_Hint_Placeholder: String { return self._s[3559]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[3561]! } + public var StickerPackActionInfo_RemovedTitle: String { return self._s[3562]! } + public var Passport_Address_Street: String { return self._s[3563]! } + public var Conversation_AddContact: String { return self._s[3564]! } + public var Login_PhonePlaceholder: String { return self._s[3565]! } + public var Channel_Members_InviteLink: String { return self._s[3567]! } + public var Bot_Stop: String { return self._s[3568]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3570]! } + public var Notification_PassportValueAddress: String { return self._s[3571]! } + public var Month_ShortJuly: String { return self._s[3572]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3573]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3574]! } + public var Passport_Identity_ReverseSide: String { return self._s[3575]! } + public var Watch_Stickers_Recents: String { return self._s[3578]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3580]! } + public var Map_SendThisLocation: String { return self._s[3581]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3579]!, self._r[3579]!, [_0]) + return formatWithArgumentRanges(self._s[3582]!, self._r[3582]!, [_0]) } public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3580]!, self._r[3580]!, [_0]) - } - public var ConvertToSupergroup_Note: String { return self._s[3581]! } - public var Wallet_Intro_NotNow: String { return self._s[3582]! } - public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3583]!, self._r[3583]!, [_0]) } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3584]! } + public var ConvertToSupergroup_Note: String { return self._s[3584]! } + public var Wallet_Intro_NotNow: String { return self._s[3585]! } + public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3586]!, self._r[3586]!, [_0]) + } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3587]! } public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3585]!, self._r[3585]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3588]!, self._r[3588]!, [_0, _1]) } - public var Login_CallRequestState3: String { return self._s[3587]! } - public var Wallpaper_SearchShort: String { return self._s[3588]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3590]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3591]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3592]! } + public var Login_CallRequestState3: String { return self._s[3590]! } + public var Wallpaper_SearchShort: String { return self._s[3591]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3593]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3594]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3595]! } public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3593]!, self._r[3593]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3596]!, self._r[3596]!, [_1, _2]) } - public var Channel_AdminLogFilter_Title: String { return self._s[3594]! } - public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3596]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3599]! } + public var Channel_AdminLogFilter_Title: String { return self._s[3597]! } + public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[3599]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3602]! } public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3600]!, self._r[3600]!, [_0]) - } - public var Passport_CorrectErrors: String { return self._s[3601]! } - public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3602]! } - public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3603]!, self._r[3603]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[3604]! } - public var Channel_DiscussionGroup: String { return self._s[3605]! } - public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3606]! } + public var Passport_CorrectErrors: String { return self._s[3604]! } + public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[3605]! } + public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3606]!, self._r[3606]!, [_0]) + } + public var Map_SendMyCurrentLocation: String { return self._s[3607]! } + public var Channel_DiscussionGroup: String { return self._s[3608]! } + public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3609]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3607]!, self._r[3607]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3610]!, self._r[3610]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[3608]! } - public var Permissions_NotificationsText_v0: String { return self._s[3609]! } - public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3610]! } - public var Appearance_AppIcon: String { return self._s[3611]! } - public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3612]! } - public var LoginPassword_FloodError: String { return self._s[3613]! } - public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3615]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3616]! } + public var SharedMedia_SearchNoResults: String { return self._s[3611]! } + public var Permissions_NotificationsText_v0: String { return self._s[3612]! } + public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[3613]! } + public var Appearance_AppIcon: String { return self._s[3614]! } + public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[3615]! } + public var LoginPassword_FloodError: String { return self._s[3616]! } + public var Wallet_Send_OwnAddressAlertProceed: String { return self._s[3618]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3619]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3617]!, self._r[3617]!, [_0]) + return formatWithArgumentRanges(self._s[3620]!, self._r[3620]!, [_0]) } - public var Passport_Language_bn: String { return self._s[3618]! } + public var Passport_Language_bn: String { return self._s[3621]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3619]!, self._r[3619]!, [_0]) - } - public var ChatList_Context_Pin: String { return self._s[3620]! } - public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3621]!, self._r[3621]!, [_0]) - } - public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3622]!, self._r[3622]!, [_0]) } - public var Wallet_Navigation_Close: String { return self._s[3623]! } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3627]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3629]! } - public var Wallet_Month_GenDecember: String { return self._s[3630]! } - public var Contacts_PermissionsAllow: String { return self._s[3631]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3632]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3633]! } - public var WallpaperPreview_Pattern: String { return self._s[3634]! } - public var Paint_Duplicate: String { return self._s[3635]! } - public var Passport_Address_Country: String { return self._s[3636]! } - public var Notification_RenamedChannel: String { return self._s[3638]! } - public var ChatList_Context_Unmute: String { return self._s[3639]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3640]! } - public var Group_MessagePhotoUpdated: String { return self._s[3641]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3642]! } - public var Conversation_ContextMenuBan: String { return self._s[3643]! } - public var TwoStepAuth_EmailSent: String { return self._s[3644]! } - public var MessagePoll_NoVotes: String { return self._s[3645]! } - public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3646]! } - public var Passport_Language_is: String { return self._s[3648]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3650]! } - public var Tour_Text5: String { return self._s[3651]! } + public var ChatList_Context_Pin: String { return self._s[3623]! } + public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3624]!, self._r[3624]!, [_0]) + } + public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3625]!, self._r[3625]!, [_0]) + } + public var Wallet_Navigation_Close: String { return self._s[3626]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3630]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3632]! } + public var Wallet_Month_GenDecember: String { return self._s[3633]! } + public var Contacts_PermissionsAllow: String { return self._s[3634]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3635]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3636]! } + public var WallpaperPreview_Pattern: String { return self._s[3637]! } + public var Paint_Duplicate: String { return self._s[3638]! } + public var Passport_Address_Country: String { return self._s[3639]! } + public var Notification_RenamedChannel: String { return self._s[3641]! } + public var ChatList_Context_Unmute: String { return self._s[3642]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3643]! } + public var Group_MessagePhotoUpdated: String { return self._s[3644]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3645]! } + public var Conversation_ContextMenuBan: String { return self._s[3646]! } + public var TwoStepAuth_EmailSent: String { return self._s[3647]! } + public var MessagePoll_NoVotes: String { return self._s[3648]! } + public var Wallet_Send_ErrorNotEnoughFundsTitle: String { return self._s[3649]! } + public var Passport_Language_is: String { return self._s[3651]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3653]! } + public var Tour_Text5: String { return self._s[3654]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3654]!, self._r[3654]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3657]!, self._r[3657]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3655]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3656]! } + public var Undo_SecretChatDeleted: String { return self._s[3658]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3659]! } public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3657]!, self._r[3657]!, [_0]) + return formatWithArgumentRanges(self._s[3660]!, self._r[3660]!, [_0]) } - public var Forward_ErrorDisabledForChat: String { return self._s[3658]! } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3659]! } - public var Paint_Edit: String { return self._s[3661]! } - public var ScheduledMessages_ReminderNotification: String { return self._s[3663]! } - public var Undo_DeletedGroup: String { return self._s[3665]! } - public var LoginPassword_ForgotPassword: String { return self._s[3666]! } - public var Wallet_WordImport_IncorrectTitle: String { return self._s[3667]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3668]! } + public var Forward_ErrorDisabledForChat: String { return self._s[3661]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3662]! } + public var Paint_Edit: String { return self._s[3664]! } + public var ScheduledMessages_ReminderNotification: String { return self._s[3666]! } + public var Undo_DeletedGroup: String { return self._s[3668]! } + public var LoginPassword_ForgotPassword: String { return self._s[3669]! } + public var Wallet_WordImport_IncorrectTitle: String { return self._s[3670]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3671]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3669]!, self._r[3669]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3672]!, self._r[3672]!, [_0, _1]) } - public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3670]! } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3671]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3672]! } - public var Passport_Language_uz: String { return self._s[3673]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3674]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3675]! } - public var Map_StopLiveLocation: String { return self._s[3677]! } - public var VoiceOver_MessageContextSend: String { return self._s[3679]! } - public var PasscodeSettings_Help: String { return self._s[3680]! } - public var NotificationsSound_Input: String { return self._s[3681]! } - public var Share_Title: String { return self._s[3684]! } - public var LogoutOptions_Title: String { return self._s[3685]! } - public var Wallet_Send_AddressText: String { return self._s[3686]! } - public var Login_TermsOfServiceAgree: String { return self._s[3687]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3688]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3689]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3690]! } - public var EnterPasscode_EnterTitle: String { return self._s[3691]! } + public var AppWallet_TransactionInfo_FeeInfoURL: String { return self._s[3673]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3674]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3675]! } + public var Passport_Language_uz: String { return self._s[3676]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3677]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3678]! } + public var Map_StopLiveLocation: String { return self._s[3680]! } + public var VoiceOver_MessageContextSend: String { return self._s[3682]! } + public var PasscodeSettings_Help: String { return self._s[3683]! } + public var NotificationsSound_Input: String { return self._s[3684]! } + public var Share_Title: String { return self._s[3687]! } + public var LogoutOptions_Title: String { return self._s[3688]! } + public var Wallet_Send_AddressText: String { return self._s[3689]! } + public var Login_TermsOfServiceAgree: String { return self._s[3690]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3691]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3692]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3693]! } + public var EnterPasscode_EnterTitle: String { return self._s[3694]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3692]!, self._r[3692]!, [_0]) - } - public var Settings_CopyPhoneNumber: String { return self._s[3693]! } - public var Conversation_AddToContacts: String { return self._s[3694]! } - public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3695]!, self._r[3695]!, [_0]) } - public var NotificationsSound_Keys: String { return self._s[3696]! } + public var Settings_CopyPhoneNumber: String { return self._s[3696]! } + public var Conversation_AddToContacts: String { return self._s[3697]! } + public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3698]!, self._r[3698]!, [_0]) + } + public var NotificationsSound_Keys: String { return self._s[3699]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3697]!, self._r[3697]!, [_0]) + return formatWithArgumentRanges(self._s[3700]!, self._r[3700]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3698]! } - public var Message_Video: String { return self._s[3699]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3700]! } + public var Notification_MessageLifetime1w: String { return self._s[3701]! } + public var Message_Video: String { return self._s[3702]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3703]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3701]!, self._r[3701]!, [_1]) + return formatWithArgumentRanges(self._s[3704]!, self._r[3704]!, [_1]) } - public var Wallet_Receive_AmountInfo: String { return self._s[3704]! } + public var Wallet_Receive_AmountInfo: String { return self._s[3707]! } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3705]!, self._r[3705]!, [_0]) + return formatWithArgumentRanges(self._s[3708]!, self._r[3708]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3706]!, self._r[3706]!, [_0]) + return formatWithArgumentRanges(self._s[3709]!, self._r[3709]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3707]! } + public var Passport_Language_mk: String { return self._s[3710]! } public func Wallet_Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3708]!, self._r[3708]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3711]!, self._r[3711]!, [_1, _2, _3]) } - public var CreatePoll_CancelConfirmation: String { return self._s[3709]! } - public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3710]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3712]! } - public var PrivacyPolicy_Decline: String { return self._s[3713]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3714]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3715]! } - public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3716]! } - public var Permissions_SiriAllow_v0: String { return self._s[3718]! } - public var Wallet_Month_ShortAugust: String { return self._s[3719]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3720]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3712]! } + public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3713]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3715]! } + public var PrivacyPolicy_Decline: String { return self._s[3716]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3717]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3718]! } + public var AuthSessions_AddDeviceIntro_Action: String { return self._s[3719]! } + public var Permissions_SiriAllow_v0: String { return self._s[3721]! } + public var Wallet_Month_ShortAugust: String { return self._s[3722]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3723]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3721]!, self._r[3721]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3724]!, self._r[3724]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3722]!, self._r[3722]!, [_0]) + return formatWithArgumentRanges(self._s[3725]!, self._r[3725]!, [_0]) } - public var Paint_Regular: String { return self._s[3723]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3724]! } - public var SocksProxySetup_ShareLink: String { return self._s[3725]! } - public var Wallet_Qr_Title: String { return self._s[3726]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3727]! } - public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3729]! } - public var Wallet_Settings_Configuration: String { return self._s[3730]! } - public var GroupInfo_InviteByLink: String { return self._s[3731]! } - public var MessageTimer_Custom: String { return self._s[3732]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3733]! } - public var Conversation_StopQuizConfirmationTitle: String { return self._s[3734]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3736]! } - public var Conversation_SendMessage_SetReminder: String { return self._s[3737]! } - public var VoiceOver_Chat_Selected: String { return self._s[3738]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3739]! } - public var Channel_Username_InvalidTaken: String { return self._s[3740]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3741]! } - public var Wallet_WordCheck_TryAgain: String { return self._s[3742]! } - public var Wallet_Info_TransactionPendingHeader: String { return self._s[3743]! } - public var Settings_ChatBackground: String { return self._s[3744]! } - public var Channel_Subscribers_Title: String { return self._s[3745]! } - public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3746]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3747]! } - public var Watch_ConnectionDescription: String { return self._s[3748]! } - public var OldChannels_NoticeText: String { return self._s[3751]! } - public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3752]! } - public var IntentsSettings_SuggestBy: String { return self._s[3754]! } - public var Theme_ThemeChangedText: String { return self._s[3755]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3756]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3757]! } - public var Wallet_Send_TransactionInProgress: String { return self._s[3758]! } - public var EditProfile_Title: String { return self._s[3759]! } - public var NotificationsSound_Bamboo: String { return self._s[3761]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3763]! } - public var Login_SmsRequestState2: String { return self._s[3764]! } - public var Passport_Language_ar: String { return self._s[3765]! } + public var Paint_Regular: String { return self._s[3726]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3727]! } + public var SocksProxySetup_ShareLink: String { return self._s[3728]! } + public var Wallet_Qr_Title: String { return self._s[3729]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3730]! } + public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3732]! } + public var Wallet_Settings_Configuration: String { return self._s[3733]! } + public var GroupInfo_InviteByLink: String { return self._s[3734]! } + public var MessageTimer_Custom: String { return self._s[3735]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3736]! } + public var Conversation_StopQuizConfirmationTitle: String { return self._s[3737]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3739]! } + public var Conversation_SendMessage_SetReminder: String { return self._s[3740]! } + public var VoiceOver_Chat_Selected: String { return self._s[3741]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3742]! } + public var Channel_Username_InvalidTaken: String { return self._s[3743]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3744]! } + public var Wallet_WordCheck_TryAgain: String { return self._s[3745]! } + public var Wallet_Info_TransactionPendingHeader: String { return self._s[3746]! } + public var Settings_ChatBackground: String { return self._s[3747]! } + public var Channel_Subscribers_Title: String { return self._s[3748]! } + public var Wallet_Receive_InvoiceUrlHeader: String { return self._s[3749]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3750]! } + public var Watch_ConnectionDescription: String { return self._s[3751]! } + public var OldChannels_NoticeText: String { return self._s[3754]! } + public var Wallet_Configuration_ApplyErrorTitle: String { return self._s[3755]! } + public var IntentsSettings_SuggestBy: String { return self._s[3757]! } + public var Theme_ThemeChangedText: String { return self._s[3758]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3759]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3760]! } + public var Wallet_Send_TransactionInProgress: String { return self._s[3761]! } + public var EditProfile_Title: String { return self._s[3762]! } + public var NotificationsSound_Bamboo: String { return self._s[3764]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3766]! } + public var Login_SmsRequestState2: String { return self._s[3767]! } + public var Passport_Language_ar: String { return self._s[3768]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3766]!, self._r[3766]!, [_0]) + return formatWithArgumentRanges(self._s[3769]!, self._r[3769]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3767]! } - public var Wallet_Created_Text: String { return self._s[3768]! } - public var Conversation_MessageDialogEdit: String { return self._s[3770]! } - public var Wallet_Created_Proceed: String { return self._s[3771]! } - public var Wallet_Words_Done: String { return self._s[3772]! } - public var VoiceOver_Media_PlaybackPause: String { return self._s[3773]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3770]! } + public var Wallet_Created_Text: String { return self._s[3771]! } + public var Conversation_MessageDialogEdit: String { return self._s[3773]! } + public var Wallet_Created_Proceed: String { return self._s[3774]! } + public var Wallet_Words_Done: String { return self._s[3775]! } + public var VoiceOver_Media_PlaybackPause: String { return self._s[3776]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3774]!, self._r[3774]!, [_1]) + return formatWithArgumentRanges(self._s[3777]!, self._r[3777]!, [_1]) } - public var Common_Close: String { return self._s[3775]! } - public var GroupInfo_PublicLink: String { return self._s[3776]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3777]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3778]! } + public var Common_Close: String { return self._s[3778]! } + public var GroupInfo_PublicLink: String { return self._s[3779]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3780]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3781]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3782]!, self._r[3782]!, [_0]) + return formatWithArgumentRanges(self._s[3785]!, self._r[3785]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3783]! } + public var UserInfo_About_Placeholder: String { return self._s[3786]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3784]!, self._r[3784]!, [_0]) + return formatWithArgumentRanges(self._s[3787]!, self._r[3787]!, [_0]) } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3785]! } - public var Channel_Info_Banned: String { return self._s[3787]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3788]! } + public var Channel_Info_Banned: String { return self._s[3790]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3788]!, self._r[3788]!, [_0]) + return formatWithArgumentRanges(self._s[3791]!, self._r[3791]!, [_0]) } - public var Appearance_Other: String { return self._s[3789]! } - public var Passport_Language_my: String { return self._s[3790]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3791]! } + public var Appearance_Other: String { return self._s[3792]! } + public var Passport_Language_my: String { return self._s[3793]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3794]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3792]!, self._r[3792]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3795]!, self._r[3795]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3793]! } - public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3794]! } - public var Preview_CopyAddress: String { return self._s[3795]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3796]! } + public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[3797]! } + public var Preview_CopyAddress: String { return self._s[3798]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3796]!, self._r[3796]!, [_0]) + return formatWithArgumentRanges(self._s[3799]!, self._r[3799]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3797]! } - public var UserInfo_BotSettings: String { return self._s[3798]! } - public var LiveLocation_MenuStopAll: String { return self._s[3800]! } - public var Passport_PasswordCreate: String { return self._s[3801]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3802]! } - public var Message_PinnedLocationMessage: String { return self._s[3803]! } - public var Map_Satellite: String { return self._s[3804]! } - public var Watch_Message_Unsupported: String { return self._s[3805]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3806]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3807]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3800]! } + public var UserInfo_BotSettings: String { return self._s[3801]! } + public var LiveLocation_MenuStopAll: String { return self._s[3803]! } + public var Passport_PasswordCreate: String { return self._s[3804]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3805]! } + public var Message_PinnedLocationMessage: String { return self._s[3806]! } + public var Map_Satellite: String { return self._s[3807]! } + public var Watch_Message_Unsupported: String { return self._s[3808]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3809]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3810]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3808]!, self._r[3808]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3811]!, self._r[3811]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3809]!, self._r[3809]!, [_0]) + return formatWithArgumentRanges(self._s[3812]!, self._r[3812]!, [_0]) } - public var Wallet_WordImport_Continue: String { return self._s[3810]! } + public var Wallet_WordImport_Continue: String { return self._s[3813]! } public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3811]!, self._r[3811]!, [_0]) + return formatWithArgumentRanges(self._s[3814]!, self._r[3814]!, [_0]) } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3812]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3813]! } - public var NotificationsSound_None: String { return self._s[3814]! } - public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3815]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3817]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3818]! } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3815]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3816]! } + public var NotificationsSound_None: String { return self._s[3817]! } + public var Wallet_TransactionInfo_StorageFeeHeader: String { return self._s[3818]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3820]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3821]! } public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3819]!, self._r[3819]!, [_1]) + return formatWithArgumentRanges(self._s[3822]!, self._r[3822]!, [_1]) } - public var Cache_Indexing: String { return self._s[3820]! } - public var DialogList_RecentTitlePeople: String { return self._s[3822]! } - public var DialogList_EncryptionRejected: String { return self._s[3823]! } - public var GroupInfo_Administrators: String { return self._s[3824]! } - public var Passport_ScanPassportHelp: String { return self._s[3825]! } - public var Application_Name: String { return self._s[3826]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3827]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3829]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3830]! } + public var Cache_Indexing: String { return self._s[3823]! } + public var DialogList_RecentTitlePeople: String { return self._s[3825]! } + public var DialogList_EncryptionRejected: String { return self._s[3826]! } + public var GroupInfo_Administrators: String { return self._s[3827]! } + public var Passport_ScanPassportHelp: String { return self._s[3828]! } + public var Application_Name: String { return self._s[3829]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3830]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3832]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3833]! } public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3831]!, self._r[3831]!, [_0]) + return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_0]) } public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3832]!, self._r[3832]!, [_0]) + return formatWithArgumentRanges(self._s[3835]!, self._r[3835]!, [_0]) } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3833]!, self._r[3833]!, [_0]) + return formatWithArgumentRanges(self._s[3836]!, self._r[3836]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3834]! } - public var Privacy_ChatsTitle: String { return self._s[3835]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3836]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3837]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3838]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3839]! } - public var WebBrowser_Title: String { return self._s[3840]! } - public var Group_LinkedChannel: String { return self._s[3841]! } - public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3842]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3843]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3844]! } - public var Appearance_TextSize_UseSystem: String { return self._s[3845]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3846]! } - public var ScheduledMessages_RemindersTitle: String { return self._s[3848]! } - public var Channel_Setup_TypePublic: String { return self._s[3850]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3837]! } + public var Privacy_ChatsTitle: String { return self._s[3838]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3839]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3840]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3841]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3842]! } + public var WebBrowser_Title: String { return self._s[3843]! } + public var Group_LinkedChannel: String { return self._s[3844]! } + public var VoiceOver_Chat_SeenByRecipient: String { return self._s[3845]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3846]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3847]! } + public var Appearance_TextSize_UseSystem: String { return self._s[3848]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3849]! } + public var ScheduledMessages_RemindersTitle: String { return self._s[3851]! } + public var Channel_Setup_TypePublic: String { return self._s[3853]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3851]!, self._r[3851]!, [_0]) + return formatWithArgumentRanges(self._s[3854]!, self._r[3854]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3853]! } - public var MessagePoll_ViewResults: String { return self._s[3854]! } - public var Map_OpenInMaps: String { return self._s[3856]! } + public var Channel_TypeSetup_Title: String { return self._s[3856]! } + public var MessagePoll_ViewResults: String { return self._s[3857]! } + public var Map_OpenInMaps: String { return self._s[3859]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3857]!, self._r[3857]!, [_1]) + return formatWithArgumentRanges(self._s[3860]!, self._r[3860]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3859]! } + public var NotificationsSound_Tremolo: String { return self._s[3862]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3860]!, self._r[3860]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3863]!, self._r[3863]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3861]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3862]! } - public var Passport_PasswordHelp: String { return self._s[3863]! } - public var Login_CodeExpiredError: String { return self._s[3864]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3865]! } - public var Conversation_TitleUnmute: String { return self._s[3866]! } - public var Passport_Identity_ScansHelp: String { return self._s[3867]! } - public var Passport_Language_lo: String { return self._s[3868]! } - public var Camera_FlashAuto: String { return self._s[3869]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3870]! } - public var Common_Cancel: String { return self._s[3871]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3872]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3873]! } - public var Appearance_TintAllColors: String { return self._s[3874]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3864]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3865]! } + public var Passport_PasswordHelp: String { return self._s[3866]! } + public var Login_CodeExpiredError: String { return self._s[3867]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3868]! } + public var Conversation_TitleUnmute: String { return self._s[3869]! } + public var Passport_Identity_ScansHelp: String { return self._s[3870]! } + public var Passport_Language_lo: String { return self._s[3871]! } + public var Camera_FlashAuto: String { return self._s[3872]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3873]! } + public var Common_Cancel: String { return self._s[3874]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3875]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3876]! } + public var Appearance_TintAllColors: String { return self._s[3877]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3875]!, self._r[3875]!, [_1]) + return formatWithArgumentRanges(self._s[3878]!, self._r[3878]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3876]! } - public var ChatSettings_Title: String { return self._s[3878]! } - public var Passport_PasswordReset: String { return self._s[3879]! } - public var SocksProxySetup_TypeNone: String { return self._s[3880]! } - public var EditTheme_Title: String { return self._s[3883]! } - public var PhoneNumberHelp_Help: String { return self._s[3884]! } - public var Checkout_EnterPassword: String { return self._s[3885]! } - public var Activity_UploadingDocument: String { return self._s[3887]! } - public var Share_AuthTitle: String { return self._s[3888]! } - public var State_Connecting: String { return self._s[3889]! } - public var Profile_MessageLifetime1w: String { return self._s[3890]! } - public var Conversation_ContextMenuReport: String { return self._s[3891]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3892]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3893]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3879]! } + public var ChatSettings_Title: String { return self._s[3881]! } + public var Passport_PasswordReset: String { return self._s[3882]! } + public var SocksProxySetup_TypeNone: String { return self._s[3883]! } + public var EditTheme_Title: String { return self._s[3886]! } + public var PhoneNumberHelp_Help: String { return self._s[3887]! } + public var Checkout_EnterPassword: String { return self._s[3888]! } + public var Activity_UploadingDocument: String { return self._s[3890]! } + public var Share_AuthTitle: String { return self._s[3891]! } + public var State_Connecting: String { return self._s[3892]! } + public var Profile_MessageLifetime1w: String { return self._s[3893]! } + public var Conversation_ContextMenuReport: String { return self._s[3894]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3895]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3896]! } public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3894]!, self._r[3894]!, [_0]) + return formatWithArgumentRanges(self._s[3897]!, self._r[3897]!, [_0]) } - public var AuthSessions_Terminate: String { return self._s[3895]! } - public var Wallet_WordImport_CanNotRemember: String { return self._s[3896]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3898]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3899]! } - public var PhotoEditor_Set: String { return self._s[3900]! } - public var EmptyGroupInfo_Title: String { return self._s[3901]! } - public var Login_PadPhoneHelp: String { return self._s[3902]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3904]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3906]! } - public var NotificationsSound_Complete: String { return self._s[3907]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3908]! } - public var Group_Info_AdminLog: String { return self._s[3909]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3910]! } + public var AuthSessions_Terminate: String { return self._s[3898]! } + public var Wallet_WordImport_CanNotRemember: String { return self._s[3899]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3901]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3902]! } + public var PhotoEditor_Set: String { return self._s[3903]! } + public var EmptyGroupInfo_Title: String { return self._s[3904]! } + public var Login_PadPhoneHelp: String { return self._s[3905]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3907]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3909]! } + public var NotificationsSound_Complete: String { return self._s[3910]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3911]! } + public var Group_Info_AdminLog: String { return self._s[3912]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3913]! } public func Wallet_Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3911]!, self._r[3911]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3914]!, self._r[3914]!, [_1, _2, _3]) } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3912]! } - public var Group_Location_CreateInThisPlace: String { return self._s[3914]! } - public var Conversation_Admin: String { return self._s[3915]! } - public var Conversation_GifTooltip: String { return self._s[3916]! } - public var Passport_NotLoggedInMessage: String { return self._s[3917]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3915]! } + public var Group_Location_CreateInThisPlace: String { return self._s[3917]! } + public var Conversation_Admin: String { return self._s[3918]! } + public var Conversation_GifTooltip: String { return self._s[3919]! } + public var Passport_NotLoggedInMessage: String { return self._s[3920]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3919]!, self._r[3919]!, [_0]) + return formatWithArgumentRanges(self._s[3922]!, self._r[3922]!, [_0]) } - public var Profile_MessageLifetimeForever: String { return self._s[3920]! } - public var SharedMedia_EmptyTitle: String { return self._s[3922]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3924]! } - public var Username_Help: String { return self._s[3925]! } - public var DialogList_LanguageTooltip: String { return self._s[3927]! } - public var Map_LoadError: String { return self._s[3928]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3929]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3930]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3931]! } - public var Notification_Exceptions_NewException: String { return self._s[3932]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3933]! } - public var WatchRemote_AlertText: String { return self._s[3934]! } + public var Profile_MessageLifetimeForever: String { return self._s[3923]! } + public var SharedMedia_EmptyTitle: String { return self._s[3925]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3927]! } + public var Username_Help: String { return self._s[3928]! } + public var DialogList_LanguageTooltip: String { return self._s[3930]! } + public var Map_LoadError: String { return self._s[3931]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3932]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3933]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3934]! } + public var Notification_Exceptions_NewException: String { return self._s[3935]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3936]! } + public var WatchRemote_AlertText: String { return self._s[3937]! } public func Wallet_Send_ConfirmationText(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3935]!, self._r[3935]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3938]!, self._r[3938]!, [_1, _2, _3]) } - public var ChatSettings_ConnectionType_Title: String { return self._s[3939]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3942]! } public func PUSH_PINNED_QUIZ(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3940]!, self._r[3940]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3943]!, self._r[3943]!, [_1, _2]) } public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3941]!, self._r[3941]!, [_0]) + return formatWithArgumentRanges(self._s[3944]!, self._r[3944]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3942]! } - public var WebBrowser_DefaultBrowser: String { return self._s[3943]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3944]! } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3945]! } + public var WebBrowser_DefaultBrowser: String { return self._s[3946]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3947]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3945]!, self._r[3945]!, [_0]) + return formatWithArgumentRanges(self._s[3948]!, self._r[3948]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3946]!, self._r[3946]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3949]!, self._r[3949]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3947]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3948]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3950]! } - public var Wallet_Created_ExportErrorText: String { return self._s[3951]! } - public var ChatList_UndoArchiveText1: String { return self._s[3952]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3953]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3954]! } - public var Cache_ClearNone: String { return self._s[3955]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3956]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3957]! } + public var Group_AdminLog_EmptyText: String { return self._s[3950]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3951]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3953]! } + public var Wallet_Created_ExportErrorText: String { return self._s[3954]! } + public var ChatList_UndoArchiveText1: String { return self._s[3955]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3956]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3957]! } + public var Cache_ClearNone: String { return self._s[3958]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3959]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3960]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3958]!, self._r[3958]!, [_0]) - } - public var Passport_Identity_Country: String { return self._s[3959]! } - public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3960]!, self._r[3960]!, [_0]) - } - public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3961]!, self._r[3961]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3962]! } - public var AccessDenied_Settings: String { return self._s[3963]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3964]! } - public var Month_ShortMay: String { return self._s[3965]! } - public var Compose_NewGroup: String { return self._s[3967]! } - public var Group_Setup_TypePrivate: String { return self._s[3969]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3971]! } - public var Appearance_ThemeDayClassic: String { return self._s[3972]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3973]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3974]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3975]! } - public var Conversation_typing: String { return self._s[3977]! } - public var Undo_ScheduledMessagesCleared: String { return self._s[3978]! } - public var Paint_Masks: String { return self._s[3979]! } - public var Contacts_DeselectAll: String { return self._s[3980]! } - public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3981]!, self._r[3981]!, [_0]) + public var Passport_Identity_Country: String { return self._s[3962]! } + public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3963]!, self._r[3963]!, [_0]) } - public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[3982]! } - public var Username_InvalidTaken: String { return self._s[3983]! } - public var Call_StatusNoAnswer: String { return self._s[3984]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3985]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3986]! } - public var Passport_Identity_Selfie: String { return self._s[3987]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3988]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3989]! } - public var Conversation_ClearSecretHistory: String { return self._s[3990]! } - public var PeopleNearby_Description: String { return self._s[3992]! } - public var NetworkUsageSettings_Title: String { return self._s[3993]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3995]! } + public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3964]!, self._r[3964]!, [_0]) + } + public var Exceptions_AddToExceptions: String { return self._s[3965]! } + public var AccessDenied_Settings: String { return self._s[3966]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3967]! } + public var Month_ShortMay: String { return self._s[3968]! } + public var Compose_NewGroup: String { return self._s[3970]! } + public var Group_Setup_TypePrivate: String { return self._s[3972]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3974]! } + public var Appearance_ThemeDayClassic: String { return self._s[3975]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3976]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3977]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3978]! } + public var Conversation_typing: String { return self._s[3980]! } + public var Undo_ScheduledMessagesCleared: String { return self._s[3981]! } + public var Paint_Masks: String { return self._s[3982]! } + public var Contacts_DeselectAll: String { return self._s[3983]! } + public func Wallet_Updated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3984]!, self._r[3984]!, [_0]) + } + public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[3985]! } + public var Username_InvalidTaken: String { return self._s[3986]! } + public var Call_StatusNoAnswer: String { return self._s[3987]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[3988]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3989]! } + public var Passport_Identity_Selfie: String { return self._s[3990]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[3991]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3992]! } + public var Conversation_ClearSecretHistory: String { return self._s[3993]! } + public var PeopleNearby_Description: String { return self._s[3995]! } + public var NetworkUsageSettings_Title: String { return self._s[3996]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3998]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3997]!, self._r[3997]!, [_0]) + return formatWithArgumentRanges(self._s[4000]!, self._r[4000]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3998]!, self._r[3998]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4001]!, self._r[4001]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[4000]! } - public var VoiceOver_Navigation_Search: String { return self._s[4001]! } - public var Map_LiveLocationTitle: String { return self._s[4002]! } - public var Login_InfoAvatarAdd: String { return self._s[4003]! } - public var Passport_Identity_FilesView: String { return self._s[4004]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[4005]! } - public var Privacy_Calls_NeverAllow: String { return self._s[4006]! } - public var VoiceOver_Chat_File: String { return self._s[4007]! } - public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4008]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[4003]! } + public var VoiceOver_Navigation_Search: String { return self._s[4004]! } + public var Map_LiveLocationTitle: String { return self._s[4005]! } + public var Login_InfoAvatarAdd: String { return self._s[4006]! } + public var Passport_Identity_FilesView: String { return self._s[4007]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[4008]! } + public var Privacy_Calls_NeverAllow: String { return self._s[4009]! } + public var VoiceOver_Chat_File: String { return self._s[4010]! } + public var Wallet_Settings_DeleteWalletInfo: String { return self._s[4011]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4009]!, self._r[4009]!, [_0]) + return formatWithArgumentRanges(self._s[4012]!, self._r[4012]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[4010]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[4011]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4012]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[4013]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[4014]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[4015]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4013]!, self._r[4013]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4016]!, self._r[4016]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4014]! } - public var Wallet_Intro_CreateErrorText: String { return self._s[4015]! } - public var Tour_Title2: String { return self._s[4016]! } - public var Wallet_Sent_ViewWallet: String { return self._s[4017]! } - public var Conversation_FileOpenIn: String { return self._s[4018]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4019]! } - public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4020]! } - public var Wallpaper_Set: String { return self._s[4021]! } - public var Passport_Identity_Translations: String { return self._s[4023]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[4017]! } + public var Wallet_Intro_CreateErrorText: String { return self._s[4018]! } + public var Tour_Title2: String { return self._s[4019]! } + public var Wallet_Sent_ViewWallet: String { return self._s[4020]! } + public var Conversation_FileOpenIn: String { return self._s[4021]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[4022]! } + public var Wallet_Send_ErrorInvalidAddress: String { return self._s[4023]! } + public var Wallpaper_Set: String { return self._s[4024]! } + public var Passport_Identity_Translations: String { return self._s[4026]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4024]!, self._r[4024]!, [_0]) + return formatWithArgumentRanges(self._s[4027]!, self._r[4027]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[4025]! } + public var Channel_LeaveChannel: String { return self._s[4028]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4026]!, self._r[4026]!, [_1]) + return formatWithArgumentRanges(self._s[4029]!, self._r[4029]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4028]! } - public var PhotoEditor_HighlightsTint: String { return self._s[4029]! } - public var MessagePoll_LabelPoll: String { return self._s[4030]! } - public var Passport_Email_Delete: String { return self._s[4031]! } - public var Conversation_Mute: String { return self._s[4033]! } - public var Channel_AddBotAsAdmin: String { return self._s[4034]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[4036]! } - public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4037]! } - public var ChatSettings_IntentsSettings: String { return self._s[4039]! } - public var Channel_Management_LabelOwner: String { return self._s[4040]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[4031]! } + public var PhotoEditor_HighlightsTint: String { return self._s[4032]! } + public var MessagePoll_LabelPoll: String { return self._s[4033]! } + public var Passport_Email_Delete: String { return self._s[4034]! } + public var Conversation_Mute: String { return self._s[4036]! } + public var Channel_AddBotAsAdmin: String { return self._s[4037]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[4039]! } + public var Wallet_Configuration_BlockchainNameChangedText: String { return self._s[4040]! } + public var ChatSettings_IntentsSettings: String { return self._s[4042]! } + public var Channel_Management_LabelOwner: String { return self._s[4043]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4041]!, self._r[4041]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4044]!, self._r[4044]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[4042]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[4043]! } - public var Common_No: String { return self._s[4044]! } - public var Weekday_Sunday: String { return self._s[4045]! } - public var Notification_Reply: String { return self._s[4046]! } - public var Conversation_ViewMessage: String { return self._s[4047]! } + public var Calls_CallTabDescription: String { return self._s[4045]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[4046]! } + public var Common_No: String { return self._s[4047]! } + public var Weekday_Sunday: String { return self._s[4048]! } + public var Notification_Reply: String { return self._s[4049]! } + public var Conversation_ViewMessage: String { return self._s[4050]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4048]!, self._r[4048]!, [_0]) + return formatWithArgumentRanges(self._s[4051]!, self._r[4051]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4049]!, self._r[4049]!, [_0]) + return formatWithArgumentRanges(self._s[4052]!, self._r[4052]!, [_0]) } public func Wallet_Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4050]!, self._r[4050]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4053]!, self._r[4053]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4051]! } - public var Wallet_Send_Title: String { return self._s[4052]! } - public var Message_PinnedDocumentMessage: String { return self._s[4053]! } - public var Wallet_Info_RefreshErrorText: String { return self._s[4054]! } - public var DialogList_TabTitle: String { return self._s[4056]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[4057]! } - public var Passport_FieldEmail: String { return self._s[4058]! } - public var Conversation_UnpinMessageAlert: String { return self._s[4059]! } - public var Passport_Address_TypeBankStatement: String { return self._s[4060]! } - public var Wallet_SecureStorageReset_Title: String { return self._s[4061]! } - public var Passport_Identity_ExpiryDate: String { return self._s[4062]! } - public var Privacy_Calls_P2P: String { return self._s[4063]! } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4054]! } + public var Wallet_Send_Title: String { return self._s[4055]! } + public var Message_PinnedDocumentMessage: String { return self._s[4056]! } + public var Wallet_Info_RefreshErrorText: String { return self._s[4057]! } + public var DialogList_TabTitle: String { return self._s[4059]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[4060]! } + public var Passport_FieldEmail: String { return self._s[4061]! } + public var Conversation_UnpinMessageAlert: String { return self._s[4062]! } + public var Passport_Address_TypeBankStatement: String { return self._s[4063]! } + public var Wallet_SecureStorageReset_Title: String { return self._s[4064]! } + public var Passport_Identity_ExpiryDate: String { return self._s[4065]! } + public var Privacy_Calls_P2P: String { return self._s[4066]! } public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4065]!, self._r[4065]!, [_0]) + return formatWithArgumentRanges(self._s[4068]!, self._r[4068]!, [_0]) } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[4066]! } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[4069]! } public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4067]!, self._r[4067]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4070]!, self._r[4070]!, [_1, _2]) } - public var Stickers_ClearRecent: String { return self._s[4068]! } - public var EnterPasscode_ChangeTitle: String { return self._s[4069]! } - public var TwoFactorSetup_Email_Title: String { return self._s[4070]! } - public var Passport_InfoText: String { return self._s[4071]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4072]! } + public var Stickers_ClearRecent: String { return self._s[4071]! } + public var EnterPasscode_ChangeTitle: String { return self._s[4072]! } + public var TwoFactorSetup_Email_Title: String { return self._s[4073]! } + public var Passport_InfoText: String { return self._s[4074]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[4075]! } public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4073]!, self._r[4073]!, [_0]) + return formatWithArgumentRanges(self._s[4076]!, self._r[4076]!, [_0]) } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4074]!, self._r[4074]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[4077]!, self._r[4077]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4075]! } - public var ScheduledMessages_PollUnavailable: String { return self._s[4076]! } - public var VoiceOver_Navigation_Compose: String { return self._s[4077]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[4078]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[4080]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4081]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4078]! } + public var ScheduledMessages_PollUnavailable: String { return self._s[4079]! } + public var VoiceOver_Navigation_Compose: String { return self._s[4080]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[4081]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[4083]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4084]! } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4082]!, self._r[4082]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4085]!, self._r[4085]!, [_1, _2]) } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4084]! } - public var ChatSettings_OpenLinksIn: String { return self._s[4085]! } - public var Map_HomeAndWorkTitle: String { return self._s[4086]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[4087]! } + public var ChatSettings_OpenLinksIn: String { return self._s[4088]! } + public var Map_HomeAndWorkTitle: String { return self._s[4089]! } public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4088]!, self._r[4088]!, [_0]) + return formatWithArgumentRanges(self._s[4091]!, self._r[4091]!, [_0]) } - public var DialogList_Unread: String { return self._s[4089]! } + public var DialogList_Unread: String { return self._s[4092]! } public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4090]!, self._r[4090]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4093]!, self._r[4093]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[4091]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4092]! } + public var User_DeletedAccount: String { return self._s[4094]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[4095]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4093]!, self._r[4093]!, [_0]) + return formatWithArgumentRanges(self._s[4096]!, self._r[4096]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[4094]! } - public var SharedMedia_CategoryMedia: String { return self._s[4095]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4096]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4097]! } - public var Watch_ChatList_Compose: String { return self._s[4098]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4099]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[4100]! } - public var Watch_Microphone_Access: String { return self._s[4101]! } - public var Group_Setup_HistoryHeader: String { return self._s[4102]! } - public var Map_SetThisLocation: String { return self._s[4103]! } - public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4104]! } - public var Activity_UploadingPhoto: String { return self._s[4105]! } - public var Conversation_Edit: String { return self._s[4107]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[4108]! } - public var Login_TermsOfServiceDecline: String { return self._s[4109]! } - public var Message_PinnedContactMessage: String { return self._s[4110]! } + public var UserInfo_NotificationsDefault: String { return self._s[4097]! } + public var SharedMedia_CategoryMedia: String { return self._s[4098]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4099]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[4100]! } + public var Watch_ChatList_Compose: String { return self._s[4101]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[4102]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[4103]! } + public var Watch_Microphone_Access: String { return self._s[4104]! } + public var Group_Setup_HistoryHeader: String { return self._s[4105]! } + public var Map_SetThisLocation: String { return self._s[4106]! } + public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[4107]! } + public var Activity_UploadingPhoto: String { return self._s[4108]! } + public var Conversation_Edit: String { return self._s[4110]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[4111]! } + public var Login_TermsOfServiceDecline: String { return self._s[4112]! } + public var Message_PinnedContactMessage: String { return self._s[4113]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4111]!, self._r[4111]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4114]!, self._r[4114]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4112]!, self._r[4112]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[4115]!, self._r[4115]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[4113]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[4115]! } - public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4116]! } + public var Appearance_LargeEmoji: String { return self._s[4116]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[4118]! } + public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[4119]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4117]!, self._r[4117]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4120]!, self._r[4120]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[4118]! } - public var Message_PinnedPhotoMessage: String { return self._s[4119]! } - public var Passport_FieldPhone: String { return self._s[4120]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4121]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[4122]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[4124]! } - public var Conversation_Call: String { return self._s[4125]! } - public var Common_TakePhoto: String { return self._s[4127]! } - public var Group_EditAdmin_RankTitle: String { return self._s[4128]! } - public var Wallet_Receive_CommentHeader: String { return self._s[4129]! } - public var Channel_NotificationLoading: String { return self._s[4130]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[4121]! } + public var Message_PinnedPhotoMessage: String { return self._s[4122]! } + public var Passport_FieldPhone: String { return self._s[4123]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[4124]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[4125]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[4127]! } + public var Conversation_Call: String { return self._s[4128]! } + public var Common_TakePhoto: String { return self._s[4130]! } + public var Group_EditAdmin_RankTitle: String { return self._s[4131]! } + public var Wallet_Receive_CommentHeader: String { return self._s[4132]! } + public var Channel_NotificationLoading: String { return self._s[4133]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4131]!, self._r[4131]!, [_0]) + return formatWithArgumentRanges(self._s[4134]!, self._r[4134]!, [_0]) } public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4132]!, self._r[4132]!, [_0]) - } - public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4133]!, self._r[4133]!, [_1]) - } - public var Permissions_SiriTitle_v0: String { return self._s[4134]! } - public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[4135]!, self._r[4135]!, [_0]) } + public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4136]!, self._r[4136]!, [_1]) + } + public var Permissions_SiriTitle_v0: String { return self._s[4137]! } + public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[4138]!, self._r[4138]!, [_0]) + } public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4136]!, self._r[4136]!, [_0]) + return formatWithArgumentRanges(self._s[4139]!, self._r[4139]!, [_0]) } - public var Channel_MessagePhotoRemoved: String { return self._s[4137]! } - public var Wallet_Info_ReceiveGrams: String { return self._s[4138]! } - public var ClearCache_FreeSpace: String { return self._s[4139]! } - public var Common_edit: String { return self._s[4140]! } - public var PrivacySettings_AuthSessions: String { return self._s[4141]! } - public var Month_ShortJune: String { return self._s[4142]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4143]! } - public var Call_ReportSend: String { return self._s[4144]! } - public var Watch_LastSeen_JustNow: String { return self._s[4145]! } - public var Notifications_MessageNotifications: String { return self._s[4146]! } - public var WallpaperSearch_ColorGreen: String { return self._s[4147]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[4149]! } - public var Group_Status: String { return self._s[4150]! } + public var Channel_MessagePhotoRemoved: String { return self._s[4140]! } + public var Wallet_Info_ReceiveGrams: String { return self._s[4141]! } + public var ClearCache_FreeSpace: String { return self._s[4142]! } + public var Appearance_BubbleCorners_Apply: String { return self._s[4143]! } + public var Common_edit: String { return self._s[4144]! } + public var PrivacySettings_AuthSessions: String { return self._s[4145]! } + public var Month_ShortJune: String { return self._s[4146]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[4147]! } + public var Call_ReportSend: String { return self._s[4148]! } + public var Watch_LastSeen_JustNow: String { return self._s[4149]! } + public var Notifications_MessageNotifications: String { return self._s[4150]! } + public var WallpaperSearch_ColorGreen: String { return self._s[4151]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[4153]! } + public var Group_Status: String { return self._s[4154]! } public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4151]!, self._r[4151]!, [_0, _1]) + return formatWithArgumentRanges(self._s[4155]!, self._r[4155]!, [_0, _1]) } - public var TextFormat_AddLinkTitle: String { return self._s[4152]! } - public var ShareMenu_ShareTo: String { return self._s[4153]! } - public var Conversation_Moderate_Ban: String { return self._s[4154]! } + public var TextFormat_AddLinkTitle: String { return self._s[4156]! } + public var ShareMenu_ShareTo: String { return self._s[4157]! } + public var Conversation_Moderate_Ban: String { return self._s[4158]! } public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4155]!, self._r[4155]!, [_0]) + return formatWithArgumentRanges(self._s[4159]!, self._r[4159]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[4156]! } - public var Map_LiveLocationFor8Hours: String { return self._s[4157]! } + public var SharedMedia_ViewInChat: String { return self._s[4160]! } + public var Map_LiveLocationFor8Hours: String { return self._s[4161]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4158]!, self._r[4158]!, [_1]) + return formatWithArgumentRanges(self._s[4162]!, self._r[4162]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4159]!, self._r[4159]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4163]!, self._r[4163]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4161]!, self._r[4161]!, [_0]) + return formatWithArgumentRanges(self._s[4165]!, self._r[4165]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[4162]! } - public var Appearance_ReduceMotion: String { return self._s[4163]! } + public var Map_OpenInHereMaps: String { return self._s[4166]! } + public var Appearance_ReduceMotion: String { return self._s[4167]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[4164]!, self._r[4164]!, [_1, _2]) + return formatWithArgumentRanges(self._s[4168]!, self._r[4168]!, [_1, _2]) } - public var Channel_Setup_TypePublicHelp: String { return self._s[4165]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[4166]! } - public var PhotoEditor_Skip: String { return self._s[4167]! } - public func MessagePoll_QuizCount(_ value: Int32) -> String { + public var Channel_Setup_TypePublicHelp: String { return self._s[4169]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[4170]! } + public var PhotoEditor_Skip: String { return self._s[4171]! } + public func ForwardedGifs(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedVideoMessages(_ value: Int32) -> String { + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedFiles(_ value: Int32) -> String { + public func Map_ETAMinutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[2 * 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[3 * 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[4 * 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[5 * 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[6 * 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[7 * 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[8 * 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[9 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedStickers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[10 * 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[11 * 6 + Int(form.rawValue)]!, stringValue) - } - public func InviteText_ContactsCountText(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[12 * 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[13 * 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[14 * 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[15 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[16 * 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[17 * 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[18 * 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[19 * 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[20 * 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[21 * 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[22 * 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[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func OldChannels_InactiveYear(_ 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 ForwardedPhotos(_ 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 Theme_UsersCount(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func LastSeen_MinutesAgo(_ 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 QuickSend_Photos(_ 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 VoiceOver_Chat_PollOptionCount(_ 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_Hours(_ 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 Conversation_StatusSubscribers(_ 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 OldChannels_GroupFormat(_ 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 Media_ShareItem(_ 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 AttachmentMenu_SendGif(_ 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_GameScoreExtended(_ 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 GroupInfo_ShowMoreMembers(_ 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 SharedMedia_Generic(_ 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_Hours(_ 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 Watch_UserInfo_Mute(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[40 * 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[41 * 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[42 * 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[43 * 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[44 * 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[45 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortDays(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[46 * 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[47 * 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[48 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func UserCount(_ 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 Contacts_ImportersCount(_ 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 ForwardedContacts(_ 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 ForwardedAudios(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_StickerCount(_ 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 Notifications_ExceptionMuteExpires_Hours(_ 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 VoiceOver_Chat_ContactPhoneNumberCount(_ 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 MessageTimer_ShortWeeks(_ 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 Notifications_Exceptions(_ 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 ChatList_DeletedChats(_ 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 Call_ShortSeconds(_ 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 PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Notification_GameScoreSimple(_ 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 CreatePoll_AddMoreOptions(_ 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 MuteFor_Hours(_ 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 Media_ShareVideo(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_File(_ 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 Conversation_LiveLocationMembersCount(_ 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 MessageTimer_Minutes(_ 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 Conversation_StatusMembers(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) - } - public func 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 MessageTimer_Years(_ 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 Map_ETAMinutes(_ 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 ForwardedVideos(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Link(_ 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 MessagePoll_VotedCount(_ 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_MESSAGE_PHOTOS(_ 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 Contacts_InviteContacts(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Days(_ 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 Watch_LastSeen_MinutesAgo(_ 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 SharedMedia_Photo(_ 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 Wallet_Updated_HoursAgo(_ 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 PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func ServiceMessage_GameScoreExtended(_ 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 Passport_Scans(_ 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 GroupInfo_ParticipantCount(_ 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_GameScoreSelfExtended(_ 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 Call_ShortMinutes(_ 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 PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func OldChannels_Leave(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, _1, _2) - } - 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[94 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func OldChannels_InactiveMonth(_ 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 MessageTimer_ShortMinutes(_ 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 PasscodeSettings_FailedAttempts(_ 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 Invitation_Members(_ 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 ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func StickerPack_RemoveStickerCount(_ 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 ServiceMessage_GameScoreSimple(_ 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 OldChannels_InactiveWeek(_ 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 StickerPack_AddMaskCount(_ 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 ForwardedLocations(_ value: Int32) -> String { - let form = getPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MessageTimer_ShortHours(_ 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 MuteFor_Days(_ 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 ServiceMessage_GameScoreSelfSimple(_ 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 PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = getPluralizationForm(self.lc, selector) - return String(format: self._ps[110 * 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[111 * 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[112 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, _1, _2) } public func ChatList_DeleteConfirmation(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) } - public func ForwardedGifs(_ value: Int32) -> String { + public func LastSeen_MinutesAgo(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) } - public func MuteExpires_Minutes(_ value: Int32) -> String { + 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[115 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + public func Call_Minutes(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) } - public func LiveLocationUpdated_MinutesAgo(_ 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[117 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) } - public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String { + public func Contacts_InviteContacts(_ 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) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) } - public func ChatList_SelectedChats(_ value: Int32) -> String { + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue) } - public func MessageTimer_Weeks(_ 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[120 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) + } + public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[12 * 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[13 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessageTimer_Seconds(_ 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 PollResults_ShowMore(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[15 * 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[16 * 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[17 * 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[18 * 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[19 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[20 * 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[21 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_InactiveWeek(_ 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 Conversation_LiveLocationMembersCount(_ 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 Invitation_Members(_ 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 MessagePoll_QuizCount(_ 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 Notification_GameScoreSimple(_ 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 PrivacyLastSeenSettings_AddUsers(_ 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 Watch_LastSeen_HoursAgo(_ 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 ChatList_DeletedChats(_ 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 VoiceOver_Chat_PollVotes(_ 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 StickerPack_StickerCount(_ 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 StickerPack_RemoveStickerCount(_ 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 Conversation_StatusMembers(_ 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 OldChannels_GroupFormat(_ 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 Media_ShareItem(_ 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 Wallet_Updated_HoursAgo(_ 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 ForwardedVideoMessages(_ 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 ForwardedFiles(_ 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 Notification_GameScoreSelfExtended(_ 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 MessageTimer_ShortHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[40 * 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[41 * 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[42 * 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[43 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddStickerCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[44 * 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[45 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[46 * 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[47 * 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[48 * 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[49 * 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[50 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[51 * 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[52 * 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[53 * 6 + Int(form.rawValue)]!, stringValue) + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[54 * 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[55 * 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[122 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) } - public func SharedMedia_Video(_ 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[123 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) } - public func Map_ETAHours(_ value: Int32) -> String { + public func ChatList_SelectedChats(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[58 * 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[59 * 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[60 * 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[61 * 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[62 * 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[63 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func Notifications_Exceptions(_ 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 UserCount(_ 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_CHANNEL_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 SharedMedia_Link(_ 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 Conversation_StatusOnline(_ value: Int32) -> String { let form = getPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[125 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[68 * 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[69 * 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[70 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedStickers(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[72 * 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[73 * 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[74 * 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[75 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_InactiveMonth(_ 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 PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + 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[78 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func ForwardedLocations(_ 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 AttachmentMenu_SendItem(_ 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 PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func ServiceMessage_GameScoreSimple(_ 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_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 StickerPack_RemoveMaskCount(_ 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 QuickSend_Photos(_ 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 Contacts_ImportersCount(_ 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_ShortWeeks(_ 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 MessageTimer_Hours(_ 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 LiveLocationUpdated_MinutesAgo(_ 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 GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_DeleteItemsConfirmation(_ 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 Map_ETAHours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendPhoto(_ 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 CreatePoll_AddMoreOptions(_ 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_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[96 * 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[97 * 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[98 * 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[99 * 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[100 * 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[101 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MuteFor_Days(_ 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 PasscodeSettings_FailedAttempts(_ 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_Hours(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_File(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func DialogList_LiveLocationChatsCount(_ 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 Call_ShortMinutes(_ 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 SharedMedia_Generic(_ 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 MessageTimer_Days(_ 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 MessageTimer_ShortMinutes(_ 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 Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Seconds(_ 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 ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = getPluralizationForm(self.lc, selector) + return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func MessageTimer_Minutes(_ 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 GroupInfo_ShowMoreMembers(_ 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 Conversation_SelectedMessages(_ 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 MessageTimer_ShortDays(_ 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 Watch_LastSeen_MinutesAgo(_ 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) + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[119 * 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[120 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_Leave(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue) + } + public func OldChannels_InactiveYear(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[122 * 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[123 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedMessages(_ value: Int32) -> String { + let form = getPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[124 * 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[125 * 6 + Int(form.rawValue)]!, _1, _2) } public init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) { diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift index 3571d6d77f..e9ab5e256a 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift @@ -1182,6 +1182,10 @@ public final class PresentationTheme: Equatable { return self.resourceCache.object(key, self, generate) } + public func object(_ key: PresentationResourceParameterKey, _ generate: (PresentationTheme) -> AnyObject?) -> AnyObject? { + return self.resourceCache.parameterObject(key, self, generate) + } + public static func ==(lhs: PresentationTheme, rhs: PresentationTheme) -> Bool { return lhs === rhs } diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift index dd1618f965..d5a0f0fc3a 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift @@ -160,7 +160,7 @@ public final class PrincipalThemeEssentialGraphics { public let incomingBubbleGradientImage: UIImage? public let outgoingBubbleGradientImage: UIImage? - init(mediaBox: MediaBox, presentationTheme: PresentationTheme, wallpaper initialWallpaper: TelegramWallpaper, preview: Bool = false, knockoutMode: Bool) { + init(mediaBox: MediaBox, presentationTheme: PresentationTheme, wallpaper initialWallpaper: TelegramWallpaper, preview: Bool = false, knockoutMode: Bool, bubbleCorners: PresentationChatBubbleCorners) { let theme = presentationTheme.chat var wallpaper = initialWallpaper @@ -215,28 +215,31 @@ public final class PrincipalThemeEssentialGraphics { let serviceColor = serviceMessageColorComponents(chatTheme: theme, wallpaper: wallpaper) + let maxCornerRadius = bubbleCorners.mainRadius + let minCornerRadius = bubbleCorners.mergeBubbleCorners ? bubbleCorners.auxiliaryRadius : bubbleCorners.mainRadius + let emptyImage = UIImage() if preview { - self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(incoming: true, fillColor: UIColor.black, strokeColor: UIColor.clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: UIColor.black, strokeColor: UIColor.clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) self.checkBubbleFullImage = generateCheckImage(partial: false, color: theme.message.outgoingCheckColor, width: 11.0)! self.checkBubblePartialImage = generateCheckImage(partial: true, color: theme.message.outgoingCheckColor, width: 11.0)! self.chatMessageBackgroundIncomingHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedTopMaskImage = emptyImage - self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) self.chatMessageBackgroundIncomingMergedTopHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideMaskImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideOutlineImage = emptyImage self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedBottomMaskImage = emptyImage - self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = emptyImage self.chatMessageBackgroundIncomingMergedBothMaskImage = emptyImage self.chatMessageBackgroundIncomingMergedBothImage = emptyImage @@ -247,21 +250,21 @@ public final class PrincipalThemeEssentialGraphics { self.chatMessageBackgroundIncomingMergedSideOutlineImage = emptyImage self.chatMessageBackgroundIncomingMergedSideHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingHighlightedImage = emptyImage - self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideOutlineImage = emptyImage self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = emptyImage - self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = emptyImage - self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = emptyImage self.chatMessageBackgroundOutgoingMergedSideMaskImage = emptyImage self.chatMessageBackgroundOutgoingMergedSideImage = emptyImage @@ -288,56 +291,56 @@ public final class PrincipalThemeEssentialGraphics { self.radialIndicatorFileIconIncoming = emptyImage self.radialIndicatorFileIconOutgoing = emptyImage } else { - self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedTopHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopSideMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopSideImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedTopSideOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBothMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBothImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedBothOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedBothHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedTopHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedTopSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBothMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBothImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedBothOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedBothHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopSideImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedTopSideOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBottomOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedTopSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBottomHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedSideMaskImage = messageBubbleImage(incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedSideImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundIncomingMergedSideOutlineImage = messageBubbleImage(incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundOutgoingMergedSideMaskImage = messageBubbleImage(incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedSideImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedSideOutlineImage = messageBubbleImage(incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) - self.chatMessageBackgroundIncomingMergedSideHighlightedImage = messageBubbleImage(incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) - self.chatMessageBackgroundOutgoingMergedSideHighlightedImage = messageBubbleImage(incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundIncomingMergedSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundOutgoingMergedSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true) + self.chatMessageBackgroundIncomingMergedSideHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.highlightedFill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) + self.chatMessageBackgroundOutgoingMergedSideHighlightedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.highlightedFill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true) self.checkBubbleFullImage = generateCheckImage(partial: false, color: theme.message.outgoingCheckColor, width: 11.0)! self.checkBubblePartialImage = generateCheckImage(partial: true, color: theme.message.outgoingCheckColor, width: 11.0)! diff --git a/submodules/TelegramPresentationData/Sources/PresentationsResourceCache.swift b/submodules/TelegramPresentationData/Sources/PresentationsResourceCache.swift index a241cbfa43..2d59cc9eec 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationsResourceCache.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationsResourceCache.swift @@ -9,6 +9,7 @@ private final class PresentationsResourceCacheHolder { private final class PresentationsResourceAnyCacheHolder { var objects: [Int32: AnyObject] = [:] + var parameterObjects: [PresentationResourceParameterKey: AnyObject] = [:] } public final class PresentationsResourceCache { @@ -68,4 +69,22 @@ public final class PresentationsResourceCache { } } } + + public func parameterObject(_ key: PresentationResourceParameterKey, _ theme: PresentationTheme, _ generate: (PresentationTheme) -> AnyObject?) -> AnyObject? { + let result = self.objectCache.with { holder -> AnyObject? in + return holder.parameterObjects[key] + } + if let result = result { + return result + } else { + if let object = generate(theme) { + self.objectCache.with { holder -> Void in + holder.parameterObjects[key] = object + } + return object + } else { + return nil + } + } + } } diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift index a1b0744fad..82815c9990 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift @@ -78,9 +78,6 @@ public enum PresentationResourceKey: Int32 { case chatTitleLockIcon case chatTitleMuteIcon - case chatPrincipalThemeEssentialGraphicsWithWallpaper - case chatPrincipalThemeEssentialGraphicsWithoutWallpaper - case chatPrincipalThemeAdditionalGraphicsWithCustomWallpaper case chatPrincipalThemeAdditionalGraphicsWithDefaultWallpaper @@ -234,4 +231,8 @@ public enum PresentationResourceParameterKey: Hashable { case chatListBadgeBackgroundMention(CGFloat) case chatListBadgeBackgroundInactiveMention(CGFloat) case chatListBadgeBackgroundPinned(CGFloat) + + case chatBubbleMediaCorner(incoming: Bool, mainRadius: CGFloat, inset: CGFloat) + + case chatPrincipalThemeEssentialGraphics(hasWallpaper: Bool, bubbleCorners: PresentationChatBubbleCorners) } diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift index e3c4799b12..39e872972a 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift @@ -69,11 +69,10 @@ public struct PresentationResourcesChat { }) } - public static func principalGraphics(mediaBox: MediaBox, knockoutWallpaper: Bool, theme: PresentationTheme, wallpaper: TelegramWallpaper) -> PrincipalThemeEssentialGraphics { + public static func principalGraphics(mediaBox: MediaBox, knockoutWallpaper: Bool, theme: PresentationTheme, wallpaper: TelegramWallpaper, bubbleCorners: PresentationChatBubbleCorners) -> PrincipalThemeEssentialGraphics { let hasWallpaper = !wallpaper.isEmpty - let key: PresentationResourceKey = !hasWallpaper ? PresentationResourceKey.chatPrincipalThemeEssentialGraphicsWithoutWallpaper : PresentationResourceKey.chatPrincipalThemeEssentialGraphicsWithWallpaper - return theme.object(key.rawValue, { theme in - return PrincipalThemeEssentialGraphics(mediaBox: mediaBox, presentationTheme: theme, wallpaper: wallpaper, preview: theme.preview, knockoutMode: knockoutWallpaper) + return theme.object(PresentationResourceParameterKey.chatPrincipalThemeEssentialGraphics(hasWallpaper: hasWallpaper, bubbleCorners: bubbleCorners), { theme in + return PrincipalThemeEssentialGraphics(mediaBox: mediaBox, presentationTheme: theme, wallpaper: wallpaper, preview: theme.preview, knockoutMode: knockoutWallpaper, bubbleCorners: bubbleCorners) }) as! PrincipalThemeEssentialGraphics } @@ -950,4 +949,10 @@ public struct PresentationResourcesChat { return generateCheckImage(partial: true, color: color, width: size) }) } + + public static func chatBubbleMediaCorner(_ theme: PresentationTheme, incoming: Bool, mainRadius: CGFloat, inset: CGFloat) -> UIImage? { + return theme.image(PresentationResourceParameterKey.chatBubbleMediaCorner(incoming: incoming, mainRadius: mainRadius, inset: inset), { _ in + return mediaBubbleCornerImage(incoming: incoming, radius: mainRadius, inset: inset) + }) + } } diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift index dfba0ca7ad..34f88f5cd1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryGridNode.swift @@ -251,7 +251,7 @@ public final class ChatHistoryGridNode: GridNode, ChatHistoryNode { self.chatPresentationDataPromise.set(context.sharedContext.presentationData |> map { presentationData in - return ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji) + return ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners) }) self.floatingSections = true diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index ab032691e6..9e562d29e0 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -505,7 +505,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { self.mode = mode let presentationData = context.sharedContext.currentPresentationData.with { $0 } - self.currentPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, animatedEmojiScale: 1.0) + self.currentPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners, animatedEmojiScale: 1.0) self.chatPresentationDataPromise = Promise(self.currentPresentationData) @@ -880,7 +880,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { if previousTheme !== presentationData.theme || previousStrings !== presentationData.strings || previousWallpaper != presentationData.chatWallpaper || previousDisableAnimations != presentationData.disableAnimations || previousAnimatedEmojiScale != animatedEmojiConfig.scale { let themeData = ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper) - let chatPresentationData = ChatPresentationData(theme: themeData, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, animatedEmojiScale: animatedEmojiConfig.scale) + let chatPresentationData = ChatPresentationData(theme: themeData, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners, animatedEmojiScale: animatedEmojiConfig.scale) strongSelf.currentPresentationData = chatPresentationData strongSelf.dynamicBounceEnabled = !presentationData.disableAnimations diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift index 0cbef84d24..3fecaf1419 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageAnimatedStickerItemNode.swift @@ -349,7 +349,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView { let currentItem = self.item return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in - let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params) + let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params, presentationData: item.presentationData) let incoming = item.message.effectivelyIncoming(item.context.account.peerId) var imageSize: CGSize = CGSize(width: 200.0, height: 200.0) var isEmoji = false diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift index a24df24f77..09ab5933d4 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBackground.swift @@ -82,8 +82,8 @@ class ChatMessageBackground: ASDisplayNode { super.init() self.isUserInteractionEnabled = false - self.addSubnode(self.outlineImageNode) self.addSubnode(self.imageNode) + self.addSubnode(self.outlineImageNode) } func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) { diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift index 7da5d38987..1f0b4a71ad 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleBackdrop.swift @@ -91,7 +91,7 @@ final class ChatMessageBubbleBackdrop: ASDisplayNode { } func setType(type: ChatMessageBackgroundType, theme: ChatPresentationThemeData, mediaBox: MediaBox, essentialGraphics: PrincipalThemeEssentialGraphics, maskMode: Bool) { - if self.currentType != type || self.theme != theme || self.currentMaskMode != maskMode { + if self.currentType != type || self.theme != theme || self.currentMaskMode != maskMode || self.essentialGraphics !== essentialGraphics { self.currentType = type self.theme = theme self.essentialGraphics = essentialGraphics diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift index f3c7671062..bb22c33754 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleContentCalclulateImageCorners.swift @@ -1,8 +1,9 @@ import Foundation import UIKit import Display +import TelegramPresentationData -func chatMessageBubbleImageContentCorners(relativeContentPosition position: ChatMessageBubbleContentPosition, normalRadius: CGFloat, mergedRadius: CGFloat, mergedWithAnotherContentRadius: CGFloat) -> ImageCorners { +func chatMessageBubbleImageContentCorners(relativeContentPosition position: ChatMessageBubbleContentPosition, normalRadius: CGFloat, mergedRadius: CGFloat, mergedWithAnotherContentRadius: CGFloat, layoutConstants: ChatMessageItemLayoutConstants, chatPresentationData: ChatPresentationData) -> ImageCorners { let topLeftCorner: ImageCorner let topRightCorner: ImageCorner @@ -55,13 +56,33 @@ func chatMessageBubbleImageContentCorners(relativeContentPosition position: Chat bottomLeftCorner = .Corner(mergedRadius) bottomRightCorner = .Corner(normalRadius) case let .None(status): + let bubbleInsets: UIEdgeInsets + if case .color = chatPresentationData.theme.wallpaper { + let colors: PresentationThemeBubbleColorComponents + switch status { + case .Incoming: + colors = chatPresentationData.theme.theme.chat.message.incoming.bubble.withoutWallpaper + case .Outgoing: + colors = chatPresentationData.theme.theme.chat.message.outgoing.bubble.withoutWallpaper + case .None: + colors = chatPresentationData.theme.theme.chat.message.incoming.bubble.withoutWallpaper + } + if colors.fill == colors.stroke || colors.stroke.alpha.isZero { + bubbleInsets = UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0) + } else { + bubbleInsets = layoutConstants.bubble.strokeInsets + } + } else { + bubbleInsets = layoutConstants.image.bubbleInsets + } + switch status { case .Incoming: - bottomLeftCorner = .Tail(normalRadius, true) + bottomLeftCorner = .Tail(normalRadius, PresentationResourcesChat.chatBubbleMediaCorner(chatPresentationData.theme.theme, incoming: true, mainRadius: normalRadius, inset: max(0.0, bubbleInsets.left - 1.0))!) bottomRightCorner = .Corner(normalRadius) case .Outgoing: bottomLeftCorner = .Corner(normalRadius) - bottomRightCorner = .Tail(normalRadius, true) + bottomRightCorner = .Tail(normalRadius, PresentationResourcesChat.chatBubbleMediaCorner(chatPresentationData.theme.theme, incoming: false, mainRadius: normalRadius, inset: max(0.0, bubbleInsets.right - 1.0))!) case .None: bottomLeftCorner = .Corner(normalRadius) bottomRightCorner = .Corner(normalRadius) @@ -75,7 +96,20 @@ func chatMessageBubbleImageContentCorners(relativeContentPosition position: Chat switch position.bottomLeft { case let .none(tail): if tail { - bottomLeftCorner = .Tail(normalRadius, true) + let bubbleInsets: UIEdgeInsets + if case .color = chatPresentationData.theme.wallpaper { + let colors: PresentationThemeBubbleColorComponents + colors = chatPresentationData.theme.theme.chat.message.incoming.bubble.withoutWallpaper + if colors.fill == colors.stroke || colors.stroke.alpha.isZero { + bubbleInsets = UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0) + } else { + bubbleInsets = layoutConstants.bubble.strokeInsets + } + } else { + bubbleInsets = layoutConstants.image.bubbleInsets + } + + bottomLeftCorner = .Tail(normalRadius, PresentationResourcesChat.chatBubbleMediaCorner(chatPresentationData.theme.theme, incoming: true, mainRadius: normalRadius, inset: max(0.0, bubbleInsets.left - 1.0))!) } else { bottomLeftCorner = .Corner(normalRadius) } @@ -85,7 +119,19 @@ func chatMessageBubbleImageContentCorners(relativeContentPosition position: Chat switch position.bottomRight { case let .none(tail): if tail { - bottomRightCorner = .Tail(normalRadius, true) + let bubbleInsets: UIEdgeInsets + if case .color = chatPresentationData.theme.wallpaper { + let colors: PresentationThemeBubbleColorComponents + colors = chatPresentationData.theme.theme.chat.message.outgoing.bubble.withoutWallpaper + if colors.fill == colors.stroke || colors.stroke.alpha.isZero { + bubbleInsets = UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0) + } else { + bubbleInsets = layoutConstants.bubble.strokeInsets + } + } else { + bubbleInsets = layoutConstants.image.bubbleInsets + } + bottomRightCorner = .Tail(normalRadius, PresentationResourcesChat.chatBubbleMediaCorner(chatPresentationData.theme.theme, incoming: false, mainRadius: normalRadius, inset: max(0.0, bubbleInsets.right - 1.0))!) } else { bottomRightCorner = .Corner(normalRadius) } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift index a507081fd5..406e3a59f5 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift @@ -615,7 +615,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let weakSelf = Weak(self) return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in - let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params) + let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params, presentationData: item.presentationData) return ChatMessageBubbleItemNode.beginLayout(selfReference: weakSelf, item, params, mergedTop, mergedBottom, dateHeaderAtBottom, currentContentClassesPropertiesAndLayouts: currentContentClassesPropertiesAndLayouts, authorNameLayout: authorNameLayout, @@ -1546,7 +1546,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode let layout = ListViewItemNodeLayout(contentSize: layoutSize, insets: layoutInsets) - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) var updatedMergedTop = mergedBottom var updatedMergedBottom = mergedTop @@ -2769,7 +2769,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode if self.highlightedState != highlighted { self.highlightedState = highlighted if let backgroundType = self.backgroundType { - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners) let hasWallpaper = item.presentationData.theme.wallpaper.hasWallpaper self.backgroundNode.setType(type: backgroundType, highlighted: highlighted, graphics: graphics, maskMode: self.contextSourceNode.isExtractedToContextPreview, hasWallpaper: hasWallpaper, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift index 12b8e635f9..114cebebbd 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageDateAndStatusNode.swift @@ -187,7 +187,7 @@ class ChatMessageDateAndStatusNode: ASDisplayNode { let themeUpdated = presentationData.theme != currentTheme || type != currentType - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) let isDefaultWallpaper = serviceMessageColorHasDefaultWallpaper(presentationData.theme.wallpaper) let offset: CGFloat = -UIScreenPixel diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift b/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift index 45efafcf67..97640a4d64 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageDateHeader.swift @@ -161,7 +161,7 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode { self.transform = CATransform3DMakeRotation(CGFloat.pi, 0.0, 0.0, 1.0) - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) self.backgroundNode.image = graphics.dateStaticBackground self.stickBackgroundNode.image = graphics.dateFloatingBackground @@ -190,7 +190,7 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode { let previousPresentationData = self.presentationData self.presentationData = presentationData - let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) self.backgroundNode.image = graphics.dateStaticBackground self.stickBackgroundNode.image = graphics.dateFloatingBackground diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift index 77dbaa3cbe..c1f5d88cec 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInstantVideoItemNode.swift @@ -115,7 +115,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView { let currentForwardInfo = self.appliedForwardInfo return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in - let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params) + let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params, presentationData: item.presentationData) let incoming = item.message.effectivelyIncoming(item.context.account.peerId) let avatarInset: CGFloat diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift index 1a3e3d599b..664a47f472 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveFileNode.swift @@ -439,7 +439,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode { if hasThumbnail { fileIconImage = nil } else { - let principalGraphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper) + let principalGraphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners) fileIconImage = incoming ? principalGraphics.radialIndicatorFileIconIncoming : principalGraphics.radialIndicatorFileIconOutgoing } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift b/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift index 11450a6aa4..5377241b60 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageItemView.swift @@ -11,9 +11,9 @@ import ContextUI import ChatListUI struct ChatMessageItemWidthFill { - let compactInset: CGFloat - let compactWidthBoundary: CGFloat - let freeMaximumFillFactor: CGFloat + var compactInset: CGFloat + var compactWidthBoundary: CGFloat + var freeMaximumFillFactor: CGFloat func widthFor(_ width: CGFloat) -> CGFloat { if width <= self.compactWidthBoundary { @@ -25,68 +25,68 @@ struct ChatMessageItemWidthFill { } struct ChatMessageItemBubbleLayoutConstants { - let edgeInset: CGFloat - let defaultSpacing: CGFloat - let mergedSpacing: CGFloat - let maximumWidthFill: ChatMessageItemWidthFill - let minimumSize: CGSize - let contentInsets: UIEdgeInsets - let borderInset: CGFloat - let strokeInsets: UIEdgeInsets + var edgeInset: CGFloat + var defaultSpacing: CGFloat + var mergedSpacing: CGFloat + var maximumWidthFill: ChatMessageItemWidthFill + var minimumSize: CGSize + var contentInsets: UIEdgeInsets + var borderInset: CGFloat + var strokeInsets: UIEdgeInsets } struct ChatMessageItemTextLayoutConstants { - let bubbleInsets: UIEdgeInsets + var bubbleInsets: UIEdgeInsets } struct ChatMessageItemImageLayoutConstants { - let bubbleInsets: UIEdgeInsets - let statusInsets: UIEdgeInsets - let defaultCornerRadius: CGFloat - let mergedCornerRadius: CGFloat - let contentMergedCornerRadius: CGFloat - let maxDimensions: CGSize - let minDimensions: CGSize + var bubbleInsets: UIEdgeInsets + var statusInsets: UIEdgeInsets + var defaultCornerRadius: CGFloat + var mergedCornerRadius: CGFloat + var contentMergedCornerRadius: CGFloat + var maxDimensions: CGSize + var minDimensions: CGSize } struct ChatMessageItemVideoLayoutConstants { - let maxHorizontalHeight: CGFloat - let maxVerticalHeight: CGFloat + var maxHorizontalHeight: CGFloat + var maxVerticalHeight: CGFloat } struct ChatMessageItemInstantVideoConstants { - let insets: UIEdgeInsets - let dimensions: CGSize + var insets: UIEdgeInsets + var dimensions: CGSize } struct ChatMessageItemFileLayoutConstants { - let bubbleInsets: UIEdgeInsets + var bubbleInsets: UIEdgeInsets } struct ChatMessageItemWallpaperLayoutConstants { - let maxTextWidth: CGFloat + var maxTextWidth: CGFloat } struct ChatMessageItemLayoutConstants { - let avatarDiameter: CGFloat - let timestampHeaderHeight: CGFloat + var avatarDiameter: CGFloat + var timestampHeaderHeight: CGFloat - let bubble: ChatMessageItemBubbleLayoutConstants - let image: ChatMessageItemImageLayoutConstants - let video: ChatMessageItemVideoLayoutConstants - let text: ChatMessageItemTextLayoutConstants - let file: ChatMessageItemFileLayoutConstants - let instantVideo: ChatMessageItemInstantVideoConstants - let wallpapers: ChatMessageItemWallpaperLayoutConstants + var bubble: ChatMessageItemBubbleLayoutConstants + var image: ChatMessageItemImageLayoutConstants + var video: ChatMessageItemVideoLayoutConstants + var text: ChatMessageItemTextLayoutConstants + var file: ChatMessageItemFileLayoutConstants + var instantVideo: ChatMessageItemInstantVideoConstants + var wallpapers: ChatMessageItemWallpaperLayoutConstants static var `default`: ChatMessageItemLayoutConstants { return self.compact } fileprivate static var compact: ChatMessageItemLayoutConstants { - let bubble = ChatMessageItemBubbleLayoutConstants(edgeInset: 4.0, defaultSpacing: 2.0 + UIScreenPixel, mergedSpacing: 1.0, maximumWidthFill: ChatMessageItemWidthFill(compactInset: 36.0, compactWidthBoundary: 500.0, freeMaximumFillFactor: 0.85), minimumSize: CGSize(width: 40.0, height: 35.0), contentInsets: UIEdgeInsets(top: 0.0, left: 6.0, bottom: 0.0, right: 0.0), borderInset: UIScreenPixel, strokeInsets: UIEdgeInsets(top: 1.0 - UIScreenPixel, left: 1.0 - UIScreenPixel, bottom: 1.0 - UIScreenPixel, right: 1.0 - UIScreenPixel)) + let bubble = ChatMessageItemBubbleLayoutConstants(edgeInset: 4.0, defaultSpacing: 2.0 + UIScreenPixel, mergedSpacing: 1.0, maximumWidthFill: ChatMessageItemWidthFill(compactInset: 36.0, compactWidthBoundary: 500.0, freeMaximumFillFactor: 0.85), minimumSize: CGSize(width: 40.0, height: 35.0), contentInsets: UIEdgeInsets(top: 0.0, left: 6.0, bottom: 0.0, right: 0.0), borderInset: UIScreenPixel, strokeInsets: UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0)) let text = ChatMessageItemTextLayoutConstants(bubbleInsets: UIEdgeInsets(top: 6.0 + UIScreenPixel, left: 12.0, bottom: 6.0 - UIScreenPixel, right: 12.0)) - let image = ChatMessageItemImageLayoutConstants(bubbleInsets: UIEdgeInsets(top: 1.0 + UIScreenPixel, left: 1.0 + UIScreenPixel, bottom: 1.0 + UIScreenPixel, right: 1.0 + UIScreenPixel), statusInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 6.0, right: 6.0), defaultCornerRadius: 17.0, mergedCornerRadius: 5.0, contentMergedCornerRadius: 0.0, maxDimensions: CGSize(width: 300.0, height: 300.0), minDimensions: CGSize(width: 170.0, height: 74.0)) + let image = ChatMessageItemImageLayoutConstants(bubbleInsets: UIEdgeInsets(top: 2.0, left: 2.0, bottom: 2.0, right: 2.0), statusInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 6.0, right: 6.0), defaultCornerRadius: 16.0, mergedCornerRadius: 8.0, contentMergedCornerRadius: 0.0, maxDimensions: CGSize(width: 300.0, height: 300.0), minDimensions: CGSize(width: 170.0, height: 74.0)) let video = ChatMessageItemVideoLayoutConstants(maxHorizontalHeight: 250.0, maxVerticalHeight: 360.0) let file = ChatMessageItemFileLayoutConstants(bubbleInsets: UIEdgeInsets(top: 15.0, left: 9.0, bottom: 15.0, right: 12.0)) let instantVideo = ChatMessageItemInstantVideoConstants(insets: UIEdgeInsets(top: 4.0, left: 0.0, bottom: 4.0, right: 0.0), dimensions: CGSize(width: 212.0, height: 212.0)) @@ -98,7 +98,7 @@ struct ChatMessageItemLayoutConstants { fileprivate static var regular: ChatMessageItemLayoutConstants { let bubble = ChatMessageItemBubbleLayoutConstants(edgeInset: 4.0, defaultSpacing: 2.0 + UIScreenPixel, mergedSpacing: 1.0, maximumWidthFill: ChatMessageItemWidthFill(compactInset: 36.0, compactWidthBoundary: 500.0, freeMaximumFillFactor: 0.65), minimumSize: CGSize(width: 40.0, height: 35.0), contentInsets: UIEdgeInsets(top: 0.0, left: 6.0, bottom: 0.0, right: 0.0), borderInset: UIScreenPixel, strokeInsets: UIEdgeInsets(top: 1.0 - UIScreenPixel, left: 1.0 - UIScreenPixel, bottom: 1.0 - UIScreenPixel, right: 1.0 - UIScreenPixel)) let text = ChatMessageItemTextLayoutConstants(bubbleInsets: UIEdgeInsets(top: 6.0 + UIScreenPixel, left: 12.0, bottom: 6.0 - UIScreenPixel, right: 12.0)) - let image = ChatMessageItemImageLayoutConstants(bubbleInsets: UIEdgeInsets(top: 1.0 + UIScreenPixel, left: 1.0 + UIScreenPixel, bottom: 1.0 + UIScreenPixel, right: 1.0 + UIScreenPixel), statusInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 6.0, right: 6.0), defaultCornerRadius: 17.0, mergedCornerRadius: 5.0, contentMergedCornerRadius: 5.0, maxDimensions: CGSize(width: 440.0, height: 440.0), minDimensions: CGSize(width: 170.0, height: 74.0)) + let image = ChatMessageItemImageLayoutConstants(bubbleInsets: UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0), statusInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: 6.0, right: 6.0), defaultCornerRadius: 17.0, mergedCornerRadius: 5.0, contentMergedCornerRadius: 5.0, maxDimensions: CGSize(width: 440.0, height: 440.0), minDimensions: CGSize(width: 170.0, height: 74.0)) let video = ChatMessageItemVideoLayoutConstants(maxHorizontalHeight: 250.0, maxVerticalHeight: 360.0) let file = ChatMessageItemFileLayoutConstants(bubbleInsets: UIEdgeInsets(top: 15.0, left: 9.0, bottom: 15.0, right: 12.0)) let instantVideo = ChatMessageItemInstantVideoConstants(insets: UIEdgeInsets(top: 4.0, left: 0.0, bottom: 4.0, right: 0.0), dimensions: CGSize(width: 212.0, height: 212.0)) @@ -108,12 +108,24 @@ struct ChatMessageItemLayoutConstants { } } -func chatMessageItemLayoutConstants(_ constants: (ChatMessageItemLayoutConstants, ChatMessageItemLayoutConstants), params: ListViewItemLayoutParams) -> ChatMessageItemLayoutConstants { +func chatMessageItemLayoutConstants(_ constants: (ChatMessageItemLayoutConstants, ChatMessageItemLayoutConstants), params: ListViewItemLayoutParams, presentationData: ChatPresentationData) -> ChatMessageItemLayoutConstants { + var result: ChatMessageItemLayoutConstants if params.width > 680.0 { - return constants.1 + result = constants.1 } else { - return constants.0 + result = constants.0 } + result.image.defaultCornerRadius = presentationData.chatBubbleCorners.mainRadius + result.image.mergedCornerRadius = presentationData.chatBubbleCorners.mergeBubbleCorners ? presentationData.chatBubbleCorners.auxiliaryRadius : presentationData.chatBubbleCorners.mainRadius + let minRadius: CGFloat = 4.0 + let maxRadius: CGFloat = 16.0 + let radiusTransition = (presentationData.chatBubbleCorners.mainRadius - minRadius) / (maxRadius - minRadius) + let minInset: CGFloat = 9.0 + let maxInset: CGFloat = 12.0 + let textInset: CGFloat = min(maxInset, ceil(maxInset * radiusTransition + minInset * (1.0 - radiusTransition))) + result.text.bubbleInsets.left = textInset + result.text.bubbleInsets.right = textInset + return result } enum ChatMessageItemBottomNeighbor { diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift index f0602bea07..178685165d 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageMapBubbleContentNode.swift @@ -159,13 +159,13 @@ class ChatMessageMapBubbleContentNode: ChatMessageBubbleContentNode { if case let .linear(top, _) = position { relativePosition = .linear(top: top, bottom: ChatMessageBubbleRelativePosition.Neighbour) } - imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: relativePosition, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius) + imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: relativePosition, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius, layoutConstants: layoutConstants, chatPresentationData: item.presentationData) maxTextWidth = constrainedSize.width - bubbleInsets.left + bubbleInsets.right - layoutConstants.text.bubbleInsets.left - layoutConstants.text.bubbleInsets.right - 40.0 } else { maxTextWidth = constrainedSize.width - imageSize.width - bubbleInsets.left + bubbleInsets.right - layoutConstants.text.bubbleInsets.right - imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: position, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius) + imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: position, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius, layoutConstants: layoutConstants, chatPresentationData: item.presentationData) } let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(1.0, maxTextWidth), height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift index c1f5213022..4566abadca 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageMediaBubbleContentNode.swift @@ -128,8 +128,8 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { } else { colors = item.presentationData.theme.theme.chat.message.outgoing.bubble.withoutWallpaper } - if colors.fill == colors.stroke { - bubbleInsets = UIEdgeInsets() + if colors.fill == colors.stroke || colors.stroke.alpha.isZero { + bubbleInsets = UIEdgeInsets(top: 1.0, left: 1.0, bottom: 1.0, right: 1.0) } else { bubbleInsets = layoutConstants.bubble.strokeInsets } @@ -162,7 +162,7 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode { updatedPosition = .linear(top: top, bottom: .Neighbour) } - let imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: updatedPosition, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius) + let imageCorners = chatMessageBubbleImageContentCorners(relativeContentPosition: updatedPosition, normalRadius: layoutConstants.image.defaultCornerRadius, mergedRadius: layoutConstants.image.mergedCornerRadius, mergedWithAnotherContentRadius: layoutConstants.image.contentMergedCornerRadius, layoutConstants: layoutConstants, chatPresentationData: item.presentationData) let (refinedWidth, finishLayout) = refineLayout(CGSize(width: constrainedSize.width - bubbleInsets.left - bubbleInsets.right, height: constrainedSize.height), automaticPlayback, wideLayout, imageCorners) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift index d9c2e3c55d..7a0f4ff8c8 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageStickerItemNode.swift @@ -143,7 +143,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView { let currentItem = self.item return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in - let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params) + let layoutConstants = chatMessageItemLayoutConstants(layoutConstants, params: params, presentationData: item.presentationData) let incoming = item.message.effectivelyIncoming(item.context.account.peerId) var imageSize: CGSize = CGSize(width: 100.0, height: 100.0) if let telegramFile = telegramFile { diff --git a/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift b/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift index 0927b45710..253882e904 100644 --- a/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift +++ b/submodules/TelegramUI/TelegramUI/ChatPresentationData.swift @@ -28,6 +28,7 @@ public final class ChatPresentationData { let nameDisplayOrder: PresentationPersonNameOrder let disableAnimations: Bool let largeEmoji: Bool + let chatBubbleCorners: PresentationChatBubbleCorners let animatedEmojiScale: CGFloat let isPreview: Bool @@ -39,13 +40,14 @@ public final class ChatPresentationData { let messageFixedFont: UIFont let messageBlockQuoteFont: UIFont - init(theme: ChatPresentationThemeData, fontSize: PresentationFontSize, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool, animatedEmojiScale: CGFloat = 1.0, isPreview: Bool = false) { + init(theme: ChatPresentationThemeData, fontSize: PresentationFontSize, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool, chatBubbleCorners: PresentationChatBubbleCorners, animatedEmojiScale: CGFloat = 1.0, isPreview: Bool = false) { self.theme = theme self.fontSize = fontSize self.strings = strings self.dateTimeFormat = dateTimeFormat self.nameDisplayOrder = nameDisplayOrder self.disableAnimations = disableAnimations + self.chatBubbleCorners = chatBubbleCorners self.largeEmoji = largeEmoji self.isPreview = isPreview diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift index cf5344ad57..2a2b602ab9 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift @@ -113,7 +113,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { self.state = ChatRecentActionsControllerState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, fontSize: self.presentationData.chatFontSize) - self.chatPresentationDataPromise = Promise(ChatPresentationData(theme: ChatPresentationThemeData(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper), fontSize: self.presentationData.chatFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations, largeEmoji: self.presentationData.largeEmoji)) + self.chatPresentationDataPromise = Promise(ChatPresentationData(theme: ChatPresentationThemeData(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper), fontSize: self.presentationData.chatFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations, largeEmoji: self.presentationData.largeEmoji, chatBubbleCorners: self.presentationData.chatBubbleCorners)) self.eventLogContext = ChannelAdminEventLogContext(postbox: self.context.account.postbox, network: self.context.account.network, peerId: self.peer.id) @@ -496,7 +496,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { |> deliverOnMainQueue).start(next: { [weak self] presentationData in if let strongSelf = self { strongSelf.presentationData = presentationData - strongSelf.chatPresentationDataPromise.set(.single(ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji))) + strongSelf.chatPresentationDataPromise.set(.single(ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners))) strongSelf.updateThemeAndStrings(theme: presentationData.theme, strings: presentationData.strings) } diff --git a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift index b30f9e2e02..9c845b4699 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift @@ -272,7 +272,10 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, self.messageBackgroundNode.contentMode = .scaleToFill let outgoing: PresentationThemeBubbleColorComponents = self.presentationData.chatWallpaper.isEmpty ? self.presentationData.theme.chat.message.outgoing.bubble.withoutWallpaper : self.presentationData.theme.chat.message.outgoing.bubble.withWallpaper - self.messageBackgroundNode.image = messageBubbleImage(incoming: false, fillColor: outgoing.gradientFill, strokeColor: outgoing.fill == outgoing.gradientFill ? outgoing.stroke : .clear, neighbors: .none, theme: self.presentationData.theme.chat, wallpaper: self.presentationData.chatWallpaper, knockout: false) + + let maxCornerRadius = self.presentationData.chatBubbleCorners.mainRadius + let minCornerRadius = self.presentationData.chatBubbleCorners.auxiliaryRadius + self.messageBackgroundNode.image = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: maxCornerRadius, incoming: false, fillColor: outgoing.gradientFill, strokeColor: outgoing.fill == outgoing.gradientFill ? outgoing.stroke : .clear, neighbors: .none, theme: self.presentationData.theme.chat, wallpaper: self.presentationData.chatWallpaper, knockout: false) self.view.addSubview(self.effectView) self.addSubnode(self.dimNode) @@ -376,7 +379,9 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, } let outgoing: PresentationThemeBubbleColorComponents = self.presentationData.chatWallpaper.isEmpty ? self.presentationData.theme.chat.message.outgoing.bubble.withoutWallpaper : self.presentationData.theme.chat.message.outgoing.bubble.withWallpaper - self.messageBackgroundNode.image = messageBubbleImage(incoming: false, fillColor: outgoing.gradientFill, strokeColor: outgoing.fill == outgoing.gradientFill ? outgoing.stroke : .clear, neighbors: .none, theme: self.presentationData.theme.chat, wallpaper: self.presentationData.chatWallpaper, knockout: false) + let maxCornerRadius = self.presentationData.chatBubbleCorners.mainRadius + let minCornerRadius = self.presentationData.chatBubbleCorners.auxiliaryRadius + self.messageBackgroundNode.image = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: maxCornerRadius, incoming: false, fillColor: outgoing.gradientFill, strokeColor: outgoing.fill == outgoing.gradientFill ? outgoing.stroke : .clear, neighbors: .none, theme: self.presentationData.theme.chat, wallpaper: self.presentationData.chatWallpaper, knockout: false) for node in self.contentNodes { node.updateTheme(presentationData.theme) diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index aab4fb144de75691c1805eb292a35ee88189e6ef..8fcfb968b659141e77ba3896905c51a987a97092 100644 GIT binary patch delta 23767 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 XZWidpbJ%dxNn&vd&BeJq>ZJbzX8$Vv delta 23793 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 Void)? = nil, clickThroughMessage: (() -> Void)? = nil) -> ListViewItem { + public func makeChatMessagePreviewItem(context: AccountContext, message: Message, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)? = nil, clickThroughMessage: (() -> Void)? = nil) -> ListViewItem { let controllerInteraction: ChatControllerInteraction if tapMessage != nil || clickThroughMessage != nil { controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in @@ -1139,11 +1139,11 @@ public final class SharedAccountContextImpl: SharedAccountContext { controllerInteraction = defaultChatControllerInteraction } - return ChatMessageItem(presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: theme, wallpaper: wallpaper), fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameOrder, disableAnimations: false, largeEmoji: false, animatedEmojiScale: 1.0, isPreview: true), context: context, chatLocation: .peer(message.id.peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false, isScheduledMessages: false, contactsPeerIds: Set(), animatedEmojiStickers: [:], forcedResourceStatus: forcedResourceStatus), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes()), disableDate: true, additionalContent: nil) + return ChatMessageItem(presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: theme, wallpaper: wallpaper), fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameOrder, disableAnimations: false, largeEmoji: false, chatBubbleCorners: chatBubbleCorners, animatedEmojiScale: 1.0, isPreview: true), context: context, chatLocation: .peer(message.id.peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false, isScheduledMessages: false, contactsPeerIds: Set(), animatedEmojiStickers: [:], forcedResourceStatus: forcedResourceStatus), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes()), disableDate: true, additionalContent: nil) } - public func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader { - return ChatMessageDateHeader(timestamp: timestamp, scheduled: false, presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: theme, wallpaper: wallpaper), fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameOrder, disableAnimations: false, largeEmoji: false, animatedEmojiScale: 1.0, isPreview: true), context: context) + public func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader { + return ChatMessageDateHeader(timestamp: timestamp, scheduled: false, presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: theme, wallpaper: wallpaper), fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameOrder, disableAnimations: false, largeEmoji: false, chatBubbleCorners: chatBubbleCorners, animatedEmojiScale: 1.0, isPreview: true), context: context) } public func openWallet(context: AccountContext, walletContext: OpenWalletContext, present: @escaping (ViewController) -> Void) { diff --git a/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift b/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift index 3051fa73ed..2371c501a3 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeUpdateManager.swift @@ -139,7 +139,7 @@ final class ThemeUpdateManagerImpl: ThemeUpdateManager { theme = updatedTheme } - return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }) }).start() } diff --git a/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift b/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift index 9f20c48e3e..0527746dd8 100644 --- a/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift +++ b/submodules/TelegramUI/TelegramUI/WallpaperUploadManager.swift @@ -133,7 +133,7 @@ final class WallpaperUploadManagerImpl: WallpaperUploadManager { var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers themeSpecificChatWallpapers[themeReference.index] = updatedWallpaper themeSpecificChatWallpapers[coloredThemeIndex(reference: themeReference, accentColor: current.themeSpecificAccentColors[themeReference.index])] = updatedWallpaper - return PresentationThemeSettings(theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + return PresentationThemeSettings(theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) })).start() } diff --git a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift index f78a460341..ab9d7e7291 100644 --- a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift +++ b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift @@ -531,6 +531,32 @@ public struct PresentationThemeAccentColor: PostboxCoding, Equatable { } } +public struct PresentationChatBubbleSettings: PostboxCoding, Equatable { + public var mainRadius: Int32 + public var auxiliaryRadius: Int32 + public var mergeBubbleCorners: Bool + + public static var `default`: PresentationChatBubbleSettings = PresentationChatBubbleSettings(mainRadius: 16, auxiliaryRadius: 8, mergeBubbleCorners: true) + + public init(mainRadius: Int32, auxiliaryRadius: Int32, mergeBubbleCorners: Bool) { + self.mainRadius = mainRadius + self.auxiliaryRadius = auxiliaryRadius + self.mergeBubbleCorners = mergeBubbleCorners + } + + public init(decoder: PostboxDecoder) { + self.mainRadius = decoder.decodeInt32ForKey("mainRadius", orElse: 16) + self.auxiliaryRadius = decoder.decodeInt32ForKey("auxiliaryRadius", orElse: 8) + self.mergeBubbleCorners = decoder.decodeInt32ForKey("mergeBubbleCorners", orElse: 1) != 0 + } + + public func encode(_ encoder: PostboxEncoder) { + encoder.encodeInt32(self.mainRadius, forKey: "mainRadius") + encoder.encodeInt32(self.auxiliaryRadius, forKey: "auxiliaryRadius") + encoder.encodeInt32(self.mergeBubbleCorners ? 1 : 0, forKey: "mergeBubbleCorners") + } +} + public struct PresentationThemeSettings: PreferencesEntry { public var theme: PresentationThemeReference public var themeSpecificAccentColors: [Int64: PresentationThemeAccentColor] @@ -538,6 +564,7 @@ public struct PresentationThemeSettings: PreferencesEntry { public var useSystemFont: Bool public var fontSize: PresentationFontSize public var listsFontSize: PresentationFontSize + public var chatBubbleSettings: PresentationChatBubbleSettings public var automaticThemeSwitchSetting: AutomaticThemeSwitchSetting public var largeEmoji: Bool public var disableAnimations: Bool @@ -578,16 +605,17 @@ public struct PresentationThemeSettings: PreferencesEntry { } public static var defaultSettings: PresentationThemeSettings { - return PresentationThemeSettings(theme: .builtin(.dayClassic), themeSpecificAccentColors: [:], themeSpecificChatWallpapers: [:], useSystemFont: true, fontSize: .regular, listsFontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night)), largeEmoji: true, disableAnimations: true) + return PresentationThemeSettings(theme: .builtin(.dayClassic), themeSpecificAccentColors: [:], themeSpecificChatWallpapers: [:], useSystemFont: true, fontSize: .regular, listsFontSize: .regular, chatBubbleSettings: .default, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night)), largeEmoji: true, disableAnimations: true) } - public init(theme: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], themeSpecificChatWallpapers: [Int64: TelegramWallpaper], useSystemFont: Bool, fontSize: PresentationFontSize, listsFontSize: PresentationFontSize, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting, largeEmoji: Bool, disableAnimations: Bool) { + public init(theme: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], themeSpecificChatWallpapers: [Int64: TelegramWallpaper], useSystemFont: Bool, fontSize: PresentationFontSize, listsFontSize: PresentationFontSize, chatBubbleSettings: PresentationChatBubbleSettings, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting, largeEmoji: Bool, disableAnimations: Bool) { self.theme = theme self.themeSpecificAccentColors = themeSpecificAccentColors self.themeSpecificChatWallpapers = themeSpecificChatWallpapers self.useSystemFont = useSystemFont self.fontSize = fontSize self.listsFontSize = listsFontSize + self.chatBubbleSettings = chatBubbleSettings self.automaticThemeSwitchSetting = automaticThemeSwitchSetting self.largeEmoji = largeEmoji self.disableAnimations = disableAnimations @@ -612,6 +640,7 @@ public struct PresentationThemeSettings: PreferencesEntry { let fontSize = PresentationFontSize(rawValue: decoder.decodeInt32ForKey("f", orElse: PresentationFontSize.regular.rawValue)) ?? .regular self.fontSize = fontSize self.listsFontSize = PresentationFontSize(rawValue: decoder.decodeInt32ForKey("lf", orElse: PresentationFontSize.regular.rawValue)) ?? fontSize + self.chatBubbleSettings = decoder.decodeObjectForKey("chatBubbleSettings", decoder: { PresentationChatBubbleSettings(decoder: $0) }) as? PresentationChatBubbleSettings ?? PresentationChatBubbleSettings.default self.automaticThemeSwitchSetting = (decoder.decodeObjectForKey("automaticThemeSwitchSetting", decoder: { AutomaticThemeSwitchSetting(decoder: $0) }) as? AutomaticThemeSwitchSetting) ?? AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night)) self.largeEmoji = decoder.decodeBoolForKey("largeEmoji", orElse: true) self.disableAnimations = decoder.decodeBoolForKey("disableAnimations", orElse: true) @@ -628,6 +657,7 @@ public struct PresentationThemeSettings: PreferencesEntry { encoder.encodeInt32(self.useSystemFont ? 1 : 0, forKey: "useSystemFont") encoder.encodeInt32(self.fontSize.rawValue, forKey: "f") encoder.encodeInt32(self.listsFontSize.rawValue, forKey: "lf") + encoder.encodeObject(self.chatBubbleSettings, forKey: "chatBubbleSettings") encoder.encodeObject(self.automaticThemeSwitchSetting, forKey: "automaticThemeSwitchSetting") encoder.encodeBool(self.largeEmoji, forKey: "largeEmoji") encoder.encodeBool(self.disableAnimations, forKey: "disableAnimations") @@ -642,39 +672,43 @@ public struct PresentationThemeSettings: PreferencesEntry { } public static func ==(lhs: PresentationThemeSettings, rhs: PresentationThemeSettings) -> Bool { - return lhs.theme == rhs.theme && lhs.themeSpecificAccentColors == rhs.themeSpecificAccentColors && lhs.themeSpecificChatWallpapers == rhs.themeSpecificChatWallpapers && lhs.useSystemFont == rhs.useSystemFont && lhs.fontSize == rhs.fontSize && lhs.listsFontSize == rhs.listsFontSize && lhs.automaticThemeSwitchSetting == rhs.automaticThemeSwitchSetting && lhs.largeEmoji == rhs.largeEmoji && lhs.disableAnimations == rhs.disableAnimations + return lhs.theme == rhs.theme && lhs.themeSpecificAccentColors == rhs.themeSpecificAccentColors && lhs.themeSpecificChatWallpapers == rhs.themeSpecificChatWallpapers && lhs.useSystemFont == rhs.useSystemFont && lhs.fontSize == rhs.fontSize && lhs.listsFontSize == rhs.listsFontSize && lhs.chatBubbleSettings == rhs.chatBubbleSettings && lhs.automaticThemeSwitchSetting == rhs.automaticThemeSwitchSetting && lhs.largeEmoji == rhs.largeEmoji && lhs.disableAnimations == rhs.disableAnimations } public func withUpdatedTheme(_ theme: PresentationThemeReference) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedThemeSpecificAccentColors(_ themeSpecificAccentColors: [Int64: PresentationThemeAccentColor]) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedThemeSpecificChatWallpapers(_ themeSpecificChatWallpapers: [Int64: TelegramWallpaper]) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedUseSystemFont(_ useSystemFont: Bool) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedFontSizes(fontSize: PresentationFontSize, listsFontSize: PresentationFontSize) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: fontSize, listsFontSize: listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: fontSize, listsFontSize: listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + } + + public func withUpdatedChatBubbleSettings(_ chatBubbleSettings: PresentationChatBubbleSettings) -> PresentationThemeSettings { + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedAutomaticThemeSwitchSetting(_ automaticThemeSwitchSetting: AutomaticThemeSwitchSetting) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedLargeEmoji(_ largeEmoji: Bool) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: largeEmoji, disableAnimations: self.disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: largeEmoji, disableAnimations: self.disableAnimations) } public func withUpdatedDisableAnimations(_ disableAnimations: Bool) -> PresentationThemeSettings { - return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: disableAnimations) + return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: disableAnimations) } }