diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 98d77b86f7..c01a87e199 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4481,3 +4481,34 @@ Any member of this group will be able to see messages in the channel."; "Chat.AttachmentLimitExceeded" = "Slowmode is enabled. You can't select more items."; "Chat.AttachmentMultipleFilesDisabled" = "Slowmode is enabled. You can't send multiple files at once."; "Chat.AttachmentMultipleForwardDisabled" = "Slowmode is enabled. You can't forward multiple messages at once."; +"StickerPacksSettings.AnimatedStickersInfo" = "Animated stickers in a chat will play continuously."; + +"Appearance.ThemePreview.ChatList.1.Name" = "Eva Summer"; +"Appearance.ThemePreview.ChatList.1.Text" = "Text"; + +"Appearance.ThemePreview.ChatList.2.Name" = "Your inner Competition"; +"Appearance.ThemePreview.ChatList.2.Text" = "Hey"; + +"Appearance.ThemePreview.ChatList.3.Name" = "Mike Apple"; +"Appearance.ThemePreview.ChatList.3.Text" = "Mike Apple"; + +"Appearance.ThemePreview.ChatList.4.Name" = "Paul Newman"; +"Appearance.ThemePreview.ChatList.4.Text" = "Any ideas?"; + +"Appearance.ThemePreview.ChatList.5.Name" = "Old Pirates"; +"Appearance.ThemePreview.ChatList.5.Text" = "Yo-ho-ho"; + +"Appearance.ThemePreview.ChatList.6.Name" = "Kate Bright"; +"Appearance.ThemePreview.ChatList.6.Text" = "Hola!"; + +"Appearance.ThemePreview.ChatList.7.Name" = "What"; +"Appearance.ThemePreview.ChatList.7.Text" = "Hola!"; + +"Appearance.ThemePreview.ChatList.8.Name" = "What"; +"Appearance.ThemePreview.ChatList.8.Text" = "Hola!"; + +"Conversation.Owner" = "owner"; + +"Group.EditAdmin.RankTitle" = "ROLE"; +"Group.EditAdmin.RankOwnerPlaceholder" = "owner"; +"Group.EditAdmin.RankAdminPlaceholder" = "admin"; diff --git a/submodules/Display/Display/UIKitUtils.swift b/submodules/Display/Display/UIKitUtils.swift index 82997a9820..3a35f30661 100644 --- a/submodules/Display/Display/UIKitUtils.swift +++ b/submodules/Display/Display/UIKitUtils.swift @@ -56,9 +56,13 @@ public extension UIColor { if hexString.hasPrefix("#") { scanner.scanLocation = 1 } - var num: UInt32 = 0 - if scanner.scanHexInt32(&num) { - self.init(rgb: num) + var value: UInt32 = 0 + if scanner.scanHexInt32(&value) { + if hexString.count > 7 { + self.init(argb: value) + } else { + self.init(rgb: value) + } } else { return nil } @@ -148,6 +152,18 @@ public extension UIColor { } return self } + + func interpolateTo(_ color: UIColor, fraction: CGFloat) -> UIColor? { + let f = min(max(0, fraction), 1) + + guard let c1 = self.cgColor.components, let c2 = color.cgColor.components else { return nil } + let r: CGFloat = CGFloat(c1[0] + (c2[0] - c1[0]) * f) + let g: CGFloat = CGFloat(c1[1] + (c2[1] - c1[1]) * f) + let b: CGFloat = CGFloat(c1[2] + (c2[2] - c1[2]) * f) + let a: CGFloat = CGFloat(c1[3] + (c2[3] - c1[3]) * f) + + return UIColor(red: r, green: g, blue: b, alpha: a) + } } public extension CGSize { diff --git a/submodules/GZip/Sources/GZip.m b/submodules/GZip/Sources/GZip.m index 9e7a828e7d..1c1df4a450 100644 --- a/submodules/GZip/Sources/GZip.m +++ b/submodules/GZip/Sources/GZip.m @@ -66,11 +66,7 @@ NSData * _Nullable TGGUnzipData(NSData *data, uint sizeLimit) } if (stream.total_out >= output.length) { - NSUInteger length = output.length + data.length / 2; - if (sizeLimit > 0 && length > sizeLimit) { - return nil; - } - output.length = length; + output.length = output.length + data.length / 2; } stream.next_out = (uint8_t *)output.mutableBytes + stream.total_out; stream.avail_out = (uInt)(output.length - stream.total_out); @@ -79,6 +75,8 @@ NSData * _Nullable TGGUnzipData(NSData *data, uint sizeLimit) if (inflateEnd(&stream) == Z_OK) { if (status == Z_STREAM_END) { output.length = stream.total_out; + } else if (sizeLimit > 0 && output.length > sizeLimit) { + return nil; } } } diff --git a/submodules/RLottie/Sources/LottieInstance.mm b/submodules/RLottie/Sources/LottieInstance.mm index 499469e2d8..66e3ccdcb8 100644 --- a/submodules/RLottie/Sources/LottieInstance.mm +++ b/submodules/RLottie/Sources/LottieInstance.mm @@ -21,14 +21,7 @@ _frameCount = (int32_t)_animation->totalFrame(); _frameRate = (int32_t)_animation->frameRate(); - size_t width = 0; - size_t height = 0; - _animation->size(width, height); - - if (width != height || (width != 100 && width != 512)) { - return nil; - } - if ((_frameRate > 30 && _frameRate != 60) || _animation->duration() > 4.5) { + if ((_frameRate > 60) || _animation->duration() > 4.5) { return nil; } } diff --git a/submodules/TelegramCore/TelegramCore/AccountState.swift b/submodules/TelegramCore/TelegramCore/AccountState.swift index f99fb03467..ca57a4b82a 100644 --- a/submodules/TelegramCore/TelegramCore/AccountState.swift +++ b/submodules/TelegramCore/TelegramCore/AccountState.swift @@ -151,7 +151,7 @@ public enum UnauthorizedAccountStateContents: PostboxCoding, Equatable { case passwordEntry(hint: String, number: String?, code: String?, suggestReset: Bool, syncContacts: Bool) case passwordRecovery(hint: String, number: String?, code: String?, emailPattern: String, syncContacts: Bool) case awaitingAccountReset(protectedUntil: Int32, number: String?, syncContacts: Bool) - case signUp(number: String, codeHash: String, code: String, firstName: String, lastName: String, termsOfService: UnauthorizedAccountTermsOfService?, syncContacts: Bool) + case signUp(number: String, codeHash: String, firstName: String, lastName: String, termsOfService: UnauthorizedAccountTermsOfService?, syncContacts: Bool) public init(decoder: PostboxDecoder) { switch decoder.decodeInt32ForKey("v", orElse: 0) { @@ -172,7 +172,7 @@ public enum UnauthorizedAccountStateContents: PostboxCoding, Equatable { case UnauthorizedAccountStateContentsValue.awaitingAccountReset.rawValue: self = .awaitingAccountReset(protectedUntil: decoder.decodeInt32ForKey("protectedUntil", orElse: 0), number: decoder.decodeOptionalStringForKey("number"), syncContacts: decoder.decodeInt32ForKey("syncContacts", orElse: 1) != 0) case UnauthorizedAccountStateContentsValue.signUp.rawValue: - self = .signUp(number: decoder.decodeStringForKey("n", orElse: ""), codeHash: decoder.decodeStringForKey("h", orElse: ""), code: decoder.decodeStringForKey("c", orElse: ""), firstName: decoder.decodeStringForKey("f", orElse: ""), lastName: decoder.decodeStringForKey("l", orElse: ""), termsOfService: decoder.decodeObjectForKey("tos", decoder: { UnauthorizedAccountTermsOfService(decoder: $0) }) as? UnauthorizedAccountTermsOfService, syncContacts: decoder.decodeInt32ForKey("syncContacts", orElse: 1) != 0) + self = .signUp(number: decoder.decodeStringForKey("n", orElse: ""), codeHash: decoder.decodeStringForKey("h", orElse: ""), firstName: decoder.decodeStringForKey("f", orElse: ""), lastName: decoder.decodeStringForKey("l", orElse: ""), termsOfService: decoder.decodeObjectForKey("tos", decoder: { UnauthorizedAccountTermsOfService(decoder: $0) }) as? UnauthorizedAccountTermsOfService, syncContacts: decoder.decodeInt32ForKey("syncContacts", orElse: 1) != 0) default: assertionFailure() self = .empty @@ -242,11 +242,10 @@ public enum UnauthorizedAccountStateContents: PostboxCoding, Equatable { encoder.encodeNil(forKey: "number") } encoder.encodeInt32(syncContacts ? 1 : 0, forKey: "syncContacts") - case let .signUp(number, codeHash, code, firstName, lastName, termsOfService, syncContacts): + case let .signUp(number, codeHash, firstName, lastName, termsOfService, syncContacts): encoder.encodeInt32(UnauthorizedAccountStateContentsValue.signUp.rawValue, forKey: "v") encoder.encodeString(number, forKey: "n") encoder.encodeString(codeHash, forKey: "h") - encoder.encodeString(code, forKey: "c") encoder.encodeString(firstName, forKey: "f") encoder.encodeString(lastName, forKey: "l") if let termsOfService = termsOfService { @@ -314,8 +313,8 @@ public enum UnauthorizedAccountStateContents: PostboxCoding, Equatable { } else { return false } - case let .signUp(number, codeHash, code, firstName, lastName, termsOfService, syncContacts): - if case .signUp(number, codeHash, code, firstName, lastName, termsOfService, syncContacts) = rhs { + case let .signUp(number, codeHash, firstName, lastName, termsOfService, syncContacts): + if case .signUp(number, codeHash, firstName, lastName, termsOfService, syncContacts) = rhs { return true } else { return false diff --git a/submodules/TelegramCore/TelegramCore/AddPeerMember.swift b/submodules/TelegramCore/TelegramCore/AddPeerMember.swift index 2a105a78a4..446c878aee 100644 --- a/submodules/TelegramCore/TelegramCore/AddPeerMember.swift +++ b/submodules/TelegramCore/TelegramCore/AddPeerMember.swift @@ -91,10 +91,10 @@ public func addChannelMember(account: Account, peerId: PeerId, memberId: PeerId) if let peer = transaction.getPeer(peerId), let memberPeer = transaction.getPeer(memberId), let inputUser = apiInputUser(memberPeer) { if let channel = peer as? TelegramChannel, let inputChannel = apiInputChannel(channel) { let updatedParticipant: ChannelParticipant - if let currentParticipant = currentParticipant, case let .member(_, invitedAt, adminInfo, _) = currentParticipant { - updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: invitedAt, adminInfo: adminInfo, banInfo: nil) + if let currentParticipant = currentParticipant, case let .member(_, invitedAt, adminInfo, _, rank) = currentParticipant { + updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: invitedAt, adminInfo: adminInfo, banInfo: nil, rank: rank) } else { - updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: nil, banInfo: nil) + updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: nil, banInfo: nil, rank: nil) } return account.network.request(Api.functions.channels.inviteToChannel(channel: inputChannel, users: [inputUser])) |> map { [$0] } @@ -131,7 +131,7 @@ public func addChannelMember(account: Account, peerId: PeerId, memberId: PeerId) switch currentParticipant { case .creator: break - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): if let banInfo = banInfo { wasBanned = true wasMember = !banInfo.rights.flags.contains(.banReadMessages) @@ -158,7 +158,7 @@ public func addChannelMember(account: Account, peerId: PeerId, memberId: PeerId) if let presence = transaction.getPeerPresence(peerId: memberPeer.id) { presences[memberPeer.id] = presence } - if case let .member(_, _, maybeAdminInfo, maybeBannedInfo) = updatedParticipant { + if case let .member(_, _, maybeAdminInfo, maybeBannedInfo, _) = updatedParticipant { if let adminInfo = maybeAdminInfo { if let peer = transaction.getPeer(adminInfo.promotedBy) { peers[peer.id] = peer diff --git a/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift b/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift index c527243f99..84db8e8128 100644 --- a/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift +++ b/submodules/TelegramCore/TelegramCore/ApiGroupOrChannel.swift @@ -47,9 +47,9 @@ func parseTelegramGroupOrChannel(chat: Api.Chat) -> Peer? { var groupFlags = TelegramGroupFlags() var role: TelegramGroupRole = .member if (flags & (1 << 0)) != 0 { - role = .creator + role = .creator(rank: nil) } else if let adminRights = adminRights { - role = .admin(TelegramChatAdminRights(apiAdminRights: adminRights)) + role = .admin(TelegramChatAdminRights(apiAdminRights: adminRights), rank: nil) } if (flags & (1 << 5)) != 0 { groupFlags.insert(.deactivated) diff --git a/submodules/TelegramCore/TelegramCore/Authorization.swift b/submodules/TelegramCore/TelegramCore/Authorization.swift index 51c9673471..95e5a98f92 100644 --- a/submodules/TelegramCore/TelegramCore/Authorization.swift +++ b/submodules/TelegramCore/TelegramCore/Authorization.swift @@ -260,7 +260,7 @@ public func authorizeWithCode(accountManager: AccountManager, account: Unauthori public func beginSignUp(account: UnauthorizedAccount, data: AuthorizationSignUpData) -> Signal { return account.postbox.transaction { transaction -> Void in - transaction.setState(UnauthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, contents: .signUp(number: data.number, codeHash: data.codeHash, code: data.code, firstName: "", lastName: "", termsOfService: data.termsOfService, syncContacts: data.syncContacts))) + transaction.setState(UnauthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, contents: .signUp(number: data.number, codeHash: data.codeHash, firstName: "", lastName: "", termsOfService: data.termsOfService, syncContacts: data.syncContacts))) } |> ignoreValues } @@ -441,7 +441,7 @@ public enum SignUpError { public func signUpWithName(accountManager: AccountManager, account: UnauthorizedAccount, firstName: String, lastName: String, avatarData: Data?) -> Signal { return account.postbox.transaction { transaction -> Signal in - if let state = transaction.getState() as? UnauthorizedAccountState, case let .signUp(number, codeHash, _, _, _, _, syncContacts) = state.contents { + if let state = transaction.getState() as? UnauthorizedAccountState, case let .signUp(number, codeHash, _, _, _, syncContacts) = state.contents { return account.network.request(Api.functions.auth.signUp(phoneNumber: number, phoneCodeHash: codeHash, firstName: firstName, lastName: lastName)) |> mapError { error -> SignUpError in if error.errorDescription.hasPrefix("FLOOD_WAIT") { diff --git a/submodules/TelegramCore/TelegramCore/CachedChannelParticipants.swift b/submodules/TelegramCore/TelegramCore/CachedChannelParticipants.swift index 3c86ee97e8..6a8e4d1f44 100644 --- a/submodules/TelegramCore/TelegramCore/CachedChannelParticipants.swift +++ b/submodules/TelegramCore/TelegramCore/CachedChannelParticipants.swift @@ -75,22 +75,31 @@ public struct ChannelParticipantBannedInfo: PostboxCoding, Equatable { } public enum ChannelParticipant: PostboxCoding, Equatable { - case creator(id: PeerId) - case member(id: PeerId, invitedAt: Int32, adminInfo: ChannelParticipantAdminInfo?, banInfo: ChannelParticipantBannedInfo?) + case creator(id: PeerId, rank: String?) + case member(id: PeerId, invitedAt: Int32, adminInfo: ChannelParticipantAdminInfo?, banInfo: ChannelParticipantBannedInfo?, rank: String?) public var peerId: PeerId { switch self { - case let .creator(id): + case let .creator(id, _): return id - case let .member(id, _, _, _): + case let .member(id, _, _, _, _): return id } } + public var rank: String? { + switch self { + case let .creator(_, rank): + return rank + case let .member(_, _, _, _, rank): + return rank + } + } + public static func ==(lhs: ChannelParticipant, rhs: ChannelParticipant) -> Bool { switch lhs { - case let .member(lhsId, lhsInvitedAt, lhsAdminInfo, lhsBanInfo): - if case let .member(rhsId, rhsInvitedAt, rhsAdminInfo, rhsBanInfo) = rhs { + case let .member(lhsId, lhsInvitedAt, lhsAdminInfo, lhsBanInfo, lhsRank): + if case let .member(rhsId, rhsInvitedAt, rhsAdminInfo, rhsBanInfo, rhsRank) = rhs { if lhsId != rhsId { return false } @@ -103,12 +112,15 @@ public enum ChannelParticipant: PostboxCoding, Equatable { if lhsBanInfo != rhsBanInfo { return false } + if lhsRank != rhsRank { + return false + } return true } else { return false } - case let .creator(id): - if case .creator(id) = rhs { + case let .creator(id, rank): + if case .creator(id, rank) = rhs { return true } else { return false @@ -119,17 +131,17 @@ public enum ChannelParticipant: PostboxCoding, Equatable { public init(decoder: PostboxDecoder) { switch decoder.decodeInt32ForKey("r", orElse: 0) { case ChannelParticipantValue.member.rawValue: - self = .member(id: PeerId(decoder.decodeInt64ForKey("i", orElse: 0)), invitedAt: decoder.decodeInt32ForKey("t", orElse: 0), adminInfo: decoder.decodeObjectForKey("ai", decoder: { ChannelParticipantAdminInfo(decoder: $0) }) as? ChannelParticipantAdminInfo, banInfo: decoder.decodeObjectForKey("bi", decoder: { ChannelParticipantBannedInfo(decoder: $0) }) as? ChannelParticipantBannedInfo) + self = .member(id: PeerId(decoder.decodeInt64ForKey("i", orElse: 0)), invitedAt: decoder.decodeInt32ForKey("t", orElse: 0), adminInfo: decoder.decodeObjectForKey("ai", decoder: { ChannelParticipantAdminInfo(decoder: $0) }) as? ChannelParticipantAdminInfo, banInfo: decoder.decodeObjectForKey("bi", decoder: { ChannelParticipantBannedInfo(decoder: $0) }) as? ChannelParticipantBannedInfo, rank: decoder.decodeOptionalStringForKey("rank")) case ChannelParticipantValue.creator.rawValue: - self = .creator(id: PeerId(decoder.decodeInt64ForKey("i", orElse: 0))) + self = .creator(id: PeerId(decoder.decodeInt64ForKey("i", orElse: 0)), rank: decoder.decodeOptionalStringForKey("rank")) default: - self = .member(id: PeerId(decoder.decodeInt64ForKey("i", orElse: 0)), invitedAt: decoder.decodeInt32ForKey("t", orElse: 0), adminInfo: nil, banInfo: nil) + self = .member(id: PeerId(decoder.decodeInt64ForKey("i", orElse: 0)), invitedAt: decoder.decodeInt32ForKey("t", orElse: 0), adminInfo: nil, banInfo: nil, rank: nil) } } public func encode(_ encoder: PostboxEncoder) { switch self { - case let .member(id, invitedAt, adminInfo, banInfo): + case let .member(id, invitedAt, adminInfo, banInfo, rank): encoder.encodeInt32(ChannelParticipantValue.member.rawValue, forKey: "r") encoder.encodeInt64(id.toInt64(), forKey: "i") encoder.encodeInt32(invitedAt, forKey: "t") @@ -143,9 +155,19 @@ public enum ChannelParticipant: PostboxCoding, Equatable { } else { encoder.encodeNil(forKey: "bi") } - case let .creator(id): + if let rank = rank { + encoder.encodeString(rank, forKey: "rank") + } else { + encoder.encodeNil(forKey: "rank") + } + case let .creator(id, rank): encoder.encodeInt32(ChannelParticipantValue.creator.rawValue, forKey: "r") encoder.encodeInt64(id.toInt64(), forKey: "i") + if let rank = rank { + encoder.encodeString(rank, forKey: "rank") + } else { + encoder.encodeNil(forKey: "rank") + } } } } @@ -175,17 +197,17 @@ extension ChannelParticipant { init(apiParticipant: Api.ChannelParticipant) { switch apiParticipant { case let .channelParticipant(userId, date): - self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: nil) - case let .channelParticipantCreator(_, userId, _): - self = .creator(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)) + self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: nil, rank: nil) + case let .channelParticipantCreator(_, userId, rank): + self = .creator(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), rank: rank) case let .channelParticipantBanned(flags, userId, restrictedBy, date, bannedRights): let hasLeft = (flags & (1 << 0)) != 0 let banInfo = ChannelParticipantBannedInfo(rights: TelegramChatBannedRights(apiBannedRights: bannedRights), restrictedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: restrictedBy), timestamp: date, isMember: !hasLeft) - self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: banInfo) - case let .channelParticipantAdmin(flags, userId, _, promotedBy, date, adminRights, _): - self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(apiAdminRights: adminRights), promotedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: promotedBy), canBeEditedByAccountPeer: (flags & (1 << 0)) != 0), banInfo: nil) + self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: banInfo, rank: nil) + case let .channelParticipantAdmin(flags, userId, _, promotedBy, date, adminRights, rank: rank): + self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(apiAdminRights: adminRights), promotedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: promotedBy), canBeEditedByAccountPeer: (flags & (1 << 0)) != 0), banInfo: nil, rank: rank) case let .channelParticipantSelf(userId, _, date): - self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: nil) + self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: nil, rank: nil) } } } diff --git a/submodules/TelegramCore/TelegramCore/ChannelBlacklist.swift b/submodules/TelegramCore/TelegramCore/ChannelBlacklist.swift index 9a7ec28554..d050e0374c 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelBlacklist.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelBlacklist.swift @@ -101,7 +101,7 @@ public struct ChannelBlacklist { var updatedRestricted = updated.restricted var updatedBanned = updated.banned - if case .member(_, _, _, let maybeBanInfo) = participant.participant, let banInfo = maybeBanInfo { + if case let .member(_, _, _, maybeBanInfo, _) = participant.participant, let banInfo = maybeBanInfo { if banInfo.rights.flags.contains(.banReadMessages) { updatedBanned.insert(participant, at: 0) } else { @@ -144,14 +144,14 @@ public func updateChannelMemberBannedRights(account: Account, peerId: PeerId, me return account.postbox.transaction { transaction -> Signal<(ChannelParticipant?, RenderedChannelParticipant?, Bool), NoError> in if let peer = transaction.getPeer(peerId), let inputChannel = apiInputChannel(peer), let _ = transaction.getPeer(account.peerId), let memberPeer = transaction.getPeer(memberId), let inputUser = apiInputUser(memberPeer) { let updatedParticipant: ChannelParticipant - if let currentParticipant = currentParticipant, case let .member(_, invitedAt, _, currentBanInfo) = currentParticipant { + if let currentParticipant = currentParticipant, case let .member(_, invitedAt, _, currentBanInfo, _) = currentParticipant { let banInfo: ChannelParticipantBannedInfo? if let rights = rights, !rights.flags.isEmpty { banInfo = ChannelParticipantBannedInfo(rights: rights, restrictedBy: currentBanInfo?.restrictedBy ?? account.peerId, timestamp: currentBanInfo?.timestamp ?? Int32(Date().timeIntervalSince1970), isMember: currentBanInfo?.isMember ?? true) } else { banInfo = nil } - updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: invitedAt, adminInfo: nil, banInfo: banInfo) + updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: invitedAt, adminInfo: nil, banInfo: banInfo, rank: nil) } else { let banInfo: ChannelParticipantBannedInfo? if let rights = rights, !rights.flags.isEmpty { @@ -159,7 +159,7 @@ public func updateChannelMemberBannedRights(account: Account, peerId: PeerId, me } else { banInfo = nil } - updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: nil, banInfo: banInfo) + updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: nil, banInfo: banInfo, rank: nil) } return account.network.request(Api.functions.channels.editBanned(channel: inputChannel, userId: inputUser, bannedRights: rights?.apiBannedRights ?? Api.ChatBannedRights.chatBannedRights(flags: 0, untilDate: 0))) @@ -175,7 +175,7 @@ public func updateChannelMemberBannedRights(account: Account, peerId: PeerId, me switch currentParticipant { case .creator: break - case let .member(_, _, adminInfo, banInfo): + case let .member(_, _, adminInfo, banInfo, _): if let _ = adminInfo { wasAdmin = true } @@ -243,7 +243,7 @@ public func updateChannelMemberBannedRights(account: Account, peerId: PeerId, me if let presence = transaction.getPeerPresence(peerId: memberPeer.id) { presences[memberPeer.id] = presence } - if case let .member(_, _, _, maybeBanInfo) = updatedParticipant, let banInfo = maybeBanInfo { + if case let .member(_, _, _, maybeBanInfo, _) = updatedParticipant, let banInfo = maybeBanInfo { if let peer = transaction.getPeer(banInfo.restrictedBy) { peers[peer.id] = peer } diff --git a/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift b/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift index f942cf3d56..24a07b3992 100644 --- a/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift +++ b/submodules/TelegramCore/TelegramCore/ChannelOwnershipTransfer.swift @@ -96,9 +96,9 @@ public func updateChannelOwnership(account: Account, accountStateManager: Accoun } else { flags = TelegramChatAdminRightsFlags.groupSpecific } - - let updatedParticipant = ChannelParticipant.creator(id: user.id) - let updatedPreviousCreator = ChannelParticipant.member(id: accountUser.id, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: flags), promotedBy: accountUser.id, canBeEditedByAccountPeer: false), banInfo: nil) + + let updatedParticipant = ChannelParticipant.creator(id: user.id, rank: currentParticipant?.rank) + let updatedPreviousCreator = ChannelParticipant.member(id: accountUser.id, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: flags), promotedBy: accountUser.id, canBeEditedByAccountPeer: false), banInfo: nil, rank: currentCreator?.rank) let checkPassword = twoStepAuthData(account.network) |> mapError { error -> ChannelOwnershipTransferError in @@ -164,7 +164,7 @@ public func updateChannelOwnership(account: Account, accountStateManager: Accoun switch currentParticipant { case .creator: wasAdmin = true - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if let adminInfo = adminInfo, !adminInfo.rights.isEmpty { wasAdmin = true } diff --git a/submodules/TelegramCore/TelegramCore/JoinChannel.swift b/submodules/TelegramCore/TelegramCore/JoinChannel.swift index 04d010de19..a1117e818d 100644 --- a/submodules/TelegramCore/TelegramCore/JoinChannel.swift +++ b/submodules/TelegramCore/TelegramCore/JoinChannel.swift @@ -55,7 +55,7 @@ public func joinChannel(account: Account, peerId: PeerId) -> Signal Signal { - return .complete() - /*return account.postbox.transaction { transaction -> Signal in - if let peer = transaction.getPeer(peerId) { - if let channel = peer as? TelegramChannel, let inputChannel = apiInputChannel(channel) { - return account.network.request(Api.functions.channels.toggleInvites(channel: inputChannel, enabled: type == .unrestricted ? .boolTrue : .boolFalse)) - |> mapError { _ -> UpdateGroupManagementTypeError in - return .generic - } - |> mapToSignal { result -> Signal in - account.stateManager.addUpdates(result) - return .complete() - } - } else if let group = peer as? TelegramGroup { - return account.network.request(Api.functions.messages.toggleChatAdmins(chatId: group.id.id, enabled: type == .restrictedToAdmins ? .boolTrue : .boolFalse)) - |> mapError { _ -> UpdateGroupManagementTypeError in - return .generic - } - |> mapToSignal { result -> Signal in - account.stateManager.addUpdates(result) - return .complete() - } - } else { - return .complete() - } - } else { - return .complete() - } - } - |> introduceError(UpdateGroupManagementTypeError.self) - |> switchToLatest*/ -} - public enum RemoveGroupAdminError { case generic } @@ -197,7 +155,7 @@ public func fetchChannelParticipant(account: Account, peerId: PeerId, participan } |> switchToLatest } -public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId: PeerId, rights: TelegramChatAdminRights) -> Signal<(ChannelParticipant?, RenderedChannelParticipant), UpdateChannelAdminRightsError> { +public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId: PeerId, rights: TelegramChatAdminRights, rank: String?) -> Signal<(ChannelParticipant?, RenderedChannelParticipant), UpdateChannelAdminRightsError> { return fetchChannelParticipant(account: account, peerId: peerId, participantId: adminId) |> mapError { error -> UpdateChannelAdminRightsError in return .generic @@ -207,14 +165,14 @@ public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId: if let peer = transaction.getPeer(peerId), let adminPeer = transaction.getPeer(adminId), let inputUser = apiInputUser(adminPeer) { if let channel = peer as? TelegramChannel, let inputChannel = apiInputChannel(channel) { let updatedParticipant: ChannelParticipant - if let currentParticipant = currentParticipant, case let .member(_, invitedAt, currentAdminInfo, _) = currentParticipant { + if let currentParticipant = currentParticipant, case let .member(_, invitedAt, currentAdminInfo, _, _) = currentParticipant { let adminInfo: ChannelParticipantAdminInfo? if !rights.flags.isEmpty { adminInfo = ChannelParticipantAdminInfo(rights: rights, promotedBy: currentAdminInfo?.promotedBy ?? account.peerId, canBeEditedByAccountPeer: true) } else { adminInfo = nil } - updatedParticipant = ChannelParticipant.member(id: adminId, invitedAt: invitedAt, adminInfo: adminInfo, banInfo: nil) + updatedParticipant = ChannelParticipant.member(id: adminId, invitedAt: invitedAt, adminInfo: adminInfo, banInfo: nil, rank: rank) } else { let adminInfo: ChannelParticipantAdminInfo? if !rights.flags.isEmpty { @@ -222,9 +180,9 @@ public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId: } else { adminInfo = nil } - updatedParticipant = ChannelParticipant.member(id: adminId, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: adminInfo, banInfo: nil) + updatedParticipant = ChannelParticipant.member(id: adminId, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: adminInfo, banInfo: nil, rank: rank) } - return account.network.request(Api.functions.channels.editAdmin(channel: inputChannel, userId: inputUser, adminRights: rights.apiAdminRights, rank: "")) + return account.network.request(Api.functions.channels.editAdmin(channel: inputChannel, userId: inputUser, adminRights: rights.apiAdminRights, rank: rank ?? "")) |> map { [$0] } |> `catch` { error -> Signal<[Api.Updates], UpdateChannelAdminRightsError> in if error.errorDescription == "USER_NOT_PARTICIPANT" { @@ -235,11 +193,13 @@ public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId: |> mapError { error -> UpdateChannelAdminRightsError in return .addMemberError(error) } - |> then(account.network.request(Api.functions.channels.editAdmin(channel: inputChannel, userId: inputUser, adminRights: rights.apiAdminRights, rank: "")) + |> then( + account.network.request(Api.functions.channels.editAdmin(channel: inputChannel, userId: inputUser, adminRights: rights.apiAdminRights, rank: rank ?? "")) |> mapError { error -> UpdateChannelAdminRightsError in return .generic } - |> map { [$0] }) + |> map { [$0] } + ) } else if error.errorDescription == "USER_PRIVACY_RESTRICTED" { return .fail(.addMemberError(.restricted)) } @@ -258,7 +218,7 @@ public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId: switch currentParticipant { case .creator: wasAdmin = true - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if let adminInfo = adminInfo, !adminInfo.rights.isEmpty { wasAdmin = true } @@ -281,7 +241,7 @@ public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId: if let presence = transaction.getPeerPresence(peerId: adminPeer.id) { presences[adminPeer.id] = presence } - if case let .member(_, _, maybeAdminInfo, _) = updatedParticipant, let adminInfo = maybeAdminInfo { + if case let .member(_, _, maybeAdminInfo, _, _) = updatedParticipant, let adminInfo = maybeAdminInfo { if let peer = transaction.getPeer(adminInfo.promotedBy) { peers[peer.id] = peer } diff --git a/submodules/TelegramCore/TelegramCore/TelegramGroup.swift b/submodules/TelegramCore/TelegramCore/TelegramGroup.swift index 16c1899da3..49d932e60e 100644 --- a/submodules/TelegramCore/TelegramCore/TelegramGroup.swift +++ b/submodules/TelegramCore/TelegramCore/TelegramGroup.swift @@ -6,16 +6,16 @@ import Foundation #endif public enum TelegramGroupRole: Equatable, PostboxCoding { - case creator - case admin(TelegramChatAdminRights) + case creator(rank: String?) + case admin(TelegramChatAdminRights, rank: String?) case member public init(decoder: PostboxDecoder) { switch decoder.decodeInt32ForKey("_v", orElse: 0) { case 0: - self = .creator + self = .creator(rank: decoder.decodeOptionalStringForKey("rank")) case 1: - self = .admin(decoder.decodeObjectForKey("r", decoder: { TelegramChatAdminRights(decoder: $0) }) as! TelegramChatAdminRights) + self = .admin(decoder.decodeObjectForKey("r", decoder: { TelegramChatAdminRights(decoder: $0) }) as! TelegramChatAdminRights, rank: decoder.decodeOptionalStringForKey("rank")) case 2: self = .member default: @@ -26,11 +26,21 @@ public enum TelegramGroupRole: Equatable, PostboxCoding { public func encode(_ encoder: PostboxEncoder) { switch self { - case .creator: + case let .creator(rank): encoder.encodeInt32(0, forKey: "_v") - case let .admin(rights): + if let rank = rank { + encoder.encodeString(rank, forKey: "rank") + } else { + encoder.encodeNil(forKey: "rank") + } + case let .admin(rights, rank): encoder.encodeInt32(1, forKey: "_v") encoder.encodeObject(rights, forKey: "r") + if let rank = rank { + encoder.encodeString(rank, forKey: "rank") + } else { + encoder.encodeNil(forKey: "rank") + } case .member: encoder.encodeInt32(2, forKey: "_v") } @@ -108,7 +118,7 @@ public final class TelegramGroup: Peer { if let role = decoder.decodeObjectForKey("rv", decoder: { TelegramGroupRole(decoder: $0) }) as? TelegramGroupRole { self.role = role } else if let roleValue = decoder.decodeOptionalInt32ForKey("r"), roleValue == 0 { - self.role = .creator + self.role = .creator(rank: nil) } else { self.role = .member } diff --git a/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift b/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift index 16d556faed..f4e050c63c 100644 --- a/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift +++ b/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift @@ -26,6 +26,10 @@ public extension NavigationBarPresentationData { convenience public init(presentationData: PresentationData) { self.init(theme: NavigationBarTheme(rootControllerTheme: presentationData.theme), strings: NavigationBarStrings(presentationStrings: presentationData.strings)) } + + convenience public init(presentationTheme: PresentationTheme, presentationStrings: PresentationStrings) { + self.init(theme: NavigationBarTheme(rootControllerTheme: presentationTheme), strings: NavigationBarStrings(presentationStrings: presentationStrings)) + } } public extension ActionSheetControllerTheme { @@ -59,7 +63,4 @@ public extension NavigationControllerTheme { convenience init(presentationTheme: PresentationTheme) { self.init(navigationBar: NavigationBarTheme(rootControllerTheme: presentationTheme), emptyAreaColor: presentationTheme.chatList.backgroundColor) } -// convenience public init(presentationTheme: PresentationTheme) { -// self.init(navigationBar: NavigationBarTheme(rootControllerTheme: presentationTheme), emptyAreaColor: presentationTheme.chatList.backgroundColor, emptyDetailIcon: generateTintedImage(image: UIImage(named: "Chat List/EmptyMasterDetailIcon", in: Bundle(for: PresentationTheme.self), compatibleWith: nil), color: presentationTheme.chatList.messageTextColor.withAlphaComponent(0.2))) -// } } diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift index be1bc7d431..6246d70b1e 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift @@ -4,7 +4,24 @@ import UIKit private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationTheme { let destructiveColor: UIColor = UIColor(rgb: 0xeb5545) let constructiveColor: UIColor = UIColor(rgb: 0x08a723) - let secretColor: UIColor = UIColor(rgb: 0x00B12C) + let secretColor: UIColor = UIColor(rgb: 0x00b12c) + + let badgeTextColor: UIColor + let outgoingBubbleFillColor: UIColor + let outgoingBubbleHighlightedFillColor: UIColor + let outgoingScamColor: UIColor + + if accentColor.rgb == UIColor.white.rgb { + badgeTextColor = .black + outgoingBubbleFillColor = UIColor(rgb: 0x313131) + outgoingBubbleHighlightedFillColor = UIColor(rgb: 0x464646) + outgoingScamColor = destructiveColor + } else { + outgoingBubbleFillColor = accentColor + badgeTextColor = .white + outgoingBubbleHighlightedFillColor = accentColor.withMultipliedBrightnessBy(1.421) + outgoingScamColor = .white + } let rootTabBar = PresentationThemeRootTabBar( backgroundColor: UIColor(rgb: 0x1c1c1d), @@ -13,7 +30,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem selectedIconColor: accentColor, textColor: UIColor(rgb: 0x828282), selectedTextColor: accentColor, - badgeBackgroundColor: UIColor(rgb: 0xeb5545), + badgeBackgroundColor: destructiveColor, badgeStrokeColor: UIColor(rgb: 0x1c1c1d), badgeTextColor: UIColor(rgb: 0xffffff) ) @@ -27,7 +44,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem accentTextColor: accentColor, backgroundColor: UIColor(rgb: 0x1c1c1d), separatorColor: UIColor(rgb: 0x3d3d40), - badgeBackgroundColor: UIColor(rgb: 0xeb5545), + badgeBackgroundColor: destructiveColor, badgeStrokeColor: UIColor(rgb: 0x1c1c1d), badgeTextColor: UIColor(rgb: 0xffffff) ) @@ -36,16 +53,16 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem backgroundColor: UIColor(rgb: 0x1c1c1d), accentColor: accentColor, inputFillColor: UIColor(rgb: 0x0f0f0f), - inputTextColor: accentColor, + inputTextColor: .white, inputPlaceholderTextColor: UIColor(rgb: 0x8f8f8f), inputIconColor: UIColor(rgb: 0x8f8f8f), inputClearButtonColor: UIColor(rgb: 0x8f8f8f), separatorColor: UIColor(rgb: 0x3d3d40) ) - let auth = PresentationThemeAuth( - introStartButtonColor: accentColor, - introDotColor: UIColor(rgb: 0x5e5e5e) + let intro = PresentationThemeIntro( + startButtonColor: accentColor, + dotColor: UIColor(rgb: 0x5e5e5e) ) let passcode = PresentationThemePasscode( @@ -63,8 +80,8 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem let switchColors = PresentationThemeSwitch( frameColor: UIColor(rgb: 0x5a5a5e), handleColor: UIColor(rgb: 0x121212), - contentColor: UIColor(rgb: 0xb2b2b2), - positiveColor: UIColor(rgb: 0x000000), + contentColor: UIColor(rgb: 0x77d572), + positiveColor: constructiveColor, negativeColor: destructiveColor ) @@ -83,7 +100,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem itemBlocksSeparatorColor: UIColor(rgb: 0x3d3d40), itemPlainSeparatorColor: UIColor(rgb: 0x3d3d40), disclosureArrowColor: UIColor(rgb: 0x5a5a5e), - sectionHeaderTextColor: UIColor(rgb: 0xffffff), + sectionHeaderTextColor: UIColor(rgb: 0x8d8e93), freeTextColor: UIColor(rgb: 0x8d8e93), freeTextErrorColor: UIColor(rgb: 0xcf3030), freeTextSuccessColor: UIColor(rgb: 0x30cf30), @@ -101,11 +118,12 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem itemCheckColors: PresentationThemeFillStrokeForeground( fillColor: accentColor, strokeColor: UIColor(rgb: 0xffffff, alpha: 0.5), - foregroundColor: UIColor(rgb: 0x000000) + foregroundColor: badgeTextColor ), controlSecondaryColor: UIColor(rgb: 0xffffff, alpha: 0.5), freeInputField: PresentationInputFieldTheme( backgroundColor: UIColor(rgb: 0xffffff, alpha: 0.5), + strokeColor: UIColor(rgb: 0xffffff, alpha: 0.5), placeholderColor: UIColor(rgb: 0x4d4d4d), primaryColor: .white, controlColor: UIColor(rgb: 0x4d4d4d) @@ -113,7 +131,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem mediaPlaceholderColor: UIColor(rgb: 0x1c1c1d), scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.3), pageIndicatorInactiveColor: UIColor(white: 1.0, alpha: 0.3), - inputClearButtonColor: UIColor(rgb: 0x8B9197) + inputClearButtonColor: UIColor(rgb: 0x8b9197) ) let chatList = PresentationThemeChatList( @@ -134,18 +152,18 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem failedFillColor: destructiveColor, failedForegroundColor: .white, muteIconColor: UIColor(rgb: 0x8e8e92), - unreadBadgeActiveBackgroundColor: UIColor(rgb: 0xffffff), - unreadBadgeActiveTextColor: UIColor(rgb: 0x000000), + unreadBadgeActiveBackgroundColor: accentColor, + unreadBadgeActiveTextColor: badgeTextColor, unreadBadgeInactiveBackgroundColor: UIColor(rgb: 0x666666), unreadBadgeInactiveTextColor:UIColor(rgb: 0x000000), pinnedBadgeColor: UIColor(rgb: 0x767677), pinnedSearchBarColor: UIColor(rgb: 0x272728), regularSearchBarColor: UIColor(rgb: 0x272728), - sectionHeaderFillColor: UIColor(rgb: 0x1C1C1D), + sectionHeaderFillColor: UIColor(rgb: 0x1c1c1d), sectionHeaderTextColor: UIColor(rgb: 0xffffff), searchBarKeyboardColor: .dark, verifiedIconFillColor: accentColor, - verifiedIconForegroundColor: .white, + verifiedIconForegroundColor: badgeTextColor, secretIconColor: secretColor, pinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors(backgroundColors: PresentationThemeGradientColors(topColor: UIColor(rgb: 0x72d5fd), bottomColor: UIColor(rgb: 0x2a9ef1)), foregroundColor: .white), unpinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors(backgroundColors: PresentationThemeGradientColors(topColor: UIColor(rgb: 0x666666), bottomColor: UIColor(rgb: 0x666666)), foregroundColor: .black), @@ -153,8 +171,8 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem ) let message = PresentationThemeChatMessage( - incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628))), primaryTextColor: .white, secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: .white, accentControlColor: .white, mediaActiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.6), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.3), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: .white, fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x1f1f1f).mixedWith(.white, alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x737373), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: UIColor(rgb: 0x000000), bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff))), - outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: accentColor, highlightedFill: accentColor.withMultipliedBrightnessBy(1.421), stroke: accentColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: accentColor, highlightedFill: accentColor.withMultipliedBrightnessBy(1.421), stroke: accentColor)), primaryTextColor: .white, secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: .white, linkHighlightColor: UIColor.white.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: .white, accentControlColor: .white, mediaActiveControlColor: .white, mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.3), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: .white, fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x313131).mixedWith(.white, alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x838383), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: UIColor(white: 0.3, alpha: 1.0), bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff))), + incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628))), primaryTextColor: .white, secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.4), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: accentColor, fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x1f1f1f).mixedWith(.white, alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x737373), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: UIColor(rgb: 0x000000), bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff))), + outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleHighlightedFillColor, stroke: outgoingBubbleFillColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, highlightedFill: outgoingBubbleHighlightedFillColor, stroke: outgoingBubbleFillColor)), primaryTextColor: .white, secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: .white, linkHighlightColor: UIColor.white.withAlphaComponent(0.5), scamColor: outgoingScamColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: .white, accentControlColor: .white, mediaActiveControlColor: .white, mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.3), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: .white, fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x313131).mixedWith(.white, alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: .white, radioProgress: .white, highlight: UIColor(white: 1.0, alpha: 0.12), separator: UIColor(white: 1.0, alpha: 0.3), bar: .white), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff))), freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1f1f1f), highlightedFill: UIColor(rgb: 0x2a2a2a), stroke: UIColor(rgb: 0x1f1f1f)), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1f1f1f), highlightedFill: UIColor(rgb: 0x2a2a2a), stroke: UIColor(rgb: 0x1f1f1f))), infoPrimaryTextColor: .white, infoLinkTextColor: accentColor, @@ -165,7 +183,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem shareButtonStrokeColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0xb2b2b2, alpha: 0.18), withoutWallpaper: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), shareButtonForegroundColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0xb2b2b2), withoutWallpaper: UIColor(rgb: 0xb2b2b2)), mediaOverlayControlColors: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0x000000, alpha: 0.6), foregroundColor: .white), - selectionControlColors: PresentationThemeFillStrokeForeground(fillColor: accentColor, strokeColor: .white, foregroundColor: .white), + selectionControlColors: PresentationThemeFillStrokeForeground(fillColor: accentColor, strokeColor: .white, foregroundColor: badgeTextColor), deliveryFailedColors: PresentationThemeFillForeground(fillColor: destructiveColor, foregroundColor: .white), mediaHighlightOverlayColor: UIColor(white: 1.0, alpha: 0.6) ) @@ -173,38 +191,34 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem let serviceMessage = PresentationThemeServiceMessage( components: PresentationThemeServiceMessageColor(withDefaultWallpaper: PresentationThemeServiceMessageColorComponents(fill: UIColor(rgb: 0x1f1f1f, alpha: 1.0), primaryText: UIColor(rgb: 0xffffff), linkHighlight: UIColor(rgb: 0xffffff, alpha: 0.12), scam: destructiveColor, dateFillStatic: UIColor(rgb: 0x1f1f1f, alpha: 1.0), dateFillFloating: UIColor(rgb: 0xffffff, alpha: 0.2)), withCustomWallpaper: PresentationThemeServiceMessageColorComponents(fill: UIColor(rgb: 0x1f1f1f, alpha: 1.0), primaryText: .white, linkHighlight: UIColor(rgb: 0xffffff, alpha: 0.12), scam: destructiveColor, dateFillStatic: UIColor(rgb: 0x1f1f1f, alpha: 1.0), dateFillFloating: UIColor(rgb: 0xffffff, alpha: 0.2))), unreadBarFillColor: UIColor(rgb: 0x1b1b1b), - unreadBarStrokeColor: UIColor(rgb: 0x000000), - unreadBarTextColor: UIColor(rgb: 0xb2b2b2), - dateTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)) + unreadBarStrokeColor: UIColor(rgb: 0x1b1b1b), + unreadBarTextColor: .white, + dateTextColor: PresentationThemeVariableColor(color: .white) ) let inputPanelMediaRecordingControl = PresentationThemeChatInputPanelMediaRecordingControl( buttonColor: accentColor, micLevelColor: accentColor.withAlphaComponent(0.2), - activeIconColor: .black, - panelControlFillColor: UIColor(rgb: 0x1C1C1D), - panelControlStrokeColor: UIColor(rgb: 0x1C1C1D), - panelControlContentPrimaryColor: UIColor(rgb: 0x9597a0), - panelControlContentAccentColor: accentColor + activeIconColor: .white ) let inputPanel = PresentationThemeChatInputPanel( panelBackgroundColor: UIColor(rgb: 0x1c1c1d), - panelStrokeColor: UIColor(rgb: 0x000000), + panelSeparatorColor: UIColor(rgb: 0x3d3d40), panelControlAccentColor: accentColor, panelControlColor: UIColor(rgb: 0x808080), panelControlDisabledColor: UIColor(rgb: 0x808080, alpha: 0.5), panelControlDestructiveColor: UIColor(rgb: 0xff3b30), inputBackgroundColor: UIColor(rgb: 0x060606), - inputStrokeColor: UIColor(rgb: 0x060606), + inputStrokeColor: UIColor(rgb: 0x353537), inputPlaceholderColor: UIColor(rgb: 0x7b7b7b), - inputTextColor: UIColor(rgb: 0xffffff), + inputTextColor: .white, inputControlColor: UIColor(rgb: 0x7b7b7b), actionControlFillColor: accentColor, actionControlForegroundColor: .white, - primaryTextColor: UIColor(rgb: 0xffffff), + primaryTextColor: .white, secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), - mediaRecordingDotColor: .white, + mediaRecordingDotColor: destructiveColor, keyboardColor: .dark, mediaRecordingControl: inputPanelMediaRecordingControl ) @@ -225,23 +239,24 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem let inputButtonPanel = PresentationThemeInputButtonPanel( panelSeparatorColor: UIColor(rgb: 0x3d3d40), panelBackgroundColor: UIColor(rgb: 0x141414), - buttonFillColor: UIColor(rgb: 0x5A5A5A), - buttonStrokeColor: UIColor(rgb: 0x0C0C0C), - buttonHighlightedFillColor: UIColor(rgb: 0x5A5A5A, alpha: 0.7), - buttonHighlightedStrokeColor: UIColor(rgb: 0x0C0C0C), - buttonTextColor: UIColor(rgb: 0xffffff) + buttonFillColor: UIColor(rgb: 0x5a5a5a), + buttonStrokeColor: UIColor(rgb: 0x0c0c0c), + buttonHighlightedFillColor: UIColor(rgb: 0x5a5a5a, alpha: 0.7), + buttonHighlightedStrokeColor: UIColor(rgb: 0x0c0c0c), + buttonTextColor: .white ) let historyNavigation = PresentationThemeChatHistoryNavigation( - fillColor: UIColor(rgb: 0x1C1C1D), - strokeColor: UIColor(rgb: 0x000000), - foregroundColor: UIColor(rgb: 0xffffff), + fillColor: UIColor(rgb: 0x1c1c1d), + strokeColor: UIColor(rgb: 0x3d3d40), + foregroundColor: .white, badgeBackgroundColor: accentColor, - badgeStrokeColor: .black, - badgeTextColor: .black + badgeStrokeColor: accentColor, + badgeTextColor: .white ) let chat = PresentationThemeChat( + defaultWallpaper: .color(0x000000), message: message, serviceMessage: serviceMessage, inputPanel: inputPanel, @@ -264,13 +279,13 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem primaryTextColor: .white, secondaryTextColor: UIColor(rgb: 0x5e5e5e), controlAccentColor: accentColor, - inputBackgroundColor: UIColor(rgb: 0x5a5a5e), - inputHollowBackgroundColor: UIColor(rgb: 0x5a5a5e), - inputBorderColor: UIColor(rgb: 0x5a5a5e), - inputPlaceholderColor: UIColor(rgb: 0xaaaaaa), + inputBackgroundColor: UIColor(rgb: 0x0f0f0f), + inputHollowBackgroundColor: UIColor(rgb: 0x0f0f0f), + inputBorderColor: UIColor(rgb: 0x0f0f0f), + inputPlaceholderColor: UIColor(rgb: 0x8f8f8f), inputTextColor: .white, - inputClearButtonColor: UIColor(rgb: 0xaaaaaa), - checkContentColor: .black + inputClearButtonColor: UIColor(rgb: 0x8f8f8f), + checkContentColor: .white ) let inAppNotification = PresentationThemeInAppNotification( @@ -280,18 +295,18 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem backgroundType: .dark, navigationBar: PresentationThemeExpandedNotificationNavigationBar( backgroundColor: UIColor(rgb: 0x1c1c1d), - primaryTextColor: accentColor, - controlColor: accentColor, + primaryTextColor: .white, + controlColor: .white, separatorColor: UIColor(rgb: 0x000000) ) ) ) return PresentationTheme( - name: .builtin(.nightGrayscale), - author: nil, + name: .builtin(.night), + author: "Telegram", overallDarkAppearance: true, - auth: auth, + intro: intro, passcode: passcode, rootController: rootController, list: list, @@ -302,15 +317,9 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem ) } -public let defaultDarkPresentationTheme = makeDarkPresentationTheme(accentColor: 0x2EA6FF) +public let defaultDarkPresentationTheme = makeDarkPresentationTheme(accentColor: UIColor(rgb: 0x2ea6ff)) -public func makeDarkPresentationTheme(accentColor: Int32?) -> PresentationTheme { - let color: UIColor - if let accentColor = accentColor { - color = UIColor(rgb: UInt32(bitPattern: accentColor)) - } else { - color = UIColor(rgb: UInt32(bitPattern: defaultDayAccentColor)) - } - return makeDarkPresentationTheme(accentColor: color) +public func makeDarkPresentationTheme(accentColor: UIColor?) -> PresentationTheme { + let accentColor = accentColor ?? defaultDayAccentColor + return makeDarkPresentationTheme(accentColor: accentColor) } - diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkAccentPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift similarity index 77% rename from submodules/TelegramPresentationData/Sources/DefaultDarkAccentPresentationTheme.swift rename to submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift index f5b3bac02c..df94bd83bf 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultDarkAccentPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift @@ -2,15 +2,15 @@ import Foundation import UIKit private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationTheme { - let destructiveColor: UIColor = UIColor(rgb: 0xFF6767) + let destructiveColor: UIColor = UIColor(rgb: 0xff6767) let constructiveColor: UIColor = UIColor(rgb: 0x08a723) - let secretColor: UIColor = UIColor(rgb: 0x89DF9E) + let secretColor: UIColor = UIColor(rgb: 0x89df9e) let mainBackgroundColor = accentColor.withMultiplied(hue: 1.024, saturation: 0.585, brightness: 0.25) let mainSelectionColor = accentColor.withMultiplied(hue: 1.03, saturation: 0.585, brightness: 0.12) let additionalBackgroundColor = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) - - let mainSeparatorColor = accentColor.withMultiplied(hue: 1.039, saturation: 0.560, brightness: 0.14) + + let mainSeparatorColor = accentColor.withMultiplied(hue: 1.033, saturation: 0.426, brightness: 0.34) let mainForegroundColor = accentColor.withMultiplied(hue: 0.99, saturation: 0.256, brightness: 0.62) let mainSecondaryColor = accentColor.withMultiplied(hue: 1.019, saturation: 0.109, brightness: 0.59) @@ -32,8 +32,8 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem selectedIconColor: accentColor, textColor: mainForegroundColor, selectedTextColor: accentColor, - badgeBackgroundColor: UIColor(rgb: 0xEF5B5B), - badgeStrokeColor: UIColor(rgb: 0xEF5B5B), + badgeBackgroundColor: UIColor(rgb: 0xef5b5b), + badgeStrokeColor: UIColor(rgb: 0xef5b5b), badgeTextColor: UIColor(rgb: 0xffffff) ) @@ -46,8 +46,8 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem accentTextColor: accentColor, backgroundColor: mainBackgroundColor, separatorColor: mainSeparatorColor, - badgeBackgroundColor: UIColor(rgb: 0xEF5B5B), - badgeStrokeColor: UIColor(rgb: 0xEF5B5B), + badgeBackgroundColor: UIColor(rgb: 0xef5b5b), + badgeStrokeColor: UIColor(rgb: 0xef5b5b), badgeTextColor: UIColor(rgb: 0xffffff) ) @@ -62,9 +62,9 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem separatorColor: additionalBackgroundColor ) - let auth = PresentationThemeAuth( - introStartButtonColor: accentColor, - introDotColor: mainSecondaryColor + let intro = PresentationThemeIntro( + startButtonColor: accentColor, + dotColor: mainSecondaryColor ) let passcode = PresentationThemePasscode( @@ -83,7 +83,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem frameColor: mainSecondaryTextColor.withAlphaComponent(0.5), handleColor: UIColor(rgb: 0x121212), contentColor: accentColor, - positiveColor: accentColor, + positiveColor: constructiveColor, negativeColor: destructiveColor ) @@ -125,16 +125,17 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem controlSecondaryColor: mainSecondaryTextColor.withAlphaComponent(0.5), freeInputField: PresentationInputFieldTheme( backgroundColor: mainSecondaryTextColor.withAlphaComponent(0.5), + strokeColor: mainSecondaryTextColor.withAlphaComponent(0.5), placeholderColor: UIColor(rgb: 0x4d4d4d), primaryColor: .white, controlColor: UIColor(rgb: 0x4d4d4d) ), - mediaPlaceholderColor: UIColor(rgb: 0x1e2c3a), + mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.585, brightness: 0.23), scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.3), pageIndicatorInactiveColor: mainSecondaryTextColor.withAlphaComponent(0.4), inputClearButtonColor: mainSecondaryColor ) - + let chatList = PresentationThemeChatList( backgroundColor: additionalBackgroundColor, itemSeparatorColor: mainSeparatorColor, @@ -167,13 +168,15 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem verifiedIconForegroundColor: .white, secretIconColor: secretColor, pinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors(backgroundColors: PresentationThemeGradientColors(topColor: UIColor(rgb: 0x72d5fd), bottomColor: UIColor(rgb: 0x2a9ef1)), foregroundColor: .white), - unpinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors(backgroundColors: PresentationThemeGradientColors(topColor: UIColor(rgb: 0x5d6d77), bottomColor: UIColor(rgb: 0x4e5c64)), foregroundColor: additionalBackgroundColor), + unpinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors(backgroundColors: PresentationThemeGradientColors(topColor: accentColor.withMultiplied(hue: 0.985, saturation: 0.268, brightness: 0.47), bottomColor: accentColor.withMultiplied(hue: 0.98, saturation: 0.268, brightness: 0.39)), foregroundColor: additionalBackgroundColor), onlineDotColor: UIColor(rgb: 0x4cc91f) ) + let buttonStrokeColor = accentColor.withMultiplied(hue: 1.014, saturation: 0.56, brightness: 0.64).withAlphaComponent(0.15) + let message = PresentationThemeChatMessage( - incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: .white, accentControlColor: .white, mediaActiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.6), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.3), pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: .white, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: UIColor(rgb: 0x1e2c3a), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x617583), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: mainSeparatorColor, bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0x587fa3, alpha: 0.15)), actionButtonsTextColor: PresentationThemeVariableColor(color: .white)), - outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleColor)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: .white, accentControlColor: .white, mediaActiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.6), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.3), pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: .white, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: UIColor(rgb: 0x2d5883), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x8eaac0), radioProgress: UIColor(rgb: 0x89d0ff), highlight: UIColor(rgb: 0x89d0ff).withAlphaComponent(0.12), separator: UIColor(rgb: 0x264b70), bar: UIColor(rgb: 0x89d0ff)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0x587fa3, alpha: 0.15)), actionButtonsTextColor: PresentationThemeVariableColor(color: .white)), + incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: accentColor, accentControlColor: accentColor, mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.5), pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: accentColor, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.585, brightness: 0.23), polls: PresentationThemeChatBubblePolls(radioButton: accentColor.withMultiplied(hue: 0.995, saturation: 0.317, brightness: 0.51), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: mainSeparatorColor, bar: accentColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white)), + outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleColor)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: destructiveColor, textHighlightColor: UIColor(rgb: 0xffe438), accentTextColor: .white, accentControlColor: .white, mediaActiveControlColor: .white, mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.5), pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: .white, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.804, brightness: 0.51), polls: PresentationThemeChatBubblePolls(radioButton: .white, radioProgress: accentColor.withMultiplied(hue: 0.99, saturation: 0.56, brightness: 1.0), highlight: accentColor.withMultiplied(hue: 0.99, saturation: 0.56, brightness: 1.0).withAlphaComponent(0.12), separator: mainSeparatorColor, bar: .white), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white)), freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor)), infoPrimaryTextColor: UIColor(rgb: 0xffffff), infoLinkTextColor: accentColor, @@ -181,7 +184,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem mediaDateAndStatusFillColor: UIColor(white: 0.0, alpha: 0.5), mediaDateAndStatusTextColor: .white, shareButtonFillColor: PresentationThemeVariableColor(color: additionalBackgroundColor.withAlphaComponent(0.5)), - shareButtonStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0x587fa3, alpha: 0.15)), + shareButtonStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), shareButtonForegroundColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2)), mediaOverlayControlColors: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0x000000, alpha: 0.6), foregroundColor: .white), selectionControlColors: PresentationThemeFillStrokeForeground(fillColor: accentColor, strokeColor: .white, foregroundColor: .white), @@ -193,29 +196,25 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem components: PresentationThemeServiceMessageColor(withDefaultWallpaper: PresentationThemeServiceMessageColorComponents(fill: additionalBackgroundColor, primaryText: .white, linkHighlight: UIColor(rgb: 0xffffff, alpha: 0.12), scam: destructiveColor, dateFillStatic: additionalBackgroundColor, dateFillFloating: additionalBackgroundColor.withAlphaComponent(0.2)), withCustomWallpaper: PresentationThemeServiceMessageColorComponents(fill: additionalBackgroundColor, primaryText: .white, linkHighlight: UIColor(rgb: 0xffffff, alpha: 0.12), scam: destructiveColor, dateFillStatic: additionalBackgroundColor, dateFillFloating: additionalBackgroundColor.withAlphaComponent(0.2))), unreadBarFillColor: mainBackgroundColor, unreadBarStrokeColor: mainBackgroundColor, - unreadBarTextColor: UIColor(rgb: 0xffffff), - dateTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)) + unreadBarTextColor: .white, + dateTextColor: PresentationThemeVariableColor(color: .white) ) let inputPanelMediaRecordingControl = PresentationThemeChatInputPanelMediaRecordingControl( buttonColor: accentColor, micLevelColor: accentColor.withAlphaComponent(0.2), - activeIconColor: .white, - panelControlFillColor: mainBackgroundColor, - panelControlStrokeColor: mainBackgroundColor, - panelControlContentPrimaryColor: mainSecondaryTextColor.withAlphaComponent(0.5), - panelControlContentAccentColor: accentColor + activeIconColor: .white ) - + let inputPanel = PresentationThemeChatInputPanel( panelBackgroundColor: mainBackgroundColor, - panelStrokeColor: mainSeparatorColor, + panelSeparatorColor: mainSeparatorColor, panelControlAccentColor: accentColor, panelControlColor: mainSecondaryTextColor.withAlphaComponent(0.5), panelControlDisabledColor: UIColor(rgb: 0x90979F, alpha: 0.5), panelControlDestructiveColor: destructiveColor, inputBackgroundColor: inputBackgroundColor, - inputStrokeColor: inputBackgroundColor, + inputStrokeColor: accentColor.withMultiplied(hue: 1.038, saturation: 0.463, brightness: 0.26), inputPlaceholderColor: mainSecondaryTextColor.withAlphaComponent(0.4), inputTextColor: UIColor(rgb: 0xffffff), inputControlColor: mainSecondaryTextColor.withAlphaComponent(0.4), @@ -234,20 +233,20 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem panelHighlightedIconBackgroundColor: inputBackgroundColor, stickersBackgroundColor: additionalBackgroundColor, stickersSectionTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), - stickersSearchBackgroundColor: UIColor(rgb: 0x121c25), - stickersSearchPlaceholderColor: UIColor(rgb: 0x788a96), + stickersSearchBackgroundColor: accentColor.withMultiplied(hue: 1.009, saturation: 0.621, brightness: 0.15), + stickersSearchPlaceholderColor: accentColor.withMultiplied(hue: 0.99, saturation: 0.243, brightness: 0.59), stickersSearchPrimaryColor: .white, - stickersSearchControlColor: UIColor(rgb: 0x788a96), + stickersSearchControlColor: accentColor.withMultiplied(hue: 0.99, saturation: 0.243, brightness: 0.59), gifsBackgroundColor: additionalBackgroundColor ) let inputButtonPanel = PresentationThemeInputButtonPanel( panelSeparatorColor: mainBackgroundColor, - panelBackgroundColor: UIColor(rgb: 0x161A20), - buttonFillColor: UIColor(rgb: 0x5B5F62), - buttonStrokeColor: UIColor(rgb: 0x0D1013), - buttonHighlightedFillColor: UIColor(rgb: 0x5B5F62, alpha: 0.7), - buttonHighlightedStrokeColor: UIColor(rgb: 0x0D1013), + panelBackgroundColor: accentColor.withMultiplied(hue: 1.048, saturation: 0.378, brightness: 0.13), + buttonFillColor: accentColor.withMultiplied(hue: 1.0, saturation: 0.085, brightness: 0.38), + buttonStrokeColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.39, brightness: 0.07), + buttonHighlightedFillColor: accentColor.withMultiplied(hue: 1.0, saturation: 0.085, brightness: 0.38).withAlphaComponent(0.7), + buttonHighlightedStrokeColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.39, brightness: 0.07), buttonTextColor: UIColor(rgb: 0xffffff) ) @@ -261,6 +260,7 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem ) let chat = PresentationThemeChat( + defaultWallpaper: .color(Int32(bitPattern: accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18).rgb)), message: message, serviceMessage: serviceMessage, inputPanel: inputPanel, @@ -308,9 +308,9 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem return PresentationTheme( name: .builtin(.nightAccent), - author: nil, + author: "Telegram", overallDarkAppearance: true, - auth: auth, + intro: intro, passcode: passcode, rootController: rootController, list: list, @@ -321,14 +321,9 @@ private func makeDarkPresentationTheme(accentColor: UIColor) -> PresentationThem ) } -public let defaultDarkAccentPresentationTheme = makeDarkAccentPresentationTheme(accentColor: 0x2EA6FF) +public let defaultDarkAccentPresentationTheme = makeDarkAccentPresentationTheme(accentColor: UIColor(rgb: 0x2ea6ff)) -public func makeDarkAccentPresentationTheme(accentColor: Int32?) -> PresentationTheme { - let color: UIColor - if let accentColor = accentColor { - color = UIColor(rgb: UInt32(bitPattern: accentColor)) - } else { - color = UIColor(rgb: UInt32(bitPattern: defaultDayAccentColor)) - } - return makeDarkPresentationTheme(accentColor: color) +public func makeDarkAccentPresentationTheme(accentColor: UIColor?) -> PresentationTheme { + let accentColor = accentColor ?? defaultDayAccentColor + return makeDarkPresentationTheme(accentColor: accentColor) } diff --git a/submodules/TelegramPresentationData/Sources/DefaultPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift similarity index 93% rename from submodules/TelegramPresentationData/Sources/DefaultPresentationTheme.swift rename to submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift index b7e9ec9142..a3c049cdda 100644 --- a/submodules/TelegramPresentationData/Sources/DefaultPresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift @@ -1,7 +1,8 @@ import Foundation import UIKit +import TelegramCore -private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroundColor: UIColor, day: Bool) -> PresentationTheme { +private func makeDefaultDayPresentationTheme(accentColor: UIColor, serviceBackgroundColor: UIColor, day: Bool) -> PresentationTheme { let destructiveColor: UIColor = UIColor(rgb: 0xff3b30) let constructiveColor: UIColor = UIColor(rgb: 0x00c900) let secretColor: UIColor = UIColor(rgb: 0x00b12c) @@ -43,14 +44,14 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun separatorColor: UIColor(red: 0.6953125, green: 0.6953125, blue: 0.6953125, alpha: 1.0) ) - let auth = PresentationThemeAuth( - introStartButtonColor: UIColor(rgb: 0x2ca5e0), - introDotColor: UIColor(rgb: 0xd9d9d9) + let intro = PresentationThemeIntro( + startButtonColor: UIColor(rgb: 0x2ca5e0), + dotColor: UIColor(rgb: 0xd9d9d9) ) let passcode = PresentationThemePasscode( backgroundColors: PresentationThemeGradientColors(topColor: UIColor(rgb: 0x46739e), bottomColor: UIColor(rgb: 0x2a5982)), - buttonColor: nil + buttonColor: .clear ) let rootController = PresentationThemeRootController( @@ -63,8 +64,8 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun let switchColors = PresentationThemeSwitch( frameColor: UIColor(rgb: 0xe0e0e0), handleColor: UIColor(rgb: 0xffffff), - contentColor: UIColor(rgb: 0x42d451), - positiveColor: UIColor(rgb: 0x00B12C), + contentColor: UIColor(rgb: 0x77d572), + positiveColor: constructiveColor, negativeColor: destructiveColor ) @@ -106,6 +107,7 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun controlSecondaryColor: UIColor(rgb: 0xdedede), freeInputField: PresentationInputFieldTheme( backgroundColor: UIColor(rgb: 0xd6d6dc), + strokeColor: UIColor(rgb: 0xd6d6dc), placeholderColor: UIColor(rgb: 0x96979d), primaryColor: .black, controlColor: UIColor(rgb: 0x96979d) @@ -207,16 +209,12 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun let inputPanelMediaRecordingControl = PresentationThemeChatInputPanelMediaRecordingControl( buttonColor: accentColor, micLevelColor: accentColor.withAlphaComponent(0.2), - activeIconColor: .white, - panelControlFillColor: UIColor(rgb: 0xf7f7f7), - panelControlStrokeColor: UIColor(rgb: 0xb2b2b2), - panelControlContentPrimaryColor: UIColor(rgb: 0x9597a0), - panelControlContentAccentColor: accentColor + activeIconColor: .white ) let inputPanel = PresentationThemeChatInputPanel( panelBackgroundColor: UIColor(rgb: 0xf7f7f7), - panelStrokeColor: UIColor(rgb: 0xb2b2b2), + panelSeparatorColor: UIColor(rgb: 0xb2b2b2), panelControlAccentColor: accentColor, panelControlColor: UIColor(rgb: 0x858e99), panelControlDisabledColor: UIColor(rgb: 0x727b87, alpha: 0.5), @@ -268,6 +266,7 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun ) let chat = PresentationThemeChat( + defaultWallpaper: day ? .color(0xffffff) : .builtin(WallpaperSettings()), message: day ? messageDay : message, serviceMessage: day ? serviceMessageDay : serviceMessage, inputPanel: inputPanel, @@ -315,9 +314,9 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun return PresentationTheme( name: .builtin(day ? .day : .dayClassic), - author: nil, + author: "Telegram", overallDarkAppearance: false, - auth: auth, + intro: intro, passcode: passcode, rootController: rootController, list: list, @@ -328,21 +327,12 @@ private func makeDefaultPresentationTheme(accentColor: UIColor, serviceBackgroun ) } -public let defaultPresentationTheme = makeDefaultPresentationTheme(accentColor: UIColor(rgb: 0x007ee5), serviceBackgroundColor: defaultServiceBackgroundColor, day: false) +public let defaultPresentationTheme = makeDefaultDayPresentationTheme(accentColor: UIColor(rgb: 0x007ee5), serviceBackgroundColor: defaultServiceBackgroundColor, day: false) -public let defaultDayAccentColor: Int32 = 0x007ee5 -public let defaultServiceBackgroundColor: UIColor = UIColor(rgb: 0x000000, alpha: 0.3) +public let defaultDayAccentColor = UIColor(rgb: 0x007ee5) +public let defaultServiceBackgroundColor = UIColor(rgb: 0x000000, alpha: 0.3) -public func makeDefaultPresentationTheme(serviceBackgroundColor: UIColor?) -> PresentationTheme { - return makeDefaultPresentationTheme(accentColor: UIColor(rgb: 0x007ee5), serviceBackgroundColor: serviceBackgroundColor ?? .black, day: false) -} - -public func makeDefaultDayPresentationTheme(accentColor: Int32?, serviceBackgroundColor: UIColor) -> PresentationTheme { - let color: UIColor - if let accentColor = accentColor { - color = UIColor(rgb: UInt32(bitPattern: accentColor)) - } else { - color = UIColor(rgb: UInt32(bitPattern: defaultDayAccentColor)) - } - return makeDefaultPresentationTheme(accentColor: color, serviceBackgroundColor: serviceBackgroundColor, day: true) +public func makeDefaultDayPresentationTheme(accentColor: UIColor? = nil, serviceBackgroundColor: UIColor) -> PresentationTheme { + let accentColor = accentColor ?? defaultDayAccentColor + return makeDefaultDayPresentationTheme(accentColor: accentColor, serviceBackgroundColor: serviceBackgroundColor, day: true) } diff --git a/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift b/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift new file mode 100644 index 0000000000..716b461713 --- /dev/null +++ b/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift @@ -0,0 +1,21 @@ +import Foundation +import UIKit +import TelegramUIPreferences + +public func makePresentationTheme(themeReference: PresentationThemeReference, accentColor: UIColor, serviceBackgroundColor: UIColor) -> PresentationTheme { + let theme: PresentationTheme + switch themeReference { + case let .builtin(reference): + switch reference { + case .dayClassic: + theme = makeDefaultDayPresentationTheme(serviceBackgroundColor: serviceBackgroundColor) + case .night: + theme = makeDarkPresentationTheme(accentColor: accentColor) + case .nightAccent: + theme = makeDarkAccentPresentationTheme(accentColor: accentColor) + case .day: + theme = makeDefaultDayPresentationTheme(accentColor: accentColor, serviceBackgroundColor: serviceBackgroundColor) + } + } + return theme +} diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift index 51b5557562..abb4963d98 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationData.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift @@ -253,39 +253,35 @@ public func currentPresentationDataAndSettings(accountManager: AccountManager) - let parameters = AutomaticThemeSwitchParameters(settings: themeSettings.automaticThemeSwitchSetting) if automaticThemeShouldSwitchNow(parameters, currentTheme: themeSettings.theme) { - effectiveTheme = .builtin(themeSettings.automaticThemeSwitchSetting.theme) - switch effectiveChatWallpaper { - case .builtin, .color: - switch themeSettings.automaticThemeSwitchSetting.theme { - case .nightAccent: - effectiveChatWallpaper = .color(0x18222d) - case .nightGrayscale: - effectiveChatWallpaper = .color(0x000000) - default: - break - } - default: - break - } + effectiveTheme = themeSettings.themeTintColors ? .builtin(.nightAccent) : .builtin(.night) } else { effectiveTheme = themeSettings.theme } let effectiveAccentColor = themeSettings.themeSpecificAccentColors[effectiveTheme.index]?.color ?? defaultDayAccentColor - switch effectiveTheme { case let .builtin(reference): switch reference { case .dayClassic: themeValue = defaultPresentationTheme - case .nightGrayscale: + case .day: + themeValue = makeDefaultDayPresentationTheme(accentColor: effectiveAccentColor, serviceBackgroundColor: defaultServiceBackgroundColor) + case .night: themeValue = makeDarkPresentationTheme(accentColor: effectiveAccentColor) case .nightAccent: themeValue = makeDarkAccentPresentationTheme(accentColor: effectiveAccentColor) - case .day: - themeValue = makeDefaultDayPresentationTheme(accentColor: effectiveAccentColor, serviceBackgroundColor: defaultServiceBackgroundColor) } } + + if effectiveTheme != themeSettings.theme { + switch effectiveChatWallpaper { + case .builtin, .color: + effectiveChatWallpaper = themeValue.chat.defaultWallpaper + default: + break + } + } + let dateTimeFormat = currentDateTimeFormat() let stringsValue: PresentationStrings if let localizationSettings = localizationSettings { @@ -348,7 +344,7 @@ private func automaticThemeShouldSwitchNow(_ parameters: AutomaticThemeSwitchPar switch currentTheme { case let .builtin(builtin): switch builtin { - case .nightAccent, .nightGrayscale: + case .nightAccent, .night: return false default: break @@ -529,23 +525,9 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI var effectiveChatWallpaper: TelegramWallpaper = currentWallpaper if shouldSwitch { - let automaticTheme = PresentationThemeReference.builtin(themeSettings.automaticThemeSwitchSetting.theme) + let automaticTheme: PresentationThemeReference = themeSettings.themeTintColors ? .builtin(.nightAccent) : .builtin(.night) if let themeSpecificWallpaper = themeSettings.themeSpecificChatWallpapers[automaticTheme.index] { effectiveChatWallpaper = themeSpecificWallpaper - } else { - switch effectiveChatWallpaper { - case .builtin, .color: - switch themeSettings.automaticThemeSwitchSetting.theme { - case .nightAccent: - effectiveChatWallpaper = .color(0x18222d) - case .nightGrayscale: - effectiveChatWallpaper = .color(0x000000) - default: - break - } - default: - break - } } effectiveTheme = automaticTheme } else { @@ -559,8 +541,8 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI case let .builtin(reference): switch reference { case .dayClassic: - themeValue = makeDefaultPresentationTheme(serviceBackgroundColor: serviceBackgroundColor) - case .nightGrayscale: + themeValue = makeDefaultDayPresentationTheme(serviceBackgroundColor: serviceBackgroundColor) + case .night: themeValue = makeDarkPresentationTheme(accentColor: effectiveAccentColor) case .nightAccent: themeValue = makeDarkAccentPresentationTheme(accentColor: effectiveAccentColor) @@ -569,6 +551,15 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI } } + if effectiveTheme != themeSettings.theme && themeSettings.themeSpecificChatWallpapers[effectiveTheme.index] == nil { + switch effectiveChatWallpaper { + case .builtin, .color: + effectiveChatWallpaper = themeValue.chat.defaultWallpaper + default: + break + } + } + let localizationSettings: LocalizationSettings? if let current = sharedData.entries[SharedDataKeys.localizationSettings] as? LocalizationSettings { localizationSettings = current diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index 9ba6e5d9c4..386020c699 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -743,3721 +743,3741 @@ public final class PresentationStrings { public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[515]! } public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[516]! } public var DialogList_SearchSectionMessages: String { return self._s[519]! } - public var Notifications_ChannelNotifications: String { return self._s[520]! } - public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[521]! } - public var Passport_Language_sk: String { return self._s[522]! } - public var Notification_MessageLifetime1h: String { return self._s[523]! } - public var Wallpaper_ResetWallpapersInfo: String { return self._s[524]! } - public var Call_ReportSkip: String { return self._s[526]! } - public var Cache_ServiceFiles: String { return self._s[527]! } - public var Group_ErrorAddTooMuchAdmins: String { return self._s[528]! } - public var Map_Hybrid: String { return self._s[529]! } - public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[531]! } - public var ChatSettings_AutoDownloadVideos: String { return self._s[533]! } - public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[534]! } - public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[535]! } - public var SocksProxySetup_ProxyTelegram: String { return self._s[538]! } + public var Appearance_ThemePreview_ChatList_8_Name: String { return self._s[520]! } + public var Notifications_ChannelNotifications: String { return self._s[521]! } + public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[522]! } + public var Passport_Language_sk: String { return self._s[523]! } + public var Notification_MessageLifetime1h: String { return self._s[524]! } + public var Wallpaper_ResetWallpapersInfo: String { return self._s[525]! } + public var Call_ReportSkip: String { return self._s[527]! } + public var Cache_ServiceFiles: String { return self._s[528]! } + public var Group_ErrorAddTooMuchAdmins: String { return self._s[529]! } + public var Map_Hybrid: String { return self._s[530]! } + public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[532]! } + public var ChatSettings_AutoDownloadVideos: String { return self._s[534]! } + public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[535]! } + public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[536]! } + public var SocksProxySetup_ProxyTelegram: String { return self._s[539]! } public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[539]!, self._r[539]!, [_1]) + return formatWithArgumentRanges(self._s[540]!, self._r[540]!, [_1]) } - public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[541]! } + public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[542]! } public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[542]!, self._r[542]!, [_1, _2]) + return formatWithArgumentRanges(self._s[543]!, self._r[543]!, [_1, _2]) } - public var Conversation_LiveLocationYou: String { return self._s[543]! } - public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[544]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[545]! } - public var UserInfo_ShareBot: String { return self._s[548]! } + public var Conversation_LiveLocationYou: String { return self._s[544]! } + public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[545]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[546]! } + public var UserInfo_ShareBot: String { return self._s[549]! } public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[549]!, self._r[549]!, [_1, _2]) + return formatWithArgumentRanges(self._s[550]!, self._r[550]!, [_1, _2]) } - public var PhotoEditor_ShadowsTint: String { return self._s[550]! } - public var Message_Audio: String { return self._s[551]! } - public var Passport_Language_lt: String { return self._s[552]! } + public var PhotoEditor_ShadowsTint: String { return self._s[551]! } + public var Message_Audio: String { return self._s[552]! } + public var Passport_Language_lt: String { return self._s[553]! } public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[553]!, self._r[553]!, [_0]) + return formatWithArgumentRanges(self._s[554]!, self._r[554]!, [_0]) } - public var Permissions_SiriText_v0: String { return self._s[554]! } - public var Conversation_FileICloudDrive: String { return self._s[555]! } - public var Notifications_Badge_IncludeMutedChats: String { return self._s[556]! } + public var Permissions_SiriText_v0: String { return self._s[555]! } + public var Conversation_FileICloudDrive: String { return self._s[556]! } + public var Notifications_Badge_IncludeMutedChats: String { return self._s[557]! } public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[557]!, self._r[557]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[558]!, self._r[558]!, [_1, _2, _3, _4, _5, _6]) } - public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[558]! } + public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[559]! } public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[559]!, self._r[559]!, [_0]) + return formatWithArgumentRanges(self._s[560]!, self._r[560]!, [_0]) } - public var Channel_SignMessages: String { return self._s[560]! } + public var Channel_SignMessages: String { return self._s[561]! } public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[561]!, self._r[561]!, [_1]) + return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_1]) } - public var Compose_ChannelTokenListPlaceholder: String { return self._s[562]! } - public var Passport_ScanPassport: String { return self._s[563]! } - public var Watch_Suggestion_Thanks: String { return self._s[564]! } - public var BlockedUsers_AddNew: String { return self._s[565]! } + public var Compose_ChannelTokenListPlaceholder: String { return self._s[563]! } + public var Passport_ScanPassport: String { return self._s[564]! } + public var Watch_Suggestion_Thanks: String { return self._s[565]! } + public var BlockedUsers_AddNew: String { return self._s[566]! } public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[566]!, self._r[566]!, [_1, _2]) + return formatWithArgumentRanges(self._s[567]!, self._r[567]!, [_1, _2]) } - public var Watch_Message_Invoice: String { return self._s[567]! } - public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[568]! } - public var Month_GenJuly: String { return self._s[569]! } - public var SocksProxySetup_ProxySocks5: String { return self._s[570]! } - public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[572]! } - public var Notification_ChannelInviterSelf: String { return self._s[573]! } - public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[574]! } + public var Watch_Message_Invoice: String { return self._s[568]! } + public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[569]! } + public var Month_GenJuly: String { return self._s[570]! } + public var SocksProxySetup_ProxySocks5: String { return self._s[571]! } + public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[573]! } + public var Notification_ChannelInviterSelf: String { return self._s[574]! } + public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[575]! } public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[575]!, self._r[575]!, [_1, _2]) + return formatWithArgumentRanges(self._s[576]!, self._r[576]!, [_1, _2]) } - public var CheckoutInfo_Title: String { return self._s[576]! } - public var Watch_Stickers_RecentPlaceholder: String { return self._s[577]! } + public var CheckoutInfo_Title: String { return self._s[577]! } + public var Watch_Stickers_RecentPlaceholder: String { return self._s[578]! } public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[578]!, self._r[578]!, [_0]) + return formatWithArgumentRanges(self._s[579]!, self._r[579]!, [_0]) } - public var Passport_Identity_MainPage: String { return self._s[579]! } - public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[580]! } - public var Passport_Language_de: String { return self._s[581]! } - public var Update_Title: String { return self._s[582]! } - public var ContactInfo_PhoneLabelWorkFax: String { return self._s[583]! } - public var Channel_AdminLog_BanEmbedLinks: String { return self._s[584]! } - public var Passport_Email_UseTelegramEmailHelp: String { return self._s[585]! } - public var Notifications_ChannelNotificationsPreview: String { return self._s[586]! } - public var NotificationsSound_Telegraph: String { return self._s[587]! } - public var Watch_LastSeen_ALongTimeAgo: String { return self._s[588]! } - public var ChannelMembers_WhoCanAddMembers: String { return self._s[589]! } + public var Passport_Identity_MainPage: String { return self._s[580]! } + public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[581]! } + public var Passport_Language_de: String { return self._s[582]! } + public var Update_Title: String { return self._s[583]! } + public var ContactInfo_PhoneLabelWorkFax: String { return self._s[584]! } + public var Channel_AdminLog_BanEmbedLinks: String { return self._s[585]! } + public var Passport_Email_UseTelegramEmailHelp: String { return self._s[586]! } + public var Notifications_ChannelNotificationsPreview: String { return self._s[587]! } + public var NotificationsSound_Telegraph: String { return self._s[588]! } + public var Watch_LastSeen_ALongTimeAgo: String { return self._s[589]! } + public var ChannelMembers_WhoCanAddMembers: String { return self._s[590]! } public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[590]!, self._r[590]!, [_0]) + return formatWithArgumentRanges(self._s[591]!, self._r[591]!, [_0]) } - public var Stickers_SuggestAll: String { return self._s[591]! } - public var Conversation_ForwardTitle: String { return self._s[592]! } + public var Stickers_SuggestAll: String { return self._s[592]! } + public var Conversation_ForwardTitle: String { return self._s[593]! } + public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[594]! } public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[593]!, self._r[593]!, [_0]) + return formatWithArgumentRanges(self._s[595]!, self._r[595]!, [_0]) } - public var Calls_NewCall: String { return self._s[594]! } - public var Call_StatusEnded: String { return self._s[595]! } - public var AutoDownloadSettings_DataUsageLow: String { return self._s[596]! } - public var Settings_ProxyConnected: String { return self._s[597]! } - public var Channel_AdminLogFilter_EventsPinned: String { return self._s[598]! } - public var PhotoEditor_QualityVeryLow: String { return self._s[599]! } - public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[600]! } - public var Passport_PasswordPlaceholder: String { return self._s[601]! } - public var Message_PinnedInvoice: String { return self._s[602]! } - public var Passport_Identity_IssueDate: String { return self._s[603]! } - public var Passport_Language_pl: String { return self._s[604]! } + public var Calls_NewCall: String { return self._s[596]! } + public var Call_StatusEnded: String { return self._s[597]! } + public var AutoDownloadSettings_DataUsageLow: String { return self._s[598]! } + public var Settings_ProxyConnected: String { return self._s[599]! } + public var Channel_AdminLogFilter_EventsPinned: String { return self._s[600]! } + public var PhotoEditor_QualityVeryLow: String { return self._s[601]! } + public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[602]! } + public var Passport_PasswordPlaceholder: String { return self._s[603]! } + public var Message_PinnedInvoice: String { return self._s[604]! } + public var Passport_Identity_IssueDate: String { return self._s[605]! } + public var Passport_Language_pl: String { return self._s[606]! } public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[605]!, self._r[605]!, [_0]) + return formatWithArgumentRanges(self._s[607]!, self._r[607]!, [_0]) } - public var SocksProxySetup_PasteFromClipboard: String { return self._s[606]! } - public var Call_StatusConnecting: String { return self._s[607]! } + public var SocksProxySetup_PasteFromClipboard: String { return self._s[608]! } + public var Call_StatusConnecting: String { return self._s[609]! } public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[608]!, self._r[608]!, [_0]) + return formatWithArgumentRanges(self._s[610]!, self._r[610]!, [_0]) } - public var ChatSettings_ConnectionType_UseProxy: String { return self._s[610]! } - public var Common_Edit: String { return self._s[611]! } - public var PrivacySettings_LastSeenNobody: String { return self._s[612]! } + public var ChatSettings_ConnectionType_UseProxy: String { return self._s[612]! } + public var Common_Edit: String { return self._s[613]! } + public var PrivacySettings_LastSeenNobody: String { return self._s[614]! } public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[613]!, self._r[613]!, [_0]) + return formatWithArgumentRanges(self._s[615]!, self._r[615]!, [_0]) } - public var GroupInfo_ChatAdmins: String { return self._s[614]! } - public var PrivateDataSettings_Title: String { return self._s[615]! } - public var Login_CancelPhoneVerificationStop: String { return self._s[616]! } - public var ChatList_Read: String { return self._s[617]! } - public var Undo_ChatClearedForBothSides: String { return self._s[618]! } - public var GroupPermission_SectionTitle: String { return self._s[619]! } + public var GroupInfo_ChatAdmins: String { return self._s[616]! } + public var PrivateDataSettings_Title: String { return self._s[617]! } + public var Login_CancelPhoneVerificationStop: String { return self._s[618]! } + public var ChatList_Read: String { return self._s[619]! } + public var Undo_ChatClearedForBothSides: String { return self._s[620]! } + public var GroupPermission_SectionTitle: String { return self._s[621]! } public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[621]!, self._r[621]!, [_1, _2]) + return formatWithArgumentRanges(self._s[623]!, self._r[623]!, [_1, _2]) } - public var Checkout_ErrorPaymentFailed: String { return self._s[622]! } - public var Update_UpdateApp: String { return self._s[623]! } - public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[624]! } - public var Settings_Appearance: String { return self._s[625]! } - public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[627]! } - public var Watch_Location_Access: String { return self._s[628]! } - public var ShareMenu_CopyShareLink: String { return self._s[630]! } - public var TwoStepAuth_SetupHintTitle: String { return self._s[631]! } + public var Checkout_ErrorPaymentFailed: String { return self._s[624]! } + public var Update_UpdateApp: String { return self._s[625]! } + public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[626]! } + public var Settings_Appearance: String { return self._s[627]! } + public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[629]! } + public var Watch_Location_Access: String { return self._s[630]! } + public var ShareMenu_CopyShareLink: String { return self._s[632]! } + public var TwoStepAuth_SetupHintTitle: String { return self._s[633]! } public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[633]!, self._r[633]!, [_0]) + return formatWithArgumentRanges(self._s[635]!, self._r[635]!, [_0]) } - public var Notifications_ClassicTones: String { return self._s[634]! } - public var Weekday_ShortWednesday: String { return self._s[635]! } - public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[636]! } - public var Undo_LeftGroup: String { return self._s[639]! } - public var Conversation_LinkDialogCopy: String { return self._s[640]! } - public var KeyCommand_FocusOnInputField: String { return self._s[642]! } - public var Contacts_SelectAll: String { return self._s[643]! } - public var Preview_SaveToCameraRoll: String { return self._s[644]! } - public var PrivacySettings_PasscodeOff: String { return self._s[645]! } - public var Wallpaper_Title: String { return self._s[646]! } - public var Conversation_FilePhotoOrVideo: String { return self._s[647]! } - public var AccessDenied_Camera: String { return self._s[648]! } - public var Watch_Compose_CurrentLocation: String { return self._s[649]! } - public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[651]! } + public var Notifications_ClassicTones: String { return self._s[636]! } + public var Weekday_ShortWednesday: String { return self._s[637]! } + public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[638]! } + public var Undo_LeftGroup: String { return self._s[641]! } + public var Conversation_LinkDialogCopy: String { return self._s[642]! } + public var KeyCommand_FocusOnInputField: String { return self._s[644]! } + public var Contacts_SelectAll: String { return self._s[645]! } + public var Preview_SaveToCameraRoll: String { return self._s[646]! } + public var PrivacySettings_PasscodeOff: String { return self._s[647]! } + public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[648]! } + public var Wallpaper_Title: String { return self._s[649]! } + public var Conversation_FilePhotoOrVideo: String { return self._s[650]! } + public var AccessDenied_Camera: String { return self._s[651]! } + public var Watch_Compose_CurrentLocation: String { return self._s[652]! } + public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[654]! } public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[652]!, self._r[652]!, [_0]) + return formatWithArgumentRanges(self._s[655]!, self._r[655]!, [_0]) } - public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[653]! } - public var Passport_Language_ro: String { return self._s[654]! } - public var CheckoutInfo_SaveInfoHelp: String { return self._s[655]! } + public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[656]! } + public var Passport_Language_ro: String { return self._s[657]! } + public var CheckoutInfo_SaveInfoHelp: String { return self._s[658]! } public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[656]!, self._r[656]!, [_0]) + return formatWithArgumentRanges(self._s[659]!, self._r[659]!, [_0]) } - public var Login_CancelPhoneVerification: String { return self._s[657]! } - public var State_ConnectingToProxy: String { return self._s[658]! } - public var Calls_RatingTitle: String { return self._s[659]! } - public var Generic_ErrorMoreInfo: String { return self._s[660]! } - public var Appearance_PreviewReplyText: String { return self._s[661]! } - public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[662]! } - public var SharedMedia_CategoryLinks: String { return self._s[663]! } - public var Calls_Missed: String { return self._s[664]! } - public var Cache_Photos: String { return self._s[668]! } - public var GroupPermission_NoAddMembers: String { return self._s[669]! } + public var Login_CancelPhoneVerification: String { return self._s[660]! } + public var State_ConnectingToProxy: String { return self._s[661]! } + public var Calls_RatingTitle: String { return self._s[662]! } + public var Generic_ErrorMoreInfo: String { return self._s[663]! } + public var Appearance_PreviewReplyText: String { return self._s[664]! } + public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[665]! } + public var SharedMedia_CategoryLinks: String { return self._s[666]! } + public var Calls_Missed: String { return self._s[667]! } + public var Cache_Photos: String { return self._s[671]! } + public var GroupPermission_NoAddMembers: String { return self._s[672]! } public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[670]!, self._r[670]!, [_0]) + return formatWithArgumentRanges(self._s[673]!, self._r[673]!, [_0]) } - public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[671]! } - public var Settings_ProxyDisabled: String { return self._s[672]! } + public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[674]! } + public var Settings_ProxyDisabled: String { return self._s[675]! } public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[673]!, self._r[673]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[676]!, self._r[676]!, [_1, _2, _3, _4]) } public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[674]!, self._r[674]!, [_0]) - } - public var Appearance_Title: String { return self._s[675]! } - public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[677]!, self._r[677]!, [_0]) } - public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[678]! } - public var Channel_EditMessageErrorGeneric: String { return self._s[679]! } - public var Privacy_Calls_IntegrationHelp: String { return self._s[680]! } - public var Preview_DeletePhoto: String { return self._s[681]! } - public var Appearance_AppIconFilledX: String { return self._s[682]! } - public var PrivacySettings_PrivacyTitle: String { return self._s[683]! } + public var Appearance_Title: String { return self._s[678]! } + public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[680]!, self._r[680]!, [_0]) + } + public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[681]! } + public var Channel_EditMessageErrorGeneric: String { return self._s[682]! } + public var Privacy_Calls_IntegrationHelp: String { return self._s[683]! } + public var Preview_DeletePhoto: String { return self._s[684]! } + public var Appearance_AppIconFilledX: String { return self._s[685]! } + public var PrivacySettings_PrivacyTitle: String { return self._s[686]! } public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[684]!, self._r[684]!, [_0]) + return formatWithArgumentRanges(self._s[687]!, self._r[687]!, [_0]) } - public var Coub_TapForSound: String { return self._s[686]! } - public var Map_LocatingError: String { return self._s[687]! } - public var TwoStepAuth_EmailChangeSuccess: String { return self._s[689]! } - public var Passport_ForgottenPassword: String { return self._s[690]! } - public var GroupInfo_InviteLink_RevokeLink: String { return self._s[691]! } - public var StickerPacksSettings_ArchivedPacks: String { return self._s[692]! } - public var Login_TermsOfServiceSignupDecline: String { return self._s[694]! } - public var Channel_Moderator_AccessLevelRevoke: String { return self._s[695]! } - public var Message_Location: String { return self._s[696]! } - public var Passport_Identity_NamePlaceholder: String { return self._s[697]! } - public var Channel_Management_Title: String { return self._s[698]! } - public var DialogList_SearchSectionDialogs: String { return self._s[700]! } - public var Compose_NewChannel_Members: String { return self._s[701]! } + public var Coub_TapForSound: String { return self._s[689]! } + public var Map_LocatingError: String { return self._s[690]! } + public var TwoStepAuth_EmailChangeSuccess: String { return self._s[692]! } + public var Passport_ForgottenPassword: String { return self._s[693]! } + public var GroupInfo_InviteLink_RevokeLink: String { return self._s[694]! } + public var StickerPacksSettings_ArchivedPacks: String { return self._s[695]! } + public var Login_TermsOfServiceSignupDecline: String { return self._s[697]! } + public var Channel_Moderator_AccessLevelRevoke: String { return self._s[698]! } + public var Message_Location: String { return self._s[699]! } + public var Passport_Identity_NamePlaceholder: String { return self._s[700]! } + public var Channel_Management_Title: String { return self._s[701]! } + public var DialogList_SearchSectionDialogs: String { return self._s[703]! } + public var Compose_NewChannel_Members: String { return self._s[704]! } public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[702]!, self._r[702]!, [_0]) + return formatWithArgumentRanges(self._s[705]!, self._r[705]!, [_0]) } - public var GroupInfo_Location: String { return self._s[703]! } - public var AutoNightTheme_ScheduledFrom: String { return self._s[704]! } - public var PhotoEditor_WarmthTool: String { return self._s[705]! } - public var Passport_Language_tr: String { return self._s[706]! } + public var GroupInfo_Location: String { return self._s[706]! } + public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[707]! } + public var AutoNightTheme_ScheduledFrom: String { return self._s[708]! } + public var PhotoEditor_WarmthTool: String { return self._s[709]! } + public var Passport_Language_tr: String { return self._s[710]! } public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[707]!, self._r[707]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[711]!, self._r[711]!, [_1, _2, _3]) } - public var Login_ResetAccountProtected_Reset: String { return self._s[709]! } - public var Watch_PhotoView_Title: String { return self._s[710]! } - public var Passport_Phone_Delete: String { return self._s[711]! } - public var Undo_ChatDeletedForBothSides: String { return self._s[712]! } - public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[713]! } - public var GroupInfo_Permissions: String { return self._s[714]! } - public var PasscodeSettings_TurnPasscodeOff: String { return self._s[715]! } - public var Profile_ShareContactButton: String { return self._s[716]! } - public var ChatSettings_Other: String { return self._s[717]! } - public var UserInfo_NotificationsDisabled: String { return self._s[718]! } - public var CheckoutInfo_ShippingInfoCity: String { return self._s[719]! } - public var LastSeen_WithinAMonth: String { return self._s[720]! } - public var Conversation_ReportGroupLocation: String { return self._s[721]! } - public var Conversation_EncryptionCanceled: String { return self._s[722]! } - public var MediaPicker_GroupDescription: String { return self._s[723]! } - public var WebSearch_Images: String { return self._s[724]! } + public var Login_ResetAccountProtected_Reset: String { return self._s[713]! } + public var Watch_PhotoView_Title: String { return self._s[714]! } + public var Passport_Phone_Delete: String { return self._s[715]! } + public var Undo_ChatDeletedForBothSides: String { return self._s[716]! } + public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[717]! } + public var GroupInfo_Permissions: String { return self._s[718]! } + public var PasscodeSettings_TurnPasscodeOff: String { return self._s[719]! } + public var Profile_ShareContactButton: String { return self._s[720]! } + public var ChatSettings_Other: String { return self._s[721]! } + public var UserInfo_NotificationsDisabled: String { return self._s[722]! } + public var CheckoutInfo_ShippingInfoCity: String { return self._s[723]! } + public var LastSeen_WithinAMonth: String { return self._s[724]! } + public var Conversation_ReportGroupLocation: String { return self._s[725]! } + public var Conversation_EncryptionCanceled: String { return self._s[726]! } + public var MediaPicker_GroupDescription: String { return self._s[727]! } + public var WebSearch_Images: String { return self._s[728]! } public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[725]!, self._r[725]!, [_0]) + return formatWithArgumentRanges(self._s[729]!, self._r[729]!, [_0]) } - public var Message_Photo: String { return self._s[726]! } - public var PasscodeSettings_HelpBottom: String { return self._s[727]! } - public var AutoDownloadSettings_VideosTitle: String { return self._s[728]! } - public var Passport_Identity_AddDriversLicense: String { return self._s[729]! } - public var TwoStepAuth_EnterPasswordPassword: String { return self._s[730]! } - public var NotificationsSound_Calypso: String { return self._s[731]! } - public var Map_Map: String { return self._s[732]! } - public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[734]! } - public var ChatSettings_TextSizeUnits: String { return self._s[735]! } - public var Common_of: String { return self._s[736]! } - public var Conversation_ForwardContacts: String { return self._s[738]! } + public var Message_Photo: String { return self._s[730]! } + public var PasscodeSettings_HelpBottom: String { return self._s[731]! } + public var AutoDownloadSettings_VideosTitle: String { return self._s[732]! } + public var Passport_Identity_AddDriversLicense: String { return self._s[733]! } + public var TwoStepAuth_EnterPasswordPassword: String { return self._s[734]! } + public var NotificationsSound_Calypso: String { return self._s[735]! } + public var Map_Map: String { return self._s[736]! } + public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[738]! } + public var ChatSettings_TextSizeUnits: String { return self._s[739]! } + public var Common_of: String { return self._s[740]! } + public var Conversation_ForwardContacts: String { return self._s[742]! } public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[740]!, self._r[740]!, [_0]) + return formatWithArgumentRanges(self._s[744]!, self._r[744]!, [_0]) } - public var Passport_Language_hy: String { return self._s[741]! } - public var Notifications_MessageNotificationsHelp: String { return self._s[742]! } - public var AutoDownloadSettings_Reset: String { return self._s[743]! } - public var Paint_ClearConfirm: String { return self._s[744]! } - public var Camera_VideoMode: String { return self._s[745]! } + public var Passport_Language_hy: String { return self._s[745]! } + public var Notifications_MessageNotificationsHelp: String { return self._s[746]! } + public var AutoDownloadSettings_Reset: String { return self._s[747]! } + public var Paint_ClearConfirm: String { return self._s[748]! } + public var Camera_VideoMode: String { return self._s[749]! } public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[746]!, self._r[746]!, [_0]) + return formatWithArgumentRanges(self._s[750]!, self._r[750]!, [_0]) } - public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[747]! } - public var Conversation_ViewBackground: String { return self._s[748]! } - public var Passport_Language_el: String { return self._s[749]! } - public var PhotoEditor_Original: String { return self._s[750]! } - public var Settings_FAQ_Button: String { return self._s[752]! } - public var Channel_Setup_PublicNoLink: String { return self._s[754]! } - public var Conversation_UnsupportedMedia: String { return self._s[755]! } - public var Conversation_SlideToCancel: String { return self._s[756]! } - public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[757]! } - public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[758]! } - public var Conversation_ReportSpamChannelConfirmation: String { return self._s[759]! } - public var AutoNightTheme_NotAvailable: String { return self._s[760]! } - public var Common_Create: String { return self._s[761]! } - public var Settings_ApplyProxyAlertEnable: String { return self._s[762]! } - public var Localization_ChooseLanguage: String { return self._s[764]! } - public var Settings_Proxy: String { return self._s[767]! } - public var Privacy_TopPeersHelp: String { return self._s[768]! } - public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[769]! } - public var Chat_UnsendMyMessages: String { return self._s[770]! } - public var TwoStepAuth_ConfirmationAbort: String { return self._s[771]! } + public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[751]! } + public var Conversation_ViewBackground: String { return self._s[752]! } + public var Passport_Language_el: String { return self._s[753]! } + public var PhotoEditor_Original: String { return self._s[754]! } + public var Settings_FAQ_Button: String { return self._s[756]! } + public var Channel_Setup_PublicNoLink: String { return self._s[758]! } + public var Conversation_UnsupportedMedia: String { return self._s[759]! } + public var Conversation_SlideToCancel: String { return self._s[760]! } + public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[761]! } + public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[762]! } + public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[763]! } + public var Conversation_ReportSpamChannelConfirmation: String { return self._s[764]! } + public var AutoNightTheme_NotAvailable: String { return self._s[765]! } + public var Conversation_Owner: String { return self._s[766]! } + public var Common_Create: String { return self._s[767]! } + public var Settings_ApplyProxyAlertEnable: String { return self._s[768]! } + public var Localization_ChooseLanguage: String { return self._s[770]! } + public var Settings_Proxy: String { return self._s[773]! } + public var Privacy_TopPeersHelp: String { return self._s[774]! } + public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[775]! } + public var Chat_UnsendMyMessages: String { return self._s[776]! } + public var TwoStepAuth_ConfirmationAbort: String { return self._s[777]! } public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[773]!, self._r[773]!, [_0]) + return formatWithArgumentRanges(self._s[779]!, self._r[779]!, [_0]) } - public var Contacts_SortedByPresence: String { return self._s[774]! } - public var Passport_Identity_SurnamePlaceholder: String { return self._s[775]! } - public var Cache_Title: String { return self._s[776]! } + public var Contacts_SortedByPresence: String { return self._s[780]! } + public var Passport_Identity_SurnamePlaceholder: String { return self._s[781]! } + public var Cache_Title: String { return self._s[782]! } public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[777]!, self._r[777]!, [_0]) + return formatWithArgumentRanges(self._s[783]!, self._r[783]!, [_0]) } - public var TwoStepAuth_EmailCodeExpired: String { return self._s[778]! } - public var Channel_Moderator_Title: String { return self._s[779]! } - public var InstantPage_AutoNightTheme: String { return self._s[781]! } + public var TwoStepAuth_EmailCodeExpired: String { return self._s[784]! } + public var Channel_Moderator_Title: String { return self._s[785]! } + public var InstantPage_AutoNightTheme: String { return self._s[787]! } public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[784]!, self._r[784]!, [_1]) + return formatWithArgumentRanges(self._s[790]!, self._r[790]!, [_1]) } - public var Passport_Scans_Upload: String { return self._s[785]! } - public var Undo_Undo: String { return self._s[787]! } - public var Contacts_AccessDeniedHelpON: String { return self._s[788]! } - public var TwoStepAuth_RemovePassword: String { return self._s[789]! } - public var Common_Delete: String { return self._s[790]! } - public var Contacts_AddPeopleNearby: String { return self._s[792]! } - public var Conversation_ContextMenuDelete: String { return self._s[793]! } - public var SocksProxySetup_Credentials: String { return self._s[794]! } - public var PasscodeSettings_AutoLock_Disabled: String { return self._s[796]! } - public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[799]! } - public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[800]! } - public var Passport_Language_id: String { return self._s[802]! } - public var WallpaperSearch_ColorTeal: String { return self._s[803]! } - public var ChannelIntro_Title: String { return self._s[804]! } + public var Passport_Scans_Upload: String { return self._s[791]! } + public var Undo_Undo: String { return self._s[793]! } + public var Contacts_AccessDeniedHelpON: String { return self._s[794]! } + public var TwoStepAuth_RemovePassword: String { return self._s[795]! } + public var Common_Delete: String { return self._s[796]! } + public var Contacts_AddPeopleNearby: String { return self._s[798]! } + public var Conversation_ContextMenuDelete: String { return self._s[799]! } + public var SocksProxySetup_Credentials: String { return self._s[800]! } + public var PasscodeSettings_AutoLock_Disabled: String { return self._s[802]! } + public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[805]! } + public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[806]! } + public var Passport_Language_id: String { return self._s[808]! } + public var WallpaperSearch_ColorTeal: String { return self._s[809]! } + public var ChannelIntro_Title: String { return self._s[810]! } public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[805]!, self._r[805]!, [_0]) + return formatWithArgumentRanges(self._s[811]!, self._r[811]!, [_0]) } - public var Channel_Info_Description: String { return self._s[807]! } - public var Stickers_FavoriteStickers: String { return self._s[808]! } - public var Channel_BanUser_PermissionAddMembers: String { return self._s[809]! } - public var Notifications_DisplayNamesOnLockScreen: String { return self._s[810]! } - public var Calls_NoMissedCallsPlacehoder: String { return self._s[811]! } - public var Group_PublicLink_Placeholder: String { return self._s[812]! } - public var Notifications_ExceptionsDefaultSound: String { return self._s[813]! } + public var Channel_Info_Description: String { return self._s[813]! } + public var Stickers_FavoriteStickers: String { return self._s[814]! } + public var Channel_BanUser_PermissionAddMembers: String { return self._s[815]! } + public var Notifications_DisplayNamesOnLockScreen: String { return self._s[816]! } + public var Calls_NoMissedCallsPlacehoder: String { return self._s[817]! } + public var Group_PublicLink_Placeholder: String { return self._s[818]! } + public var Notifications_ExceptionsDefaultSound: String { return self._s[819]! } public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[814]!, self._r[814]!, [_1]) + return formatWithArgumentRanges(self._s[820]!, self._r[820]!, [_1]) } - public var TextFormat_Underline: String { return self._s[815]! } + public var TextFormat_Underline: String { return self._s[821]! } public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[816]!, self._r[816]!, [_1, _2]) + return formatWithArgumentRanges(self._s[822]!, self._r[822]!, [_1, _2]) } public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[817]!, self._r[817]!, [_0]) + return formatWithArgumentRanges(self._s[823]!, self._r[823]!, [_0]) } + public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[824]! } public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[818]!, self._r[818]!, [_1, _2]) + return formatWithArgumentRanges(self._s[825]!, self._r[825]!, [_1, _2]) } - public var GroupPermission_Delete: String { return self._s[819]! } - public var Passport_Language_uk: String { return self._s[820]! } - public var StickerPack_HideStickers: String { return self._s[822]! } - public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[823]! } + public var GroupPermission_Delete: String { return self._s[826]! } + public var Passport_Language_uk: String { return self._s[827]! } + public var StickerPack_HideStickers: String { return self._s[829]! } + public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[830]! } public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[824]!, self._r[824]!, [_1, _2]) + return formatWithArgumentRanges(self._s[831]!, self._r[831]!, [_1, _2]) } - public var Activity_UploadingVideoMessage: String { return self._s[825]! } + public var Activity_UploadingVideoMessage: String { return self._s[832]! } public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[826]!, self._r[826]!, [_0]) + return formatWithArgumentRanges(self._s[833]!, self._r[833]!, [_0]) } - public var Channel_TitleInfo: String { return self._s[827]! } - public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[828]! } - public var Settings_CallSettings: String { return self._s[829]! } - public var Camera_SquareMode: String { return self._s[830]! } - public var GroupInfo_SharedMediaNone: String { return self._s[831]! } + public var Channel_TitleInfo: String { return self._s[834]! } + public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[835]! } + public var Settings_CallSettings: String { return self._s[836]! } + public var Camera_SquareMode: String { return self._s[837]! } + public var GroupInfo_SharedMediaNone: String { return self._s[838]! } public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[832]!, self._r[832]!, [_1]) + return formatWithArgumentRanges(self._s[839]!, self._r[839]!, [_1]) } - public var Bot_GenericBotStatus: String { return self._s[833]! } - public var Application_Update: String { return self._s[835]! } - public var Month_ShortJanuary: String { return self._s[836]! } - public var Contacts_PermissionsKeepDisabled: String { return self._s[837]! } - public var Channel_AdminLog_BanReadMessages: String { return self._s[838]! } - public var Settings_AppLanguage_Unofficial: String { return self._s[839]! } - public var Passport_Address_Street2Placeholder: String { return self._s[840]! } + public var Bot_GenericBotStatus: String { return self._s[840]! } + public var Application_Update: String { return self._s[842]! } + public var Month_ShortJanuary: String { return self._s[843]! } + public var Contacts_PermissionsKeepDisabled: String { return self._s[844]! } + public var Channel_AdminLog_BanReadMessages: String { return self._s[845]! } + public var Settings_AppLanguage_Unofficial: String { return self._s[846]! } + public var Passport_Address_Street2Placeholder: String { return self._s[847]! } public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[841]!, self._r[841]!, [_0]) + return formatWithArgumentRanges(self._s[848]!, self._r[848]!, [_0]) } - public var NetworkUsageSettings_Cellular: String { return self._s[842]! } - public var Appearance_PreviewOutgoingText: String { return self._s[843]! } - public var Notifications_PermissionsAllowInSettings: String { return self._s[844]! } - public var AutoDownloadSettings_OnForAll: String { return self._s[846]! } - public var Map_Directions: String { return self._s[847]! } - public var Passport_FieldIdentityTranslationHelp: String { return self._s[849]! } - public var Appearance_ThemeDay: String { return self._s[850]! } - public var LogoutOptions_LogOut: String { return self._s[851]! } - public var Group_PublicLink_Title: String { return self._s[853]! } - public var Channel_AddBotErrorNoRights: String { return self._s[854]! } - public var Passport_Identity_AddPassport: String { return self._s[855]! } - public var LocalGroup_ButtonTitle: String { return self._s[856]! } - public var Call_Message: String { return self._s[857]! } - public var PhotoEditor_ExposureTool: String { return self._s[858]! } - public var Passport_FieldOneOf_Delimeter: String { return self._s[860]! } - public var Channel_AdminLog_CanBanUsers: String { return self._s[862]! } - public var Appearance_Preview: String { return self._s[863]! } - public var Compose_ChannelMembers: String { return self._s[864]! } - public var Conversation_DeleteManyMessages: String { return self._s[865]! } - public var ReportPeer_ReasonOther_Title: String { return self._s[866]! } - public var Checkout_ErrorProviderAccountTimeout: String { return self._s[867]! } - public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[868]! } - public var Channel_Stickers_CreateYourOwn: String { return self._s[871]! } - public var Conversation_UpdateTelegram: String { return self._s[872]! } + public var NetworkUsageSettings_Cellular: String { return self._s[849]! } + public var Appearance_PreviewOutgoingText: String { return self._s[850]! } + public var Notifications_PermissionsAllowInSettings: String { return self._s[851]! } + public var AutoDownloadSettings_OnForAll: String { return self._s[853]! } + public var Map_Directions: String { return self._s[854]! } + public var Passport_FieldIdentityTranslationHelp: String { return self._s[856]! } + public var Appearance_ThemeDay: String { return self._s[857]! } + public var LogoutOptions_LogOut: String { return self._s[858]! } + public var Group_PublicLink_Title: String { return self._s[860]! } + public var Channel_AddBotErrorNoRights: String { return self._s[861]! } + public var Passport_Identity_AddPassport: String { return self._s[862]! } + public var LocalGroup_ButtonTitle: String { return self._s[863]! } + public var Call_Message: String { return self._s[864]! } + public var PhotoEditor_ExposureTool: String { return self._s[865]! } + public var Passport_FieldOneOf_Delimeter: String { return self._s[867]! } + public var Channel_AdminLog_CanBanUsers: String { return self._s[869]! } + public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[870]! } + public var Appearance_Preview: String { return self._s[871]! } + public var Compose_ChannelMembers: String { return self._s[872]! } + public var Conversation_DeleteManyMessages: String { return self._s[873]! } + public var ReportPeer_ReasonOther_Title: String { return self._s[874]! } + public var Checkout_ErrorProviderAccountTimeout: String { return self._s[875]! } + public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[876]! } + public var Channel_Stickers_CreateYourOwn: String { return self._s[879]! } + public var Conversation_UpdateTelegram: String { return self._s[880]! } public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[873]!, self._r[873]!, [_0]) + return formatWithArgumentRanges(self._s[881]!, self._r[881]!, [_0]) } public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[874]!, self._r[874]!, [_1]) + return formatWithArgumentRanges(self._s[882]!, self._r[882]!, [_1]) } - public var GroupInfo_Administrators_Title: String { return self._s[875]! } - public var Privacy_Forwards_PreviewMessageText: String { return self._s[876]! } + public var GroupInfo_Administrators_Title: String { return self._s[883]! } + public var Privacy_Forwards_PreviewMessageText: String { return self._s[884]! } public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[877]!, self._r[877]!, [_0]) + return formatWithArgumentRanges(self._s[885]!, self._r[885]!, [_0]) } - public var Tour_Title3: String { return self._s[878]! } - public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[879]! } - public var Clipboard_SendPhoto: String { return self._s[883]! } - public var MediaPicker_Videos: String { return self._s[884]! } - public var Passport_Email_Title: String { return self._s[885]! } + public var Tour_Title3: String { return self._s[886]! } + public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[887]! } + public var Clipboard_SendPhoto: String { return self._s[891]! } + public var MediaPicker_Videos: String { return self._s[892]! } + public var Passport_Email_Title: String { return self._s[893]! } public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[886]!, self._r[886]!, [_0]) + return formatWithArgumentRanges(self._s[894]!, self._r[894]!, [_0]) } - public var StickerPacksSettings_Title: String { return self._s[887]! } - public var Conversation_MessageDialogDelete: String { return self._s[888]! } - public var Privacy_Calls_CustomHelp: String { return self._s[890]! } - public var Message_Wallpaper: String { return self._s[891]! } - public var MemberSearch_BotSection: String { return self._s[892]! } - public var GroupInfo_SetSound: String { return self._s[893]! } - public var Core_ServiceUserStatus: String { return self._s[894]! } - public var LiveLocationUpdated_JustNow: String { return self._s[895]! } - public var Call_StatusFailed: String { return self._s[896]! } - public var TwoStepAuth_SetupPasswordDescription: String { return self._s[897]! } - public var TwoStepAuth_SetPassword: String { return self._s[898]! } - public var Permissions_PeopleNearbyText_v0: String { return self._s[899]! } + public var StickerPacksSettings_Title: String { return self._s[895]! } + public var Conversation_MessageDialogDelete: String { return self._s[896]! } + public var Privacy_Calls_CustomHelp: String { return self._s[898]! } + public var Message_Wallpaper: String { return self._s[899]! } + public var MemberSearch_BotSection: String { return self._s[900]! } + public var GroupInfo_SetSound: String { return self._s[901]! } + public var Core_ServiceUserStatus: String { return self._s[902]! } + public var LiveLocationUpdated_JustNow: String { return self._s[903]! } + public var Call_StatusFailed: String { return self._s[904]! } + public var TwoStepAuth_SetupPasswordDescription: String { return self._s[905]! } + public var TwoStepAuth_SetPassword: String { return self._s[906]! } + public var Permissions_PeopleNearbyText_v0: String { return self._s[907]! } public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[901]!, self._r[901]!, [_0]) + return formatWithArgumentRanges(self._s[909]!, self._r[909]!, [_0]) } - public var Calls_SubmitRating: String { return self._s[902]! } - public var Profile_Username: String { return self._s[903]! } - public var Bot_DescriptionTitle: String { return self._s[904]! } - public var MaskStickerSettings_Title: String { return self._s[905]! } - public var SharedMedia_CategoryOther: String { return self._s[906]! } - public var GroupInfo_SetGroupPhoto: String { return self._s[907]! } - public var Common_NotNow: String { return self._s[908]! } - public var CallFeedback_IncludeLogsInfo: String { return self._s[909]! } - public var Conversation_ShareMyPhoneNumber: String { return self._s[910]! } - public var Map_Location: String { return self._s[911]! } - public var Invitation_JoinGroup: String { return self._s[912]! } - public var AutoDownloadSettings_Title: String { return self._s[914]! } - public var Conversation_DiscardVoiceMessageDescription: String { return self._s[915]! } - public var Channel_ErrorAddBlocked: String { return self._s[916]! } - public var Conversation_UnblockUser: String { return self._s[917]! } - public var Watch_Bot_Restart: String { return self._s[918]! } - public var TwoStepAuth_Title: String { return self._s[919]! } - public var Channel_AdminLog_BanSendMessages: String { return self._s[920]! } - public var Checkout_ShippingMethod: String { return self._s[921]! } - public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[922]! } + public var Calls_SubmitRating: String { return self._s[910]! } + public var Profile_Username: String { return self._s[911]! } + public var Bot_DescriptionTitle: String { return self._s[912]! } + public var MaskStickerSettings_Title: String { return self._s[913]! } + public var SharedMedia_CategoryOther: String { return self._s[914]! } + public var GroupInfo_SetGroupPhoto: String { return self._s[915]! } + public var Common_NotNow: String { return self._s[916]! } + public var CallFeedback_IncludeLogsInfo: String { return self._s[917]! } + public var Conversation_ShareMyPhoneNumber: String { return self._s[918]! } + public var Map_Location: String { return self._s[919]! } + public var Invitation_JoinGroup: String { return self._s[920]! } + public var AutoDownloadSettings_Title: String { return self._s[922]! } + public var Conversation_DiscardVoiceMessageDescription: String { return self._s[923]! } + public var Channel_ErrorAddBlocked: String { return self._s[924]! } + public var Conversation_UnblockUser: String { return self._s[925]! } + public var Watch_Bot_Restart: String { return self._s[926]! } + public var TwoStepAuth_Title: String { return self._s[927]! } + public var Channel_AdminLog_BanSendMessages: String { return self._s[928]! } + public var Checkout_ShippingMethod: String { return self._s[929]! } + public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[930]! } public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[923]!, self._r[923]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[931]!, self._r[931]!, [_1, _2, _3]) } public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[925]!, self._r[925]!, [_0]) + return formatWithArgumentRanges(self._s[933]!, self._r[933]!, [_0]) } public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[926]!, self._r[926]!, [_0]) + return formatWithArgumentRanges(self._s[934]!, self._r[934]!, [_0]) } - public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[927]! } - public var AuthSessions_TerminateOtherSessions: String { return self._s[928]! } - public var Contacts_FailedToSendInvitesMessage: String { return self._s[929]! } - public var PrivacySettings_TwoStepAuth: String { return self._s[930]! } - public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[931]! } - public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[932]! } - public var Conversation_EditingMessagePanelMedia: String { return self._s[933]! } - public var Checkout_PaymentMethod_Title: String { return self._s[934]! } - public var SocksProxySetup_Connection: String { return self._s[935]! } - public var Group_MessagePhotoRemoved: String { return self._s[936]! } - public var Channel_Stickers_NotFound: String { return self._s[938]! } - public var Group_About_Help: String { return self._s[939]! } - public var Notification_PassportValueProofOfIdentity: String { return self._s[940]! } - public var PeopleNearby_Title: String { return self._s[942]! } + public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[935]! } + public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[936]! } + public var AuthSessions_TerminateOtherSessions: String { return self._s[937]! } + public var Contacts_FailedToSendInvitesMessage: String { return self._s[938]! } + public var PrivacySettings_TwoStepAuth: String { return self._s[939]! } + public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[940]! } + public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[941]! } + public var Conversation_EditingMessagePanelMedia: String { return self._s[942]! } + public var Checkout_PaymentMethod_Title: String { return self._s[943]! } + public var SocksProxySetup_Connection: String { return self._s[944]! } + public var Group_MessagePhotoRemoved: String { return self._s[945]! } + public var Channel_Stickers_NotFound: String { return self._s[947]! } + public var Group_About_Help: String { return self._s[948]! } + public var Notification_PassportValueProofOfIdentity: String { return self._s[949]! } + public var PeopleNearby_Title: String { return self._s[951]! } public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[943]!, self._r[943]!, [_1]) + return formatWithArgumentRanges(self._s[952]!, self._r[952]!, [_1]) } - public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[945]! } - public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[946]! } - public var SocksProxySetup_Password: String { return self._s[947]! } - public var Notifications_PermissionsEnable: String { return self._s[948]! } - public var TwoStepAuth_ChangeEmail: String { return self._s[950]! } + public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[954]! } + public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[955]! } + public var SocksProxySetup_Password: String { return self._s[956]! } + public var Notifications_PermissionsEnable: String { return self._s[957]! } + public var TwoStepAuth_ChangeEmail: String { return self._s[959]! } public func Channel_AdminLog_MessageInvitedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[951]!, self._r[951]!, [_1]) + return formatWithArgumentRanges(self._s[960]!, self._r[960]!, [_1]) } public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[953]!, self._r[953]!, [_0]) + return formatWithArgumentRanges(self._s[962]!, self._r[962]!, [_0]) } - public var Passport_Identity_TypeDriversLicense: String { return self._s[954]! } - public var ArchivedPacksAlert_Title: String { return self._s[955]! } + public var Passport_Identity_TypeDriversLicense: String { return self._s[963]! } + public var ArchivedPacksAlert_Title: String { return self._s[964]! } public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[956]!, self._r[956]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[965]!, self._r[965]!, [_1, _2, _3]) } - public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[957]! } - public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[959]! } - public var Conversation_StatusTyping: String { return self._s[960]! } - public var Broadcast_AdminLog_EmptyText: String { return self._s[961]! } - public var Notification_PassportValueProofOfAddress: String { return self._s[962]! } - public var UserInfo_CreateNewContact: String { return self._s[963]! } - public var Passport_Identity_FrontSide: String { return self._s[964]! } - public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[965]! } - public var Calls_CallTabTitle: String { return self._s[966]! } - public var Channel_AdminLog_ChannelEmptyText: String { return self._s[967]! } + public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[966]! } + public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[968]! } + public var Conversation_StatusTyping: String { return self._s[969]! } + public var Broadcast_AdminLog_EmptyText: String { return self._s[970]! } + public var Notification_PassportValueProofOfAddress: String { return self._s[971]! } + public var UserInfo_CreateNewContact: String { return self._s[972]! } + public var Passport_Identity_FrontSide: String { return self._s[973]! } + public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[974]! } + public var Calls_CallTabTitle: String { return self._s[975]! } + public var Channel_AdminLog_ChannelEmptyText: String { return self._s[976]! } public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[968]!, self._r[968]!, [_0]) + return formatWithArgumentRanges(self._s[977]!, self._r[977]!, [_0]) } - public var Watch_UserInfo_MuteTitle: String { return self._s[969]! } - public var SharedMedia_EmptyMusicText: String { return self._s[970]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[971]! } - public var Paint_Stickers: String { return self._s[972]! } - public var Privacy_GroupsAndChannels: String { return self._s[973]! } - public var UserInfo_AddContact: String { return self._s[975]! } + public var Watch_UserInfo_MuteTitle: String { return self._s[978]! } + public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[979]! } + public var SharedMedia_EmptyMusicText: String { return self._s[980]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[981]! } + public var Paint_Stickers: String { return self._s[982]! } + public var Privacy_GroupsAndChannels: String { return self._s[983]! } + public var UserInfo_AddContact: String { return self._s[985]! } public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[976]!, self._r[976]!, [_0]) + return formatWithArgumentRanges(self._s[986]!, self._r[986]!, [_0]) } - public var PhoneNumberHelp_ChangeNumber: String { return self._s[978]! } + public var PhoneNumberHelp_ChangeNumber: String { return self._s[988]! } public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[980]!, self._r[980]!, [_0]) + return formatWithArgumentRanges(self._s[990]!, self._r[990]!, [_0]) } - public var DialogList_NoMessagesTitle: String { return self._s[981]! } - public var EditProfile_NameAndPhotoHelp: String { return self._s[982]! } - public var BlockedUsers_BlockUser: String { return self._s[983]! } - public var Notifications_PermissionsOpenSettings: String { return self._s[984]! } - public var MediaPicker_UngroupDescription: String { return self._s[985]! } - public var Watch_NoConnection: String { return self._s[986]! } - public var Month_GenSeptember: String { return self._s[987]! } - public var Conversation_ViewGroup: String { return self._s[988]! } - public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[991]! } - public var Privacy_Forwards_AlwaysLink: String { return self._s[992]! } - public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[993]! } - public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[994]! } - public var MediaPicker_CameraRoll: String { return self._s[996]! } - public var Month_GenAugust: String { return self._s[997]! } - public var AccessDenied_VideoMessageMicrophone: String { return self._s[998]! } - public var SharedMedia_EmptyText: String { return self._s[999]! } - public var Map_ShareLiveLocation: String { return self._s[1000]! } - public var Calls_All: String { return self._s[1001]! } - public var Appearance_ThemeNight: String { return self._s[1004]! } - public var Conversation_HoldForAudio: String { return self._s[1005]! } - public var SettingsSearch_Synonyms_Support: String { return self._s[1008]! } - public var GroupInfo_GroupHistoryHidden: String { return self._s[1009]! } - public var SocksProxySetup_Secret: String { return self._s[1010]! } + public var DialogList_NoMessagesTitle: String { return self._s[991]! } + public var EditProfile_NameAndPhotoHelp: String { return self._s[992]! } + public var BlockedUsers_BlockUser: String { return self._s[993]! } + public var Notifications_PermissionsOpenSettings: String { return self._s[994]! } + public var MediaPicker_UngroupDescription: String { return self._s[995]! } + public var Watch_NoConnection: String { return self._s[996]! } + public var Month_GenSeptember: String { return self._s[997]! } + public var Conversation_ViewGroup: String { return self._s[998]! } + public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[1001]! } + public var Privacy_Forwards_AlwaysLink: String { return self._s[1002]! } + public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1003]! } + public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[1004]! } + public var MediaPicker_CameraRoll: String { return self._s[1006]! } + public var Month_GenAugust: String { return self._s[1007]! } + public var AccessDenied_VideoMessageMicrophone: String { return self._s[1008]! } + public var SharedMedia_EmptyText: String { return self._s[1009]! } + public var Map_ShareLiveLocation: String { return self._s[1010]! } + public var Calls_All: String { return self._s[1011]! } + public var Appearance_ThemeNight: String { return self._s[1014]! } + public var Conversation_HoldForAudio: String { return self._s[1015]! } + public var SettingsSearch_Synonyms_Support: String { return self._s[1018]! } + public var GroupInfo_GroupHistoryHidden: String { return self._s[1019]! } + public var SocksProxySetup_Secret: String { return self._s[1020]! } public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1011]!, self._r[1011]!, [_0]) + return formatWithArgumentRanges(self._s[1021]!, self._r[1021]!, [_0]) } - public var Channel_BanList_RestrictedTitle: String { return self._s[1013]! } - public var Conversation_Location: String { return self._s[1014]! } + public var Channel_BanList_RestrictedTitle: String { return self._s[1023]! } + public var Conversation_Location: String { return self._s[1024]! } public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1015]!, self._r[1015]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1025]!, self._r[1025]!, [_1, _2]) } - public var ChatSettings_AutoDownloadPhotos: String { return self._s[1017]! } - public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1018]! } - public var Notifications_PermissionsText: String { return self._s[1019]! } - public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1020]! } - public var Call_Flip: String { return self._s[1021]! } - public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1022]! } - public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1024]! } - public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1026]! } - public var Channel_TooMuchBots: String { return self._s[1028]! } - public var Passport_DeletePassportConfirmation: String { return self._s[1029]! } - public var Login_InvalidCodeError: String { return self._s[1030]! } - public var StickerPacksSettings_FeaturedPacks: String { return self._s[1031]! } + public var ChatSettings_AutoDownloadPhotos: String { return self._s[1027]! } + public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[1028]! } + public var Notifications_PermissionsText: String { return self._s[1029]! } + public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[1030]! } + public var Call_Flip: String { return self._s[1031]! } + public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1032]! } + public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[1034]! } + public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[1036]! } + public var Channel_TooMuchBots: String { return self._s[1038]! } + public var Passport_DeletePassportConfirmation: String { return self._s[1039]! } + public var Login_InvalidCodeError: String { return self._s[1040]! } + public var StickerPacksSettings_FeaturedPacks: String { return self._s[1041]! } public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1032]!, self._r[1032]!, [_0]) + return formatWithArgumentRanges(self._s[1042]!, self._r[1042]!, [_0]) } public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1033]!, self._r[1033]!, [_0]) + return formatWithArgumentRanges(self._s[1043]!, self._r[1043]!, [_0]) } - public var Call_CallInProgressTitle: String { return self._s[1034]! } - public var Month_ShortSeptember: String { return self._s[1035]! } - public var Watch_ChannelInfo_Title: String { return self._s[1036]! } - public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1039]! } - public var DialogList_PasscodeLockHelp: String { return self._s[1040]! } - public var Notifications_Badge_IncludePublicGroups: String { return self._s[1041]! } - public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1042]! } - public var PhotoEditor_CropReset: String { return self._s[1043]! } - public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1045]! } - public var Channel_Management_LabelEditor: String { return self._s[1046]! } - public var Passport_Identity_LatinNameHelp: String { return self._s[1048]! } - public var PhotoEditor_HighlightsTool: String { return self._s[1049]! } - public var UserInfo_Title: String { return self._s[1050]! } - public var ChatList_HideAction: String { return self._s[1051]! } - public var AccessDenied_Title: String { return self._s[1052]! } - public var DialogList_SearchLabel: String { return self._s[1053]! } - public var Group_Setup_HistoryHidden: String { return self._s[1054]! } - public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1055]! } - public var State_Updating: String { return self._s[1057]! } - public var Contacts_TabTitle: String { return self._s[1058]! } - public var Notifications_Badge_CountUnreadMessages: String { return self._s[1060]! } - public var GroupInfo_GroupHistory: String { return self._s[1061]! } - public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1062]! } - public var Wallpaper_SetColor: String { return self._s[1063]! } - public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1064]! } - public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1065]! } - public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1066]! } - public var Contacts_NotRegisteredSection: String { return self._s[1067]! } + public var Call_CallInProgressTitle: String { return self._s[1044]! } + public var Month_ShortSeptember: String { return self._s[1045]! } + public var Watch_ChannelInfo_Title: String { return self._s[1046]! } + public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[1049]! } + public var DialogList_PasscodeLockHelp: String { return self._s[1050]! } + public var Notifications_Badge_IncludePublicGroups: String { return self._s[1051]! } + public var Channel_AdminLogFilter_EventsTitle: String { return self._s[1052]! } + public var PhotoEditor_CropReset: String { return self._s[1053]! } + public var Group_Username_CreatePrivateLinkHelp: String { return self._s[1055]! } + public var Channel_Management_LabelEditor: String { return self._s[1056]! } + public var Passport_Identity_LatinNameHelp: String { return self._s[1058]! } + public var PhotoEditor_HighlightsTool: String { return self._s[1059]! } + public var UserInfo_Title: String { return self._s[1060]! } + public var ChatList_HideAction: String { return self._s[1061]! } + public var AccessDenied_Title: String { return self._s[1062]! } + public var DialogList_SearchLabel: String { return self._s[1063]! } + public var Group_Setup_HistoryHidden: String { return self._s[1064]! } + public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[1065]! } + public var State_Updating: String { return self._s[1067]! } + public var Contacts_TabTitle: String { return self._s[1068]! } + public var Notifications_Badge_CountUnreadMessages: String { return self._s[1070]! } + public var GroupInfo_GroupHistory: String { return self._s[1071]! } + public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[1072]! } + public var Wallpaper_SetColor: String { return self._s[1073]! } + public var CheckoutInfo_ShippingInfoCountry: String { return self._s[1074]! } + public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1075]! } + public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[1076]! } + public var Contacts_NotRegisteredSection: String { return self._s[1077]! } public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1068]!, self._r[1068]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1078]!, self._r[1078]!, [_1, _2, _3]) } - public var Paint_Clear: String { return self._s[1069]! } - public var StickerPacksSettings_ArchivedMasks: String { return self._s[1070]! } - public var SocksProxySetup_Connecting: String { return self._s[1071]! } - public var ExplicitContent_AlertChannel: String { return self._s[1072]! } - public var CreatePoll_AllOptionsAdded: String { return self._s[1073]! } - public var Conversation_Contact: String { return self._s[1074]! } - public var Login_CodeExpired: String { return self._s[1075]! } - public var Passport_DiscardMessageAction: String { return self._s[1076]! } - public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1077]! } - public var Channel_AdminLog_EmptyMessageText: String { return self._s[1078]! } - public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1079]! } - public var Month_ShortApril: String { return self._s[1080]! } - public var AuthSessions_CurrentSession: String { return self._s[1081]! } - public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1084]! } - public var WallpaperPreview_CropTopText: String { return self._s[1086]! } - public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1087]! } - public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1088]! } - public var Channel_Setup_TypePrivate: String { return self._s[1090]! } - public var Forward_ChannelReadOnly: String { return self._s[1093]! } - public var PhotoEditor_CurvesBlue: String { return self._s[1094]! } - public var AddContact_SharedContactException: String { return self._s[1095]! } - public var UserInfo_BotPrivacy: String { return self._s[1096]! } - public var Notification_PassportValueEmail: String { return self._s[1097]! } - public var EmptyGroupInfo_Subtitle: String { return self._s[1098]! } - public var GroupPermission_NewTitle: String { return self._s[1099]! } - public var CallFeedback_ReasonDropped: String { return self._s[1100]! } - public var GroupInfo_Permissions_AddException: String { return self._s[1101]! } - public var Channel_SignMessages_Help: String { return self._s[1103]! } - public var Undo_ChatDeleted: String { return self._s[1105]! } - public var Conversation_ChatBackground: String { return self._s[1106]! } - public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1107]! } - public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1108]! } - public var Passport_Language_pt: String { return self._s[1109]! } - public var NotificationsSound_Popcorn: String { return self._s[1112]! } - public var AutoNightTheme_Disabled: String { return self._s[1113]! } - public var BlockedUsers_LeavePrefix: String { return self._s[1114]! } - public var WallpaperPreview_CustomColorTopText: String { return self._s[1115]! } - public var Contacts_PermissionsSuppressWarningText: String { return self._s[1116]! } - public var WallpaperSearch_ColorBlue: String { return self._s[1117]! } + public var Paint_Clear: String { return self._s[1079]! } + public var StickerPacksSettings_ArchivedMasks: String { return self._s[1080]! } + public var SocksProxySetup_Connecting: String { return self._s[1081]! } + public var ExplicitContent_AlertChannel: String { return self._s[1082]! } + public var CreatePoll_AllOptionsAdded: String { return self._s[1083]! } + public var Conversation_Contact: String { return self._s[1084]! } + public var Login_CodeExpired: String { return self._s[1085]! } + public var Passport_DiscardMessageAction: String { return self._s[1086]! } + public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1087]! } + public var Channel_AdminLog_EmptyMessageText: String { return self._s[1088]! } + public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1089]! } + public var Month_ShortApril: String { return self._s[1090]! } + public var AuthSessions_CurrentSession: String { return self._s[1091]! } + public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1094]! } + public var WallpaperPreview_CropTopText: String { return self._s[1096]! } + public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1097]! } + public var CheckoutInfo_ShippingInfoTitle: String { return self._s[1098]! } + public var Channel_Setup_TypePrivate: String { return self._s[1100]! } + public var Forward_ChannelReadOnly: String { return self._s[1103]! } + public var PhotoEditor_CurvesBlue: String { return self._s[1104]! } + public var AddContact_SharedContactException: String { return self._s[1105]! } + public var UserInfo_BotPrivacy: String { return self._s[1106]! } + public var Notification_PassportValueEmail: String { return self._s[1107]! } + public var EmptyGroupInfo_Subtitle: String { return self._s[1108]! } + public var GroupPermission_NewTitle: String { return self._s[1109]! } + public var CallFeedback_ReasonDropped: String { return self._s[1110]! } + public var GroupInfo_Permissions_AddException: String { return self._s[1111]! } + public var Channel_SignMessages_Help: String { return self._s[1113]! } + public var Undo_ChatDeleted: String { return self._s[1115]! } + public var Conversation_ChatBackground: String { return self._s[1116]! } + public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[1117]! } + public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[1118]! } + public var Passport_Language_pt: String { return self._s[1119]! } + public var NotificationsSound_Popcorn: String { return self._s[1122]! } + public var AutoNightTheme_Disabled: String { return self._s[1123]! } + public var BlockedUsers_LeavePrefix: String { return self._s[1124]! } + public var WallpaperPreview_CustomColorTopText: String { return self._s[1125]! } + public var Contacts_PermissionsSuppressWarningText: String { return self._s[1126]! } + public var WallpaperSearch_ColorBlue: String { return self._s[1127]! } public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1118]!, self._r[1118]!, [_0]) + return formatWithArgumentRanges(self._s[1128]!, self._r[1128]!, [_0]) } - public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1119]! } - public var SocksProxySetup_UseForCalls: String { return self._s[1120]! } - public var Passport_DeleteDocumentConfirmation: String { return self._s[1122]! } + public var CheckoutInfo_ErrorNameInvalid: String { return self._s[1129]! } + public var SocksProxySetup_UseForCalls: String { return self._s[1130]! } + public var Passport_DeleteDocumentConfirmation: String { return self._s[1132]! } public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1123]!, self._r[1123]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1133]!, self._r[1133]!, ["\(_0)"]) } - public var SocksProxySetup_Hostname: String { return self._s[1126]! } - public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1127]! } - public var Compose_NewEncryptedChat: String { return self._s[1128]! } - public var Login_CodeFloodError: String { return self._s[1129]! } - public var Calls_TabTitle: String { return self._s[1130]! } - public var Privacy_ProfilePhoto: String { return self._s[1131]! } - public var Passport_Language_he: String { return self._s[1132]! } - public var GroupPermission_Title: String { return self._s[1133]! } + public var SocksProxySetup_Hostname: String { return self._s[1136]! } + public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1137]! } + public var Compose_NewEncryptedChat: String { return self._s[1138]! } + public var Login_CodeFloodError: String { return self._s[1139]! } + public var Calls_TabTitle: String { return self._s[1140]! } + public var Privacy_ProfilePhoto: String { return self._s[1141]! } + public var Passport_Language_he: String { return self._s[1142]! } + public var GroupPermission_Title: String { return self._s[1143]! } public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1134]!, self._r[1134]!, [_0]) + return formatWithArgumentRanges(self._s[1144]!, self._r[1144]!, [_0]) } - public var GroupPermission_NoChangeInfo: String { return self._s[1135]! } - public var ChatList_DeleteForCurrentUser: String { return self._s[1136]! } - public var Tour_Text1: String { return self._s[1137]! } - public var Channel_EditAdmin_TransferOwnership: String { return self._s[1138]! } - public var Month_ShortFebruary: String { return self._s[1139]! } - public var TwoStepAuth_EmailSkip: String { return self._s[1140]! } - public var NotificationsSound_Glass: String { return self._s[1141]! } - public var Appearance_ThemeNightBlue: String { return self._s[1142]! } - public var CheckoutInfo_Pay: String { return self._s[1143]! } - public var Invite_LargeRecipientsCountWarning: String { return self._s[1145]! } - public var Call_CallAgain: String { return self._s[1147]! } - public var AttachmentMenu_SendAsFile: String { return self._s[1148]! } - public var AccessDenied_MicrophoneRestricted: String { return self._s[1149]! } - public var Passport_InvalidPasswordError: String { return self._s[1150]! } - public var Watch_Message_Game: String { return self._s[1151]! } - public var Stickers_Install: String { return self._s[1152]! } - public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1153]! } - public var Passport_Identity_ResidenceCountry: String { return self._s[1155]! } - public var Notifications_GroupNotificationsHelp: String { return self._s[1156]! } - public var AuthSessions_OtherSessions: String { return self._s[1157]! } - public var Channel_Username_Help: String { return self._s[1158]! } - public var Camera_Title: String { return self._s[1159]! } - public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1161]! } - public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1162]! } - public var Channel_AdminLog_SendPolls: String { return self._s[1163]! } - public var Channel_AdminLog_TitleAllEvents: String { return self._s[1164]! } - public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1165]! } - public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1166]! } - public var Conversation_RestrictedStickers: String { return self._s[1167]! } - public var Notifications_ExceptionsResetToDefaults: String { return self._s[1169]! } - public var UserInfo_TelegramCall: String { return self._s[1171]! } - public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1172]! } - public var CreatePoll_OptionsHeader: String { return self._s[1173]! } - public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1174]! } - public var ArchivedChats_IntroTitle1: String { return self._s[1175]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1176]! } - public var Passport_Identity_EditPersonalDetails: String { return self._s[1177]! } + public var GroupPermission_NoChangeInfo: String { return self._s[1145]! } + public var ChatList_DeleteForCurrentUser: String { return self._s[1146]! } + public var Tour_Text1: String { return self._s[1147]! } + public var Channel_EditAdmin_TransferOwnership: String { return self._s[1148]! } + public var Month_ShortFebruary: String { return self._s[1149]! } + public var TwoStepAuth_EmailSkip: String { return self._s[1150]! } + public var NotificationsSound_Glass: String { return self._s[1151]! } + public var Appearance_ThemeNightBlue: String { return self._s[1152]! } + public var CheckoutInfo_Pay: String { return self._s[1153]! } + public var Invite_LargeRecipientsCountWarning: String { return self._s[1155]! } + public var Call_CallAgain: String { return self._s[1157]! } + public var AttachmentMenu_SendAsFile: String { return self._s[1158]! } + public var AccessDenied_MicrophoneRestricted: String { return self._s[1159]! } + public var Passport_InvalidPasswordError: String { return self._s[1160]! } + public var Watch_Message_Game: String { return self._s[1161]! } + public var Stickers_Install: String { return self._s[1162]! } + public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1163]! } + public var Passport_Identity_ResidenceCountry: String { return self._s[1165]! } + public var Notifications_GroupNotificationsHelp: String { return self._s[1166]! } + public var AuthSessions_OtherSessions: String { return self._s[1167]! } + public var Channel_Username_Help: String { return self._s[1168]! } + public var Camera_Title: String { return self._s[1169]! } + public var GroupInfo_SetGroupPhotoDelete: String { return self._s[1171]! } + public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[1172]! } + public var Channel_AdminLog_SendPolls: String { return self._s[1173]! } + public var Channel_AdminLog_TitleAllEvents: String { return self._s[1174]! } + public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[1175]! } + public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[1176]! } + public var Conversation_RestrictedStickers: String { return self._s[1177]! } + public var Notifications_ExceptionsResetToDefaults: String { return self._s[1179]! } + public var UserInfo_TelegramCall: String { return self._s[1181]! } + public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1182]! } + public var CreatePoll_OptionsHeader: String { return self._s[1183]! } + public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[1184]! } + public var ArchivedChats_IntroTitle1: String { return self._s[1185]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[1186]! } + public var Passport_Identity_EditPersonalDetails: String { return self._s[1187]! } public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1178]!, self._r[1178]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1188]!, self._r[1188]!, [_1, _2, _3]) } - public var Settings_SaveEditedPhotos: String { return self._s[1179]! } - public var TwoStepAuth_ConfirmationTitle: String { return self._s[1180]! } - public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1181]! } - public var Conversation_MessageDialogRetry: String { return self._s[1182]! } - public var Conversation_DiscardVoiceMessageAction: String { return self._s[1183]! } - public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1184]! } - public var Group_Setup_TypeHeader: String { return self._s[1185]! } - public var Paint_RecentStickers: String { return self._s[1186]! } - public var PhotoEditor_GrainTool: String { return self._s[1187]! } - public var CheckoutInfo_ShippingInfoState: String { return self._s[1188]! } - public var EmptyGroupInfo_Line4: String { return self._s[1189]! } - public var Watch_AuthRequired: String { return self._s[1191]! } + public var Settings_SaveEditedPhotos: String { return self._s[1189]! } + public var TwoStepAuth_ConfirmationTitle: String { return self._s[1190]! } + public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[1191]! } + public var Conversation_MessageDialogRetry: String { return self._s[1192]! } + public var Conversation_DiscardVoiceMessageAction: String { return self._s[1193]! } + public var Permissions_PeopleNearbyTitle_v0: String { return self._s[1194]! } + public var Group_Setup_TypeHeader: String { return self._s[1195]! } + public var Paint_RecentStickers: String { return self._s[1196]! } + public var PhotoEditor_GrainTool: String { return self._s[1197]! } + public var CheckoutInfo_ShippingInfoState: String { return self._s[1198]! } + public var EmptyGroupInfo_Line4: String { return self._s[1199]! } + public var Watch_AuthRequired: String { return self._s[1201]! } public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1192]!, self._r[1192]!, [_0]) + return formatWithArgumentRanges(self._s[1202]!, self._r[1202]!, [_0]) } - public var Conversation_EncryptedDescriptionTitle: String { return self._s[1193]! } - public var ChannelIntro_Text: String { return self._s[1194]! } - public var DialogList_DeleteBotConfirmation: String { return self._s[1195]! } - public var GroupPermission_NoSendMedia: String { return self._s[1196]! } - public var Calls_AddTab: String { return self._s[1197]! } - public var Message_ReplyActionButtonShowReceipt: String { return self._s[1198]! } - public var Channel_AdminLog_EmptyFilterText: String { return self._s[1199]! } - public var Notification_MessageLifetime1d: String { return self._s[1200]! } - public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1201]! } - public var Channel_BanUser_PermissionsHeader: String { return self._s[1202]! } - public var Passport_Identity_GenderFemale: String { return self._s[1203]! } - public var BlockedUsers_BlockTitle: String { return self._s[1204]! } + public var Conversation_EncryptedDescriptionTitle: String { return self._s[1203]! } + public var ChannelIntro_Text: String { return self._s[1204]! } + public var DialogList_DeleteBotConfirmation: String { return self._s[1205]! } + public var GroupPermission_NoSendMedia: String { return self._s[1206]! } + public var Calls_AddTab: String { return self._s[1207]! } + public var Message_ReplyActionButtonShowReceipt: String { return self._s[1208]! } + public var Channel_AdminLog_EmptyFilterText: String { return self._s[1209]! } + public var Notification_MessageLifetime1d: String { return self._s[1210]! } + public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[1211]! } + public var Channel_BanUser_PermissionsHeader: String { return self._s[1212]! } + public var Passport_Identity_GenderFemale: String { return self._s[1213]! } + public var BlockedUsers_BlockTitle: String { return self._s[1214]! } public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1205]!, self._r[1205]!, [_1]) + return formatWithArgumentRanges(self._s[1215]!, self._r[1215]!, [_1]) } - public var Weekday_Yesterday: String { return self._s[1206]! } - public var WallpaperSearch_ColorBlack: String { return self._s[1207]! } - public var ChatList_ArchiveAction: String { return self._s[1208]! } - public var AutoNightTheme_Scheduled: String { return self._s[1209]! } + public var Weekday_Yesterday: String { return self._s[1216]! } + public var WallpaperSearch_ColorBlack: String { return self._s[1217]! } + public var ChatList_ArchiveAction: String { return self._s[1218]! } + public var AutoNightTheme_Scheduled: String { return self._s[1219]! } public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1210]!, self._r[1210]!, [_1, _2, _3, _4, _5, _6]) + return formatWithArgumentRanges(self._s[1220]!, self._r[1220]!, [_1, _2, _3, _4, _5, _6]) } - public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1211]! } + public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[1221]! } public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1212]!, self._r[1212]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1222]!, self._r[1222]!, [_1, _2]) } - public var CreatePoll_Create: String { return self._s[1213]! } - public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1214]! } + public var CreatePoll_Create: String { return self._s[1223]! } + public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1224]! } public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1215]!, self._r[1215]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1225]!, self._r[1225]!, [_1, _2]) } - public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1216]! } - public var Notifications_InAppNotificationsSounds: String { return self._s[1218]! } + public var Checkout_ErrorProviderAccountInvalid: String { return self._s[1226]! } + public var Notifications_InAppNotificationsSounds: String { return self._s[1228]! } public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1219]!, self._r[1219]!, [_1]) + return formatWithArgumentRanges(self._s[1229]!, self._r[1229]!, [_1]) } - public var Preview_OpenInInstagram: String { return self._s[1220]! } - public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1221]! } + public var Preview_OpenInInstagram: String { return self._s[1230]! } + public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[1231]! } public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1222]!, self._r[1222]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1232]!, self._r[1232]!, [_1, _2, _3]) } public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1223]!, self._r[1223]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1233]!, self._r[1233]!, [_1, _2]) } - public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1224]! } - public var ArchivedChats_IntroText3: String { return self._s[1225]! } - public var ChatList_UndoArchiveHiddenText: String { return self._s[1226]! } - public var NetworkUsageSettings_TotalSection: String { return self._s[1227]! } - public var Channel_Setup_TypePrivateHelp: String { return self._s[1228]! } + public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[1234]! } + public var ArchivedChats_IntroText3: String { return self._s[1235]! } + public var ChatList_UndoArchiveHiddenText: String { return self._s[1236]! } + public var NetworkUsageSettings_TotalSection: String { return self._s[1237]! } + public var Channel_Setup_TypePrivateHelp: String { return self._s[1238]! } public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1229]!, self._r[1229]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1239]!, self._r[1239]!, [_1, _2, _3]) } - public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1231]! } - public var FastTwoStepSetup_HintSection: String { return self._s[1232]! } - public var Wallpaper_PhotoLibrary: String { return self._s[1233]! } - public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1234]! } - public var Gif_NoGifsFound: String { return self._s[1235]! } - public var Watch_LastSeen_WithinAMonth: String { return self._s[1236]! } - public var GroupInfo_ActionPromote: String { return self._s[1237]! } - public var PasscodeSettings_SimplePasscode: String { return self._s[1238]! } - public var GroupInfo_Permissions_Title: String { return self._s[1239]! } - public var Permissions_ContactsText_v0: String { return self._s[1240]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1241]! } - public var PrivacySettings_DataSettingsHelp: String { return self._s[1244]! } - public var Passport_FieldEmailHelp: String { return self._s[1245]! } + public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[1241]! } + public var FastTwoStepSetup_HintSection: String { return self._s[1242]! } + public var Wallpaper_PhotoLibrary: String { return self._s[1243]! } + public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[1244]! } + public var Gif_NoGifsFound: String { return self._s[1245]! } + public var Watch_LastSeen_WithinAMonth: String { return self._s[1246]! } + public var GroupInfo_ActionPromote: String { return self._s[1247]! } + public var PasscodeSettings_SimplePasscode: String { return self._s[1248]! } + public var GroupInfo_Permissions_Title: String { return self._s[1249]! } + public var Permissions_ContactsText_v0: String { return self._s[1250]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[1251]! } + public var PrivacySettings_DataSettingsHelp: String { return self._s[1254]! } + public var Passport_FieldEmailHelp: String { return self._s[1255]! } public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1246]!, self._r[1246]!, [_0]) + return formatWithArgumentRanges(self._s[1256]!, self._r[1256]!, [_0]) } - public var Passport_Identity_GenderPlaceholder: String { return self._s[1247]! } - public var Weekday_ShortSaturday: String { return self._s[1248]! } - public var ContactInfo_PhoneLabelMain: String { return self._s[1249]! } - public var Watch_Conversation_UserInfo: String { return self._s[1250]! } - public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1251]! } - public var PrivacyLastSeenSettings_Title: String { return self._s[1252]! } - public var Conversation_ShareBotLocationConfirmation: String { return self._s[1253]! } - public var PhotoEditor_VignetteTool: String { return self._s[1254]! } - public var Passport_Address_Street1Placeholder: String { return self._s[1255]! } - public var Passport_Language_et: String { return self._s[1256]! } - public var AppUpgrade_Running: String { return self._s[1257]! } - public var Channel_DiscussionGroup_Info: String { return self._s[1259]! } - public var Passport_Language_bg: String { return self._s[1260]! } - public var Stickers_NoStickersFound: String { return self._s[1262]! } + public var Passport_Identity_GenderPlaceholder: String { return self._s[1257]! } + public var Weekday_ShortSaturday: String { return self._s[1258]! } + public var ContactInfo_PhoneLabelMain: String { return self._s[1259]! } + public var Watch_Conversation_UserInfo: String { return self._s[1260]! } + public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[1261]! } + public var PrivacyLastSeenSettings_Title: String { return self._s[1262]! } + public var Conversation_ShareBotLocationConfirmation: String { return self._s[1263]! } + public var PhotoEditor_VignetteTool: String { return self._s[1264]! } + public var Passport_Address_Street1Placeholder: String { return self._s[1265]! } + public var Passport_Language_et: String { return self._s[1266]! } + public var AppUpgrade_Running: String { return self._s[1267]! } + public var Channel_DiscussionGroup_Info: String { return self._s[1269]! } + public var Passport_Language_bg: String { return self._s[1270]! } + public var Stickers_NoStickersFound: String { return self._s[1272]! } public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1264]!, self._r[1264]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1274]!, self._r[1274]!, [_1, _2]) } - public var Settings_About: String { return self._s[1265]! } + public var Settings_About: String { return self._s[1275]! } public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1266]!, self._r[1266]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1276]!, self._r[1276]!, [_0, _1, _2]) } - public var KeyCommand_NewMessage: String { return self._s[1268]! } - public var Group_ErrorAddBlocked: String { return self._s[1269]! } + public var KeyCommand_NewMessage: String { return self._s[1278]! } + public var Group_ErrorAddBlocked: String { return self._s[1279]! } public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1270]!, self._r[1270]!, [_0]) + return formatWithArgumentRanges(self._s[1280]!, self._r[1280]!, [_0]) } - public var Map_LocationTitle: String { return self._s[1271]! } - public var ReportGroupLocation_Title: String { return self._s[1272]! } - public var CallSettings_UseLessDataLongDescription: String { return self._s[1273]! } - public var Cache_ClearProgress: String { return self._s[1274]! } + public var Map_LocationTitle: String { return self._s[1281]! } + public var ReportGroupLocation_Title: String { return self._s[1282]! } + public var CallSettings_UseLessDataLongDescription: String { return self._s[1283]! } + public var Cache_ClearProgress: String { return self._s[1284]! } public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1275]!, self._r[1275]!, [_0]) + return formatWithArgumentRanges(self._s[1285]!, self._r[1285]!, [_0]) } - public var GroupRemoved_AddToGroup: String { return self._s[1276]! } - public var Passport_UpdateRequiredError: String { return self._s[1277]! } + public var GroupRemoved_AddToGroup: String { return self._s[1286]! } + public var Passport_UpdateRequiredError: String { return self._s[1287]! } public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1278]!, self._r[1278]!, [_1]) + return formatWithArgumentRanges(self._s[1288]!, self._r[1288]!, [_1]) } - public var Notifications_PermissionsSuppressWarningText: String { return self._s[1280]! } - public var Passport_Identity_MainPageHelp: String { return self._s[1281]! } - public var Conversation_StatusKickedFromGroup: String { return self._s[1282]! } - public var Passport_Language_ka: String { return self._s[1283]! } - public var Call_Decline: String { return self._s[1284]! } - public var SocksProxySetup_ProxyEnabled: String { return self._s[1285]! } + public var Notifications_PermissionsSuppressWarningText: String { return self._s[1290]! } + public var Passport_Identity_MainPageHelp: String { return self._s[1291]! } + public var Conversation_StatusKickedFromGroup: String { return self._s[1292]! } + public var Passport_Language_ka: String { return self._s[1293]! } + public var Call_Decline: String { return self._s[1294]! } + public var SocksProxySetup_ProxyEnabled: String { return self._s[1295]! } public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1288]!, self._r[1288]!, [_0]) + return formatWithArgumentRanges(self._s[1298]!, self._r[1298]!, [_0]) } - public var CallFeedback_Send: String { return self._s[1289]! } + public var CallFeedback_Send: String { return self._s[1299]! } public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1290]!, self._r[1290]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1300]!, self._r[1300]!, [_1, _2]) } - public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1291]! } - public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1293]! } - public var Passport_DeletePassport: String { return self._s[1294]! } - public var Appearance_AppIconFilled: String { return self._s[1295]! } - public var Privacy_Calls_P2PAlways: String { return self._s[1296]! } - public var Month_ShortDecember: String { return self._s[1297]! } - public var Channel_AdminLog_CanEditMessages: String { return self._s[1299]! } + public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1301]! } + public var SettingsSearch_Synonyms_Data_Title: String { return self._s[1303]! } + public var Passport_DeletePassport: String { return self._s[1304]! } + public var Appearance_AppIconFilled: String { return self._s[1305]! } + public var Privacy_Calls_P2PAlways: String { return self._s[1306]! } + public var Month_ShortDecember: String { return self._s[1307]! } + public var Channel_AdminLog_CanEditMessages: String { return self._s[1309]! } public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1300]!, self._r[1300]!, [_0]) + return formatWithArgumentRanges(self._s[1310]!, self._r[1310]!, [_0]) } - public var Channel_Stickers_Searching: String { return self._s[1301]! } - public var Conversation_EncryptedDescription1: String { return self._s[1302]! } - public var Conversation_EncryptedDescription2: String { return self._s[1303]! } - public var PasscodeSettings_PasscodeOptions: String { return self._s[1304]! } - public var Conversation_EncryptedDescription3: String { return self._s[1305]! } - public var PhotoEditor_SharpenTool: String { return self._s[1306]! } + public var Channel_Stickers_Searching: String { return self._s[1311]! } + public var Conversation_EncryptedDescription1: String { return self._s[1312]! } + public var Conversation_EncryptedDescription2: String { return self._s[1313]! } + public var PasscodeSettings_PasscodeOptions: String { return self._s[1314]! } + public var Conversation_EncryptedDescription3: String { return self._s[1315]! } + public var PhotoEditor_SharpenTool: String { return self._s[1316]! } public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1307]!, self._r[1307]!, [_0]) + return formatWithArgumentRanges(self._s[1317]!, self._r[1317]!, [_0]) } - public var Conversation_EncryptedDescription4: String { return self._s[1309]! } - public var Channel_Members_AddMembers: String { return self._s[1310]! } - public var Wallpaper_Search: String { return self._s[1311]! } - public var Weekday_Friday: String { return self._s[1312]! } - public var Privacy_ContactsSync: String { return self._s[1313]! } - public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1314]! } - public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1315]! } + public var Conversation_EncryptedDescription4: String { return self._s[1319]! } + public var Channel_Members_AddMembers: String { return self._s[1320]! } + public var Wallpaper_Search: String { return self._s[1321]! } + public var Weekday_Friday: String { return self._s[1322]! } + public var Privacy_ContactsSync: String { return self._s[1323]! } + public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[1324]! } + public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1325]! } public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1316]!, self._r[1316]!, [_0]) + return formatWithArgumentRanges(self._s[1326]!, self._r[1326]!, [_0]) } - public var GroupInfo_Permissions_Removed: String { return self._s[1317]! } - public var Passport_Identity_GenderMale: String { return self._s[1318]! } + public var GroupInfo_Permissions_Removed: String { return self._s[1327]! } + public var Passport_Identity_GenderMale: String { return self._s[1328]! } public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1319]!, self._r[1319]!, [_0]) + return formatWithArgumentRanges(self._s[1329]!, self._r[1329]!, [_0]) } - public var Notifications_PermissionsKeepDisabled: String { return self._s[1320]! } - public var Conversation_JumpToDate: String { return self._s[1321]! } - public var Contacts_GlobalSearch: String { return self._s[1322]! } - public var AutoDownloadSettings_ResetHelp: String { return self._s[1323]! } - public var SettingsSearch_Synonyms_FAQ: String { return self._s[1324]! } - public var Profile_MessageLifetime1d: String { return self._s[1325]! } + public var Notifications_PermissionsKeepDisabled: String { return self._s[1330]! } + public var Conversation_JumpToDate: String { return self._s[1331]! } + public var Contacts_GlobalSearch: String { return self._s[1332]! } + public var AutoDownloadSettings_ResetHelp: String { return self._s[1333]! } + public var SettingsSearch_Synonyms_FAQ: String { return self._s[1334]! } + public var Profile_MessageLifetime1d: String { return self._s[1335]! } public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1326]!, self._r[1326]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1336]!, self._r[1336]!, [_1, _2]) } - public var StickerPack_BuiltinPackName: String { return self._s[1329]! } + public var StickerPack_BuiltinPackName: String { return self._s[1339]! } public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1330]!, self._r[1330]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1340]!, self._r[1340]!, [_1, _2]) } - public var Passport_InfoTitle: String { return self._s[1332]! } - public var Notifications_PermissionsUnreachableText: String { return self._s[1333]! } + public var Passport_InfoTitle: String { return self._s[1342]! } + public var Notifications_PermissionsUnreachableText: String { return self._s[1343]! } public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1337]!, self._r[1337]!, [_0]) + return formatWithArgumentRanges(self._s[1347]!, self._r[1347]!, [_0]) } public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1338]!, self._r[1338]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1348]!, self._r[1348]!, [_1, _2]) } - public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1339]! } - public var Profile_BotInfo: String { return self._s[1340]! } - public var Watch_Compose_CreateMessage: String { return self._s[1341]! } - public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1342]! } - public var Month_ShortNovember: String { return self._s[1343]! } - public var Conversation_ScamWarning: String { return self._s[1344]! } - public var Wallpaper_SetCustomBackground: String { return self._s[1345]! } - public var Passport_Identity_TranslationsHelp: String { return self._s[1346]! } - public var NotificationsSound_Chime: String { return self._s[1347]! } - public var Passport_Language_ko: String { return self._s[1349]! } - public var InviteText_URL: String { return self._s[1350]! } - public var TextFormat_Monospace: String { return self._s[1351]! } + public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[1349]! } + public var Profile_BotInfo: String { return self._s[1350]! } + public var Watch_Compose_CreateMessage: String { return self._s[1351]! } + public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[1352]! } + public var Month_ShortNovember: String { return self._s[1353]! } + public var Conversation_ScamWarning: String { return self._s[1354]! } + public var Wallpaper_SetCustomBackground: String { return self._s[1355]! } + public var Passport_Identity_TranslationsHelp: String { return self._s[1356]! } + public var NotificationsSound_Chime: String { return self._s[1357]! } + public var Passport_Language_ko: String { return self._s[1359]! } + public var InviteText_URL: String { return self._s[1360]! } + public var TextFormat_Monospace: String { return self._s[1361]! } public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1352]!, self._r[1352]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1362]!, self._r[1362]!, [_1, _2, _3]) } public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1353]!, self._r[1353]!, [_0]) + return formatWithArgumentRanges(self._s[1363]!, self._r[1363]!, [_0]) } public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1354]!, self._r[1354]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1364]!, self._r[1364]!, [_1, _2]) } - public var Passport_InfoLearnMore: String { return self._s[1356]! } - public var TwoStepAuth_EmailPlaceholder: String { return self._s[1357]! } - public var Passport_Identity_AddIdentityCard: String { return self._s[1358]! } - public var Your_card_has_expired: String { return self._s[1359]! } - public var StickerPacksSettings_StickerPacksSection: String { return self._s[1360]! } - public var GroupInfo_InviteLink_Help: String { return self._s[1361]! } - public var Conversation_Report: String { return self._s[1365]! } - public var Notifications_MessageNotificationsSound: String { return self._s[1366]! } - public var Notification_MessageLifetime1m: String { return self._s[1367]! } - public var Privacy_ContactsTitle: String { return self._s[1368]! } - public var Conversation_ShareMyContactInfo: String { return self._s[1369]! } - public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1370]! } - public var Channel_Members_Title: String { return self._s[1371]! } - public var Map_OpenInWaze: String { return self._s[1372]! } - public var Login_PhoneBannedError: String { return self._s[1373]! } + public var Passport_InfoLearnMore: String { return self._s[1366]! } + public var TwoStepAuth_EmailPlaceholder: String { return self._s[1367]! } + public var Passport_Identity_AddIdentityCard: String { return self._s[1368]! } + public var Your_card_has_expired: String { return self._s[1369]! } + public var StickerPacksSettings_StickerPacksSection: String { return self._s[1370]! } + public var GroupInfo_InviteLink_Help: String { return self._s[1371]! } + public var Conversation_Report: String { return self._s[1375]! } + public var Notifications_MessageNotificationsSound: String { return self._s[1376]! } + public var Notification_MessageLifetime1m: String { return self._s[1377]! } + public var Privacy_ContactsTitle: String { return self._s[1378]! } + public var Conversation_ShareMyContactInfo: String { return self._s[1379]! } + public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[1380]! } + public var Channel_Members_Title: String { return self._s[1381]! } + public var Map_OpenInWaze: String { return self._s[1382]! } + public var Login_PhoneBannedError: String { return self._s[1383]! } public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1374]!, self._r[1374]!, [_0]) - } - public var Group_Management_AddModeratorHelp: String { return self._s[1375]! } - public var AutoDownloadSettings_WifiTitle: String { return self._s[1376]! } - public var Common_OK: String { return self._s[1377]! } - public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1378]! } - public var Cache_Music: String { return self._s[1379]! } - public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1380]! } - public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1381]! } - public var TwoStepAuth_HintPlaceholder: String { return self._s[1382]! } - public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1383]!, self._r[1383]!, [_1]) - } - public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1384]!, self._r[1384]!, [_0]) } - public var Watch_MessageView_ViewOnPhone: String { return self._s[1386]! } - public var Privacy_Calls_CustomShareHelp: String { return self._s[1387]! } - public var ChangePhoneNumberNumber_Title: String { return self._s[1389]! } - public var State_ConnectingToProxyInfo: String { return self._s[1390]! } - public var Message_VideoMessage: String { return self._s[1392]! } - public var ChannelInfo_DeleteChannel: String { return self._s[1393]! } - public var ContactInfo_PhoneLabelOther: String { return self._s[1394]! } - public var Channel_EditAdmin_CannotEdit: String { return self._s[1395]! } - public var Passport_DeleteAddressConfirmation: String { return self._s[1396]! } - public var WallpaperPreview_SwipeBottomText: String { return self._s[1397]! } - public var Activity_RecordingAudio: String { return self._s[1398]! } - public var SettingsSearch_Synonyms_Watch: String { return self._s[1399]! } - public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1400]! } + public var Group_Management_AddModeratorHelp: String { return self._s[1385]! } + public var AutoDownloadSettings_WifiTitle: String { return self._s[1386]! } + public var Common_OK: String { return self._s[1387]! } + public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[1388]! } + public var Cache_Music: String { return self._s[1389]! } + public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[1390]! } + public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1391]! } + public var TwoStepAuth_HintPlaceholder: String { return self._s[1392]! } + public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1393]!, self._r[1393]!, [_1]) + } + public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1394]!, self._r[1394]!, [_0]) + } + public var Watch_MessageView_ViewOnPhone: String { return self._s[1396]! } + public var Privacy_Calls_CustomShareHelp: String { return self._s[1397]! } + public var ChangePhoneNumberNumber_Title: String { return self._s[1399]! } + public var State_ConnectingToProxyInfo: String { return self._s[1400]! } + public var Message_VideoMessage: String { return self._s[1402]! } + public var ChannelInfo_DeleteChannel: String { return self._s[1403]! } + public var ContactInfo_PhoneLabelOther: String { return self._s[1404]! } + public var Channel_EditAdmin_CannotEdit: String { return self._s[1405]! } + public var Passport_DeleteAddressConfirmation: String { return self._s[1406]! } + public var WallpaperPreview_SwipeBottomText: String { return self._s[1407]! } + public var Activity_RecordingAudio: String { return self._s[1408]! } + public var SettingsSearch_Synonyms_Watch: String { return self._s[1409]! } + public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[1410]! } public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1402]!, self._r[1402]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1412]!, self._r[1412]!, [_0, _1]) } public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1406]!, self._r[1406]!, [_0]) + return formatWithArgumentRanges(self._s[1416]!, self._r[1416]!, [_0]) } - public var Conversation_ApplyLocalization: String { return self._s[1407]! } - public var UserInfo_AddPhone: String { return self._s[1408]! } - public var Map_ShareLiveLocationHelp: String { return self._s[1409]! } + public var Conversation_ApplyLocalization: String { return self._s[1417]! } + public var UserInfo_AddPhone: String { return self._s[1418]! } + public var Map_ShareLiveLocationHelp: String { return self._s[1419]! } public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1410]!, self._r[1410]!, [_0]) + return formatWithArgumentRanges(self._s[1420]!, self._r[1420]!, [_0]) } - public var Passport_Scans: String { return self._s[1412]! } - public var BlockedUsers_Unblock: String { return self._s[1413]! } + public var Passport_Scans: String { return self._s[1422]! } + public var BlockedUsers_Unblock: String { return self._s[1423]! } public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1414]!, self._r[1414]!, [_1]) + return formatWithArgumentRanges(self._s[1424]!, self._r[1424]!, [_1]) } - public var Channel_Management_LabelCreator: String { return self._s[1415]! } - public var Conversation_ReportSpamAndLeave: String { return self._s[1416]! } - public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1417]! } - public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1418]! } - public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1419]! } + public var Channel_Management_LabelCreator: String { return self._s[1425]! } + public var Conversation_ReportSpamAndLeave: String { return self._s[1426]! } + public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[1427]! } + public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1428]! } + public var Passport_Identity_NativeNameGenericTitle: String { return self._s[1429]! } public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1420]!, self._r[1420]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1430]!, self._r[1430]!, [_0, _1, _2]) } - public var Login_PhoneNumberHelp: String { return self._s[1421]! } - public var LastSeen_ALongTimeAgo: String { return self._s[1422]! } - public var Channel_AdminLog_CanPinMessages: String { return self._s[1423]! } - public var ChannelIntro_CreateChannel: String { return self._s[1424]! } - public var Conversation_UnreadMessages: String { return self._s[1425]! } - public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1426]! } - public var Channel_AdminLog_EmptyText: String { return self._s[1427]! } - public var Notification_GroupActivated: String { return self._s[1428]! } - public var NotificationSettings_ContactJoinedInfo: String { return self._s[1429]! } + public var Login_PhoneNumberHelp: String { return self._s[1431]! } + public var LastSeen_ALongTimeAgo: String { return self._s[1432]! } + public var Channel_AdminLog_CanPinMessages: String { return self._s[1433]! } + public var ChannelIntro_CreateChannel: String { return self._s[1434]! } + public var Conversation_UnreadMessages: String { return self._s[1435]! } + public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1436]! } + public var Channel_AdminLog_EmptyText: String { return self._s[1437]! } + public var Notification_GroupActivated: String { return self._s[1438]! } + public var NotificationSettings_ContactJoinedInfo: String { return self._s[1439]! } public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1430]!, self._r[1430]!, [_0]) + return formatWithArgumentRanges(self._s[1440]!, self._r[1440]!, [_0]) } public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1431]!, self._r[1431]!, [_0, _1]) + return formatWithArgumentRanges(self._s[1441]!, self._r[1441]!, [_0, _1]) } - public var GroupInfo_ConvertToSupergroup: String { return self._s[1433]! } + public var GroupInfo_ConvertToSupergroup: String { return self._s[1443]! } public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1434]!, self._r[1434]!, [_0]) + return formatWithArgumentRanges(self._s[1444]!, self._r[1444]!, [_0]) } - public var Undo_DeletedChannel: String { return self._s[1435]! } - public var CallFeedback_AddComment: String { return self._s[1436]! } + public var Undo_DeletedChannel: String { return self._s[1445]! } + public var CallFeedback_AddComment: String { return self._s[1446]! } public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1437]!, self._r[1437]!, [_0]) + return formatWithArgumentRanges(self._s[1447]!, self._r[1447]!, [_0]) } - public var Document_TargetConfirmationFormat: String { return self._s[1438]! } + public var Document_TargetConfirmationFormat: String { return self._s[1448]! } public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1439]!, self._r[1439]!, [_0]) + return formatWithArgumentRanges(self._s[1449]!, self._r[1449]!, [_0]) } - public var LogoutOptions_SetPasscodeTitle: String { return self._s[1440]! } + public var LogoutOptions_SetPasscodeTitle: String { return self._s[1450]! } public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1441]!, self._r[1441]!, [_1, _2, _3, _4]) + return formatWithArgumentRanges(self._s[1451]!, self._r[1451]!, [_1, _2, _3, _4]) } - public var Contacts_SortByName: String { return self._s[1442]! } - public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1443]! } + public var Contacts_SortByName: String { return self._s[1452]! } + public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[1453]! } public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1445]!, self._r[1445]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1455]!, self._r[1455]!, [_1, _2, _3]) } - public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1446]! } - public var Conversation_ClearSelfHistory: String { return self._s[1447]! } - public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1448]! } - public var PasscodeSettings_DoNotMatch: String { return self._s[1449]! } - public var Stickers_SuggestNone: String { return self._s[1450]! } - public var ChatSettings_Cache: String { return self._s[1451]! } - public var Settings_SaveIncomingPhotos: String { return self._s[1452]! } - public var Media_ShareThisPhoto: String { return self._s[1453]! } - public var Chat_SlowmodeTooltipPending: String { return self._s[1454]! } - public var InfoPlist_NSContactsUsageDescription: String { return self._s[1455]! } - public var Conversation_ContextMenuCopyLink: String { return self._s[1456]! } - public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1457]! } - public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1458]! } - public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1459]! } - public var Permissions_CellularDataTitle_v0: String { return self._s[1460]! } - public var WallpaperSearch_ColorWhite: String { return self._s[1462]! } - public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1463]! } - public var Conversation_ErrorInaccessibleMessage: String { return self._s[1464]! } - public var Map_OpenIn: String { return self._s[1465]! } + public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1456]! } + public var Conversation_ClearSelfHistory: String { return self._s[1457]! } + public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[1458]! } + public var PasscodeSettings_DoNotMatch: String { return self._s[1459]! } + public var Stickers_SuggestNone: String { return self._s[1460]! } + public var ChatSettings_Cache: String { return self._s[1461]! } + public var Settings_SaveIncomingPhotos: String { return self._s[1462]! } + public var Media_ShareThisPhoto: String { return self._s[1463]! } + public var Chat_SlowmodeTooltipPending: String { return self._s[1464]! } + public var InfoPlist_NSContactsUsageDescription: String { return self._s[1465]! } + public var Conversation_ContextMenuCopyLink: String { return self._s[1466]! } + public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[1467]! } + public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1468]! } + public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[1469]! } + public var Permissions_CellularDataTitle_v0: String { return self._s[1470]! } + public var WallpaperSearch_ColorWhite: String { return self._s[1472]! } + public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1473]! } + public var Conversation_ErrorInaccessibleMessage: String { return self._s[1474]! } + public var Map_OpenIn: String { return self._s[1475]! } public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1468]!, self._r[1468]!, [_1]) + return formatWithArgumentRanges(self._s[1478]!, self._r[1478]!, [_1]) } public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1469]!, self._r[1469]!, [_0]) + return formatWithArgumentRanges(self._s[1479]!, self._r[1479]!, [_0]) } - public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1470]! } - public var MessagePoll_LabelClosed: String { return self._s[1471]! } - public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1473]! } - public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1474]! } - public var UserInfo_FirstNamePlaceholder: String { return self._s[1475]! } - public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1476]! } - public var Login_SelectCountry_Title: String { return self._s[1477]! } - public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1478]! } + public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1480]! } + public var MessagePoll_LabelClosed: String { return self._s[1481]! } + public var GroupPermission_PermissionGloballyDisabled: String { return self._s[1483]! } + public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[1484]! } + public var UserInfo_FirstNamePlaceholder: String { return self._s[1485]! } + public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[1486]! } + public var Login_SelectCountry_Title: String { return self._s[1487]! } + public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[1488]! } public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1479]!, self._r[1479]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1489]!, self._r[1489]!, [_1, _2]) } - public var Channel_AdminLog_ChangeInfo: String { return self._s[1480]! } - public var Watch_Suggestion_BRB: String { return self._s[1481]! } - public var Passport_Identity_EditIdentityCard: String { return self._s[1482]! } - public var Contacts_PermissionsTitle: String { return self._s[1483]! } - public var Conversation_RestrictedInline: String { return self._s[1484]! } - public var StickerPack_ViewPack: String { return self._s[1486]! } + public var Channel_AdminLog_ChangeInfo: String { return self._s[1490]! } + public var Watch_Suggestion_BRB: String { return self._s[1491]! } + public var Passport_Identity_EditIdentityCard: String { return self._s[1492]! } + public var Contacts_PermissionsTitle: String { return self._s[1493]! } + public var Conversation_RestrictedInline: String { return self._s[1494]! } + public var StickerPack_ViewPack: String { return self._s[1496]! } public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1487]!, self._r[1487]!, [_0]) + return formatWithArgumentRanges(self._s[1497]!, self._r[1497]!, [_0]) } - public var Compose_NewChannel: String { return self._s[1489]! } - public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1492]! } - public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1494]! } - public var Channel_Info_Stickers: String { return self._s[1495]! } - public var AutoNightTheme_PreferredTheme: String { return self._s[1496]! } - public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1497]! } - public var Passport_DeletePersonalDetails: String { return self._s[1498]! } - public var LogoutOptions_AddAccountTitle: String { return self._s[1499]! } - public var Channel_DiscussionGroupInfo: String { return self._s[1500]! } - public var Conversation_SearchNoResults: String { return self._s[1502]! } - public var MessagePoll_LabelAnonymous: String { return self._s[1503]! } - public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1504]! } - public var Login_Code: String { return self._s[1505]! } - public var Watch_Suggestion_WhatsUp: String { return self._s[1506]! } - public var Weekday_ShortThursday: String { return self._s[1507]! } - public var Resolve_ErrorNotFound: String { return self._s[1509]! } - public var LastSeen_Offline: String { return self._s[1510]! } - public var PeopleNearby_NoMembers: String { return self._s[1511]! } - public var GroupPermission_AddMembersNotAvailable: String { return self._s[1512]! } - public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1513]! } - public var GroupInfo_Title: String { return self._s[1514]! } - public var NotificationsSound_Note: String { return self._s[1515]! } - public var Conversation_EditingMessagePanelTitle: String { return self._s[1516]! } - public var Watch_Message_Poll: String { return self._s[1517]! } - public var Privacy_Calls: String { return self._s[1518]! } - public var Month_ShortAugust: String { return self._s[1519]! } - public var TwoStepAuth_SetPasswordHelp: String { return self._s[1520]! } - public var Notifications_Reset: String { return self._s[1521]! } - public var Conversation_Pin: String { return self._s[1522]! } - public var Passport_Language_lv: String { return self._s[1523]! } - public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1524]! } - public var BlockedUsers_Info: String { return self._s[1525]! } - public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1527]! } - public var Watch_Conversation_Unblock: String { return self._s[1529]! } + public var Compose_NewChannel: String { return self._s[1499]! } + public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[1502]! } + public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1504]! } + public var Channel_Info_Stickers: String { return self._s[1505]! } + public var AutoNightTheme_PreferredTheme: String { return self._s[1506]! } + public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[1507]! } + public var Passport_DeletePersonalDetails: String { return self._s[1508]! } + public var LogoutOptions_AddAccountTitle: String { return self._s[1509]! } + public var Channel_DiscussionGroupInfo: String { return self._s[1510]! } + public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[1511]! } + public var Conversation_SearchNoResults: String { return self._s[1513]! } + public var MessagePoll_LabelAnonymous: String { return self._s[1514]! } + public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[1515]! } + public var Login_Code: String { return self._s[1516]! } + public var Watch_Suggestion_WhatsUp: String { return self._s[1517]! } + public var Weekday_ShortThursday: String { return self._s[1518]! } + public var Resolve_ErrorNotFound: String { return self._s[1520]! } + public var LastSeen_Offline: String { return self._s[1521]! } + public var PeopleNearby_NoMembers: String { return self._s[1522]! } + public var GroupPermission_AddMembersNotAvailable: String { return self._s[1523]! } + public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[1524]! } + public var GroupInfo_Title: String { return self._s[1525]! } + public var NotificationsSound_Note: String { return self._s[1526]! } + public var Conversation_EditingMessagePanelTitle: String { return self._s[1527]! } + public var Watch_Message_Poll: String { return self._s[1528]! } + public var Privacy_Calls: String { return self._s[1529]! } + public var Month_ShortAugust: String { return self._s[1530]! } + public var TwoStepAuth_SetPasswordHelp: String { return self._s[1531]! } + public var Notifications_Reset: String { return self._s[1532]! } + public var Conversation_Pin: String { return self._s[1533]! } + public var Passport_Language_lv: String { return self._s[1534]! } + public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1535]! } + public var BlockedUsers_Info: String { return self._s[1536]! } + public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[1538]! } + public var Watch_Conversation_Unblock: String { return self._s[1540]! } public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1530]!, self._r[1530]!, [_0]) + return formatWithArgumentRanges(self._s[1541]!, self._r[1541]!, [_0]) } - public var CloudStorage_Title: String { return self._s[1531]! } - public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1532]! } + public var CloudStorage_Title: String { return self._s[1542]! } + public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[1543]! } public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1533]!, self._r[1533]!, [_0]) + return formatWithArgumentRanges(self._s[1544]!, self._r[1544]!, [_0]) } - public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1534]! } - public var Watch_Suggestion_OnMyWay: String { return self._s[1535]! } - public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1536]! } - public var Passport_Address_EditBankStatement: String { return self._s[1537]! } + public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[1545]! } + public var Watch_Suggestion_OnMyWay: String { return self._s[1546]! } + public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[1547]! } + public var Passport_Address_EditBankStatement: String { return self._s[1548]! } public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1538]!, self._r[1538]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1549]!, self._r[1549]!, [_1, _2]) } - public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1539]! } - public var ShareMenu_Comment: String { return self._s[1540]! } - public var Permissions_ContactsTitle_v0: String { return self._s[1541]! } - public var Notifications_PermissionsTitle: String { return self._s[1542]! } - public var GroupPermission_NoSendLinks: String { return self._s[1543]! } - public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1544]! } - public var Settings_Support: String { return self._s[1545]! } - public var Notifications_ChannelNotificationsSound: String { return self._s[1546]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1547]! } - public var Privacy_Forwards_Preview: String { return self._s[1548]! } - public var GroupPermission_ApplyAlertAction: String { return self._s[1549]! } - public var Watch_Stickers_StickerPacks: String { return self._s[1550]! } - public var Common_Select: String { return self._s[1552]! } - public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1553]! } - public var WallpaperSearch_ColorGray: String { return self._s[1555]! } - public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1556]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1557]! } - public var Appearance_PreviewReplyAuthor: String { return self._s[1558]! } - public var TwoStepAuth_RecoveryTitle: String { return self._s[1559]! } - public var Widget_AuthRequired: String { return self._s[1560]! } - public var Camera_FlashOn: String { return self._s[1561]! } - public var Channel_Stickers_NotFoundHelp: String { return self._s[1562]! } - public var Watch_Suggestion_OK: String { return self._s[1563]! } + public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[1550]! } + public var ShareMenu_Comment: String { return self._s[1551]! } + public var Permissions_ContactsTitle_v0: String { return self._s[1552]! } + public var Notifications_PermissionsTitle: String { return self._s[1553]! } + public var GroupPermission_NoSendLinks: String { return self._s[1554]! } + public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1555]! } + public var Settings_Support: String { return self._s[1556]! } + public var Notifications_ChannelNotificationsSound: String { return self._s[1557]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[1558]! } + public var Privacy_Forwards_Preview: String { return self._s[1559]! } + public var GroupPermission_ApplyAlertAction: String { return self._s[1560]! } + public var Watch_Stickers_StickerPacks: String { return self._s[1561]! } + public var Common_Select: String { return self._s[1563]! } + public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[1564]! } + public var WallpaperSearch_ColorGray: String { return self._s[1566]! } + public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[1567]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[1568]! } + public var Appearance_PreviewReplyAuthor: String { return self._s[1569]! } + public var TwoStepAuth_RecoveryTitle: String { return self._s[1570]! } + public var Widget_AuthRequired: String { return self._s[1571]! } + public var Camera_FlashOn: String { return self._s[1572]! } + public var Channel_Stickers_NotFoundHelp: String { return self._s[1573]! } + public var Watch_Suggestion_OK: String { return self._s[1574]! } public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1565]!, self._r[1565]!, [_0]) + return formatWithArgumentRanges(self._s[1576]!, self._r[1576]!, [_0]) } public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1567]!, self._r[1567]!, [_0]) + return formatWithArgumentRanges(self._s[1578]!, self._r[1578]!, [_0]) } - public var TextFormat_Strikethrough: String { return self._s[1568]! } - public var DialogList_AdLabel: String { return self._s[1569]! } - public var WatchRemote_NotificationText: String { return self._s[1570]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1571]! } - public var Conversation_ReportSpam: String { return self._s[1572]! } - public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1573]! } - public var Settings_LogoutConfirmationTitle: String { return self._s[1575]! } - public var PhoneLabel_Title: String { return self._s[1576]! } - public var Passport_Address_EditRentalAgreement: String { return self._s[1577]! } - public var Settings_ChangePhoneNumber: String { return self._s[1578]! } - public var Notifications_ExceptionsTitle: String { return self._s[1579]! } - public var Notifications_AlertTones: String { return self._s[1580]! } - public var Call_ReportIncludeLogDescription: String { return self._s[1581]! } - public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1582]! } - public var AutoDownloadSettings_PrivateChats: String { return self._s[1583]! } - public var TwoStepAuth_AddHintTitle: String { return self._s[1585]! } - public var ReportPeer_ReasonOther: String { return self._s[1586]! } - public var KeyCommand_ScrollDown: String { return self._s[1588]! } + public var TextFormat_Strikethrough: String { return self._s[1579]! } + public var DialogList_AdLabel: String { return self._s[1580]! } + public var WatchRemote_NotificationText: String { return self._s[1581]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[1582]! } + public var Conversation_ReportSpam: String { return self._s[1583]! } + public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[1584]! } + public var Settings_LogoutConfirmationTitle: String { return self._s[1586]! } + public var PhoneLabel_Title: String { return self._s[1587]! } + public var Passport_Address_EditRentalAgreement: String { return self._s[1588]! } + public var Settings_ChangePhoneNumber: String { return self._s[1589]! } + public var Notifications_ExceptionsTitle: String { return self._s[1590]! } + public var Notifications_AlertTones: String { return self._s[1591]! } + public var Call_ReportIncludeLogDescription: String { return self._s[1592]! } + public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[1593]! } + public var AutoDownloadSettings_PrivateChats: String { return self._s[1594]! } + public var TwoStepAuth_AddHintTitle: String { return self._s[1596]! } + public var ReportPeer_ReasonOther: String { return self._s[1597]! } + public var KeyCommand_ScrollDown: String { return self._s[1599]! } public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1589]!, self._r[1589]!, [_0]) + return formatWithArgumentRanges(self._s[1600]!, self._r[1600]!, [_0]) } - public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1590]! } - public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1591]! } - public var AuthSessions_LogOut: String { return self._s[1592]! } - public var Passport_Identity_TypeInternalPassport: String { return self._s[1593]! } - public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1594]! } - public var Passport_Phone_Title: String { return self._s[1595]! } - public var Settings_PhoneNumber: String { return self._s[1596]! } - public var NotificationsSound_Alert: String { return self._s[1597]! } - public var WebSearch_SearchNoResults: String { return self._s[1598]! } - public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1600]! } - public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1601]! } - public var SettingsSearch_Synonyms_Passport: String { return self._s[1602]! } - public var PhotoEditor_CurvesTool: String { return self._s[1603]! } - public var Checkout_PaymentMethod: String { return self._s[1605]! } + public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[1601]! } + public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[1602]! } + public var AuthSessions_LogOut: String { return self._s[1603]! } + public var Passport_Identity_TypeInternalPassport: String { return self._s[1604]! } + public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[1605]! } + public var Passport_Phone_Title: String { return self._s[1606]! } + public var Settings_PhoneNumber: String { return self._s[1607]! } + public var NotificationsSound_Alert: String { return self._s[1608]! } + public var WebSearch_SearchNoResults: String { return self._s[1609]! } + public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[1611]! } + public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1612]! } + public var SettingsSearch_Synonyms_Passport: String { return self._s[1613]! } + public var PhotoEditor_CurvesTool: String { return self._s[1614]! } + public var Checkout_PaymentMethod: String { return self._s[1616]! } public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1606]!, self._r[1606]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1617]!, self._r[1617]!, [_1, _2]) } - public var Contacts_AccessDeniedError: String { return self._s[1607]! } - public var Camera_PhotoMode: String { return self._s[1610]! } - public var Passport_Address_AddUtilityBill: String { return self._s[1611]! } - public var CallSettings_OnMobile: String { return self._s[1612]! } - public var Tour_Text2: String { return self._s[1613]! } + public var Contacts_AccessDeniedError: String { return self._s[1618]! } + public var Camera_PhotoMode: String { return self._s[1621]! } + public var Passport_Address_AddUtilityBill: String { return self._s[1622]! } + public var CallSettings_OnMobile: String { return self._s[1623]! } + public var Tour_Text2: String { return self._s[1624]! } public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1614]!, self._r[1614]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1625]!, self._r[1625]!, [_1, _2]) } - public var DialogList_EncryptionProcessing: String { return self._s[1616]! } - public var Permissions_Skip: String { return self._s[1617]! } - public var SecretImage_Title: String { return self._s[1618]! } - public var Watch_MessageView_Title: String { return self._s[1619]! } - public var Channel_DiscussionGroupAdd: String { return self._s[1620]! } - public var AttachmentMenu_Poll: String { return self._s[1621]! } + public var DialogList_EncryptionProcessing: String { return self._s[1627]! } + public var Permissions_Skip: String { return self._s[1628]! } + public var SecretImage_Title: String { return self._s[1629]! } + public var Watch_MessageView_Title: String { return self._s[1630]! } + public var Channel_DiscussionGroupAdd: String { return self._s[1631]! } + public var AttachmentMenu_Poll: String { return self._s[1632]! } public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1622]!, self._r[1622]!, [_0]) + return formatWithArgumentRanges(self._s[1633]!, self._r[1633]!, [_0]) } public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1623]!, self._r[1623]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1634]!, self._r[1634]!, [_1, _2]) } - public var Notification_CallCanceled: String { return self._s[1624]! } - public var WallpaperPreview_Title: String { return self._s[1625]! } - public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1626]! } - public var Settings_ProxyConnecting: String { return self._s[1627]! } - public var Settings_CheckPhoneNumberText: String { return self._s[1629]! } - public var Profile_MessageLifetime5s: String { return self._s[1630]! } - public var Username_InvalidCharacters: String { return self._s[1631]! } - public var WallpaperPreview_CropBottomText: String { return self._s[1632]! } - public var AutoDownloadSettings_LimitBySize: String { return self._s[1633]! } - public var Settings_AddAccount: String { return self._s[1634]! } - public var Notification_CreatedChannel: String { return self._s[1637]! } + public var Notification_CallCanceled: String { return self._s[1635]! } + public var WallpaperPreview_Title: String { return self._s[1636]! } + public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[1637]! } + public var Settings_ProxyConnecting: String { return self._s[1638]! } + public var Settings_CheckPhoneNumberText: String { return self._s[1640]! } + public var Profile_MessageLifetime5s: String { return self._s[1641]! } + public var Username_InvalidCharacters: String { return self._s[1642]! } + public var WallpaperPreview_CropBottomText: String { return self._s[1643]! } + public var AutoDownloadSettings_LimitBySize: String { return self._s[1644]! } + public var Settings_AddAccount: String { return self._s[1645]! } + public var Notification_CreatedChannel: String { return self._s[1648]! } public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1638]!, self._r[1638]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[1649]!, self._r[1649]!, [_1, _2, _3]) } - public var Passcode_AppLockedAlert: String { return self._s[1640]! } - public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1641]! } - public var Contacts_TopSection: String { return self._s[1642]! } + public var Passcode_AppLockedAlert: String { return self._s[1651]! } + public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1652]! } + public var Contacts_TopSection: String { return self._s[1653]! } public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1643]!, self._r[1643]!, [_0]) + return formatWithArgumentRanges(self._s[1654]!, self._r[1654]!, [_0]) } - public var ReportPeer_ReasonSpam: String { return self._s[1644]! } - public var UserInfo_TapToCall: String { return self._s[1645]! } - public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1647]! } - public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1648]! } - public var Common_Search: String { return self._s[1649]! } + public var ReportPeer_ReasonSpam: String { return self._s[1655]! } + public var UserInfo_TapToCall: String { return self._s[1656]! } + public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[1658]! } + public var AutoDownloadSettings_DataUsageCustom: String { return self._s[1659]! } + public var Common_Search: String { return self._s[1660]! } public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1650]!, self._r[1650]!, [_0]) + return formatWithArgumentRanges(self._s[1661]!, self._r[1661]!, [_0]) } - public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1651]! } - public var Message_InvoiceLabel: String { return self._s[1652]! } - public var Conversation_InputTextPlaceholder: String { return self._s[1653]! } - public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1654]! } + public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1662]! } + public var Message_InvoiceLabel: String { return self._s[1663]! } + public var Conversation_InputTextPlaceholder: String { return self._s[1664]! } + public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[1665]! } public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1655]!, self._r[1655]!, [_0]) + return formatWithArgumentRanges(self._s[1666]!, self._r[1666]!, [_0]) } - public var Conversation_Info: String { return self._s[1656]! } - public var Login_InfoDeletePhoto: String { return self._s[1657]! } - public var Passport_Language_vi: String { return self._s[1659]! } - public var UserInfo_ScamUserWarning: String { return self._s[1660]! } - public var Conversation_Search: String { return self._s[1661]! } - public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1662]! } - public var ReportPeer_ReasonPornography: String { return self._s[1663]! } - public var AutoDownloadSettings_PhotosTitle: String { return self._s[1664]! } - public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1665]! } - public var Map_LiveLocationGroupDescription: String { return self._s[1666]! } - public var Channel_Setup_TypeHeader: String { return self._s[1667]! } - public var AuthSessions_LoggedIn: String { return self._s[1668]! } - public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1669]! } - public var Login_SmsRequestState3: String { return self._s[1670]! } - public var Passport_Address_EditUtilityBill: String { return self._s[1671]! } - public var Appearance_ReduceMotionInfo: String { return self._s[1672]! } - public var Join_ChannelsTooMuch: String { return self._s[1673]! } - public var Channel_Edit_LinkItem: String { return self._s[1674]! } - public var Privacy_Calls_P2PNever: String { return self._s[1675]! } - public var Conversation_AddToReadingList: String { return self._s[1677]! } - public var Message_Animation: String { return self._s[1678]! } - public var Conversation_DefaultRestrictedMedia: String { return self._s[1679]! } - public var Map_Unknown: String { return self._s[1680]! } - public var AutoDownloadSettings_LastDelimeter: String { return self._s[1681]! } + public var Conversation_Info: String { return self._s[1667]! } + public var Login_InfoDeletePhoto: String { return self._s[1668]! } + public var Passport_Language_vi: String { return self._s[1670]! } + public var UserInfo_ScamUserWarning: String { return self._s[1671]! } + public var Conversation_Search: String { return self._s[1672]! } + public var DialogList_DeleteBotConversationConfirmation: String { return self._s[1673]! } + public var ReportPeer_ReasonPornography: String { return self._s[1674]! } + public var AutoDownloadSettings_PhotosTitle: String { return self._s[1675]! } + public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[1676]! } + public var Map_LiveLocationGroupDescription: String { return self._s[1677]! } + public var Channel_Setup_TypeHeader: String { return self._s[1678]! } + public var AuthSessions_LoggedIn: String { return self._s[1679]! } + public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1680]! } + public var Login_SmsRequestState3: String { return self._s[1681]! } + public var Passport_Address_EditUtilityBill: String { return self._s[1682]! } + public var Appearance_ReduceMotionInfo: String { return self._s[1683]! } + public var Join_ChannelsTooMuch: String { return self._s[1684]! } + public var Channel_Edit_LinkItem: String { return self._s[1685]! } + public var Privacy_Calls_P2PNever: String { return self._s[1686]! } + public var Conversation_AddToReadingList: String { return self._s[1688]! } + public var Message_Animation: String { return self._s[1689]! } + public var Conversation_DefaultRestrictedMedia: String { return self._s[1690]! } + public var Map_Unknown: String { return self._s[1691]! } + public var AutoDownloadSettings_LastDelimeter: String { return self._s[1692]! } public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1682]!, self._r[1682]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1693]!, self._r[1693]!, [_1, _2]) } public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1683]!, self._r[1683]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1694]!, self._r[1694]!, [_1, _2]) } - public var Call_StatusRequesting: String { return self._s[1684]! } - public var Conversation_SecretChatContextBotAlert: String { return self._s[1685]! } - public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1686]! } + public var Call_StatusRequesting: String { return self._s[1695]! } + public var Conversation_SecretChatContextBotAlert: String { return self._s[1696]! } + public var SocksProxySetup_ProxyStatusChecking: String { return self._s[1697]! } public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1687]!, self._r[1687]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1698]!, self._r[1698]!, [_1, _2]) } public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1688]!, self._r[1688]!, [_0]) + return formatWithArgumentRanges(self._s[1699]!, self._r[1699]!, [_0]) } - public var Update_Skip: String { return self._s[1689]! } - public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1690]! } - public var Message_PinnedPollMessage: String { return self._s[1691]! } - public var BlockedUsers_Title: String { return self._s[1692]! } + public var Update_Skip: String { return self._s[1700]! } + public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[1701]! } + public var Message_PinnedPollMessage: String { return self._s[1702]! } + public var BlockedUsers_Title: String { return self._s[1703]! } public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1693]!, self._r[1693]!, [_1]) + return formatWithArgumentRanges(self._s[1704]!, self._r[1704]!, [_1]) } - public var Username_CheckingUsername: String { return self._s[1694]! } - public var NotificationsSound_Bell: String { return self._s[1695]! } - public var Conversation_SendMessageErrorFlood: String { return self._s[1696]! } - public var Weekday_Monday: String { return self._s[1697]! } - public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1698]! } - public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1699]! } - public var ChatSettings_Groups: String { return self._s[1700]! } - public var Your_card_was_declined: String { return self._s[1701]! } - public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1703]! } - public var ChatList_Unmute: String { return self._s[1704]! } - public var PhotoEditor_CurvesAll: String { return self._s[1705]! } - public var Weekday_ShortTuesday: String { return self._s[1706]! } - public var DialogList_Read: String { return self._s[1707]! } - public var Appearance_AppIconClassic: String { return self._s[1708]! } - public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1709]! } - public var Passport_Identity_Gender: String { return self._s[1710]! } + public var Username_CheckingUsername: String { return self._s[1705]! } + public var NotificationsSound_Bell: String { return self._s[1706]! } + public var Conversation_SendMessageErrorFlood: String { return self._s[1707]! } + public var Weekday_Monday: String { return self._s[1708]! } + public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[1709]! } + public var ChannelMembers_ChannelAdminsTitle: String { return self._s[1710]! } + public var ChatSettings_Groups: String { return self._s[1711]! } + public var Your_card_was_declined: String { return self._s[1712]! } + public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1714]! } + public var ChatList_Unmute: String { return self._s[1715]! } + public var PhotoEditor_CurvesAll: String { return self._s[1716]! } + public var Weekday_ShortTuesday: String { return self._s[1717]! } + public var DialogList_Read: String { return self._s[1718]! } + public var Appearance_AppIconClassic: String { return self._s[1719]! } + public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[1720]! } + public var Passport_Identity_Gender: String { return self._s[1721]! } public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1711]!, self._r[1711]!, [_0]) + return formatWithArgumentRanges(self._s[1722]!, self._r[1722]!, [_0]) } - public var Target_SelectGroup: String { return self._s[1712]! } + public var Target_SelectGroup: String { return self._s[1723]! } public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1714]!, self._r[1714]!, [_0]) + return formatWithArgumentRanges(self._s[1725]!, self._r[1725]!, [_0]) } - public var Passport_Language_en: String { return self._s[1715]! } - public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1716]! } - public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1717]! } - public var Login_CancelPhoneVerificationContinue: String { return self._s[1718]! } - public var Checkout_NewCard_PaymentCard: String { return self._s[1720]! } - public var Login_InfoHelp: String { return self._s[1721]! } - public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1722]! } - public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1723]! } + public var Passport_Language_en: String { return self._s[1726]! } + public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[1727]! } + public var Channel_Username_CreatePublicLinkHelp: String { return self._s[1728]! } + public var Login_CancelPhoneVerificationContinue: String { return self._s[1729]! } + public var Checkout_NewCard_PaymentCard: String { return self._s[1731]! } + public var Login_InfoHelp: String { return self._s[1732]! } + public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1733]! } + public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[1734]! } public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1724]!, self._r[1724]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1735]!, self._r[1735]!, [_1, _2]) } - public var SocksProxySetup_AddProxy: String { return self._s[1727]! } - public var CreatePoll_Title: String { return self._s[1728]! } - public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1729]! } - public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1730]! } - public var UserInfo_GroupsInCommon: String { return self._s[1731]! } - public var Call_AudioRouteHide: String { return self._s[1732]! } - public var ContactInfo_PhoneLabelMobile: String { return self._s[1734]! } + public var SocksProxySetup_AddProxy: String { return self._s[1738]! } + public var CreatePoll_Title: String { return self._s[1739]! } + public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[1740]! } + public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[1741]! } + public var UserInfo_GroupsInCommon: String { return self._s[1742]! } + public var Call_AudioRouteHide: String { return self._s[1743]! } + public var ContactInfo_PhoneLabelMobile: String { return self._s[1745]! } public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1735]!, self._r[1735]!, [_0]) + return formatWithArgumentRanges(self._s[1746]!, self._r[1746]!, [_0]) } - public var TextFormat_Bold: String { return self._s[1736]! } - public var FastTwoStepSetup_EmailSection: String { return self._s[1737]! } - public var Notifications_Title: String { return self._s[1738]! } - public var Group_Username_InvalidTooShort: String { return self._s[1739]! } - public var Channel_ErrorAddTooMuch: String { return self._s[1740]! } + public var TextFormat_Bold: String { return self._s[1747]! } + public var FastTwoStepSetup_EmailSection: String { return self._s[1748]! } + public var Notifications_Title: String { return self._s[1749]! } + public var Group_Username_InvalidTooShort: String { return self._s[1750]! } + public var Channel_ErrorAddTooMuch: String { return self._s[1751]! } public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1741]!, self._r[1741]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[1752]!, self._r[1752]!, ["\(_0)"]) } - public var Stickers_SuggestAdded: String { return self._s[1743]! } - public var Login_CountryCode: String { return self._s[1744]! } - public var ChatSettings_AutoPlayVideos: String { return self._s[1745]! } - public var Map_GetDirections: String { return self._s[1746]! } - public var Login_PhoneFloodError: String { return self._s[1747]! } + public var Stickers_SuggestAdded: String { return self._s[1754]! } + public var Login_CountryCode: String { return self._s[1755]! } + public var ChatSettings_AutoPlayVideos: String { return self._s[1756]! } + public var Map_GetDirections: String { return self._s[1757]! } + public var Login_PhoneFloodError: String { return self._s[1758]! } public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1748]!, self._r[1748]!, [_0]) - } - public var Settings_SetUsername: String { return self._s[1750]! } - public var Group_Location_ChangeLocation: String { return self._s[1751]! } - public var Notification_GroupInviterSelf: String { return self._s[1752]! } - public var InstantPage_TapToOpenLink: String { return self._s[1753]! } - public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1754]!, self._r[1754]!, [_0]) - } - public var Watch_Suggestion_TalkLater: String { return self._s[1755]! } - public var SecretChat_Title: String { return self._s[1756]! } - public var Group_UpgradeNoticeText1: String { return self._s[1757]! } - public var AuthSessions_Title: String { return self._s[1758]! } - public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1759]!, self._r[1759]!, [_0]) } - public var PhotoEditor_CropAuto: String { return self._s[1760]! } - public var Channel_About_Title: String { return self._s[1761]! } - public var FastTwoStepSetup_EmailHelp: String { return self._s[1762]! } - public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1764]!, self._r[1764]!, ["\(_0)"]) + public var Settings_SetUsername: String { return self._s[1761]! } + public var Group_Location_ChangeLocation: String { return self._s[1762]! } + public var Notification_GroupInviterSelf: String { return self._s[1763]! } + public var InstantPage_TapToOpenLink: String { return self._s[1764]! } + public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1765]!, self._r[1765]!, [_0]) } - public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1766]! } - public var Group_Setup_HistoryVisibleHelp: String { return self._s[1767]! } - public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1768]!, self._r[1768]!, [_1]) - } - public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Watch_Suggestion_TalkLater: String { return self._s[1766]! } + public var SecretChat_Title: String { return self._s[1767]! } + public var Group_UpgradeNoticeText1: String { return self._s[1768]! } + public var AuthSessions_Title: String { return self._s[1769]! } + public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1770]!, self._r[1770]!, [_0]) } - public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1771]!, self._r[1771]!, [_0]) + public var PhotoEditor_CropAuto: String { return self._s[1771]! } + public var Channel_About_Title: String { return self._s[1772]! } + public var FastTwoStepSetup_EmailHelp: String { return self._s[1773]! } + public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1775]!, self._r[1775]!, ["\(_0)"]) } - public var Privacy_PaymentsClearInfoHelp: String { return self._s[1772]! } - public var Presence_online: String { return self._s[1774]! } - public var PasscodeSettings_Title: String { return self._s[1775]! } - public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1776]! } - public var Web_OpenExternal: String { return self._s[1777]! } - public var AutoDownloadSettings_AutoDownload: String { return self._s[1779]! } - public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[1780]! } - public var LocalGroup_Title: String { return self._s[1781]! } - public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1777]! } + public var Group_Setup_HistoryVisibleHelp: String { return self._s[1778]! } + public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1779]!, self._r[1779]!, [_1]) + } + public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1781]!, self._r[1781]!, [_0]) + } + public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1782]!, self._r[1782]!, [_0]) } - public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[1783]! } - public var Map_YouAreHere: String { return self._s[1784]! } - public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1785]!, self._r[1785]!, [_0]) - } - public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1786]!, self._r[1786]!, [_0]) - } - public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[1787]! } - public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[1788]! } - public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1789]!, self._r[1789]!, [_0]) - } - public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1790]!, self._r[1790]!, [_0]) - } - public var SocksProxySetup_Username: String { return self._s[1791]! } - public var Bot_Start: String { return self._s[1792]! } - public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + public var Privacy_PaymentsClearInfoHelp: String { return self._s[1783]! } + public var Presence_online: String { return self._s[1785]! } + public var PasscodeSettings_Title: String { return self._s[1786]! } + public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1787]! } + public var Web_OpenExternal: String { return self._s[1788]! } + public var AutoDownloadSettings_AutoDownload: String { return self._s[1790]! } + public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[1791]! } + public var LocalGroup_Title: String { return self._s[1792]! } + public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1793]!, self._r[1793]!, [_0]) } - public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1794]!, self._r[1794]!, [_0]) + public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[1794]! } + public var Map_YouAreHere: String { return self._s[1795]! } + public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1796]!, self._r[1796]!, [_0]) } - public var Contacts_SortByPresence: String { return self._s[1795]! } - public var Conversation_DiscardVoiceMessageTitle: String { return self._s[1797]! } + public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1797]!, self._r[1797]!, [_0]) + } + public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[1798]! } + public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[1799]! } + public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1800]!, self._r[1800]!, [_0]) + } + public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1801]!, self._r[1801]!, [_0]) + } + public var SocksProxySetup_Username: String { return self._s[1802]! } + public var Bot_Start: String { return self._s[1803]! } + public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1804]!, self._r[1804]!, [_0]) + } + public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1805]!, self._r[1805]!, [_0]) + } + public var Contacts_SortByPresence: String { return self._s[1806]! } + public var Conversation_DiscardVoiceMessageTitle: String { return self._s[1808]! } public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1798]!, self._r[1798]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1809]!, self._r[1809]!, [_1, _2]) } public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1799]!, self._r[1799]!, [_0]) + return formatWithArgumentRanges(self._s[1810]!, self._r[1810]!, [_0]) } public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1800]!, self._r[1800]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1811]!, self._r[1811]!, [_1, _2]) } - public var Passport_Email_EnterOtherEmail: String { return self._s[1801]! } - public var Login_InfoAvatarPhoto: String { return self._s[1802]! } - public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[1803]! } - public var Tour_Title4: String { return self._s[1804]! } - public var Passport_Identity_Translation: String { return self._s[1805]! } - public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1806]! } - public var Login_TermsOfServiceLabel: String { return self._s[1808]! } - public var Passport_Language_it: String { return self._s[1809]! } - public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1810]! } - public var Passport_Identity_SelfieHelp: String { return self._s[1811]! } - public var Conversation_ClearAll: String { return self._s[1813]! } - public var Channel_OwnershipTransfer_Title: String { return self._s[1815]! } - public var TwoStepAuth_FloodError: String { return self._s[1816]! } + public var Passport_Email_EnterOtherEmail: String { return self._s[1812]! } + public var Login_InfoAvatarPhoto: String { return self._s[1813]! } + public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[1814]! } + public var Tour_Title4: String { return self._s[1815]! } + public var Passport_Identity_Translation: String { return self._s[1816]! } + public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1817]! } + public var Login_TermsOfServiceLabel: String { return self._s[1819]! } + public var Passport_Language_it: String { return self._s[1820]! } + public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1821]! } + public var Passport_Identity_SelfieHelp: String { return self._s[1822]! } + public var Conversation_ClearAll: String { return self._s[1824]! } + public var Channel_OwnershipTransfer_Title: String { return self._s[1826]! } + public var TwoStepAuth_FloodError: String { return self._s[1827]! } public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1817]!, self._r[1817]!, [_1]) + return formatWithArgumentRanges(self._s[1828]!, self._r[1828]!, [_1]) } - public var Paint_Delete: String { return self._s[1818]! } - public var Privacy_AddNewPeer: String { return self._s[1819]! } - public var LogoutOptions_SetPasscodeText: String { return self._s[1820]! } + public var Paint_Delete: String { return self._s[1829]! } + public var Privacy_AddNewPeer: String { return self._s[1830]! } + public var LogoutOptions_SetPasscodeText: String { return self._s[1831]! } public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1821]!, self._r[1821]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1832]!, self._r[1832]!, [_1, _2]) } - public var Message_PinnedAudioMessage: String { return self._s[1822]! } + public var Message_PinnedAudioMessage: String { return self._s[1833]! } public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1823]!, self._r[1823]!, [_0]) + return formatWithArgumentRanges(self._s[1834]!, self._r[1834]!, [_0]) } - public var Notification_Mute1hMin: String { return self._s[1824]! } - public var Notifications_GroupNotificationsSound: String { return self._s[1825]! } - public var SocksProxySetup_ShareProxyList: String { return self._s[1826]! } - public var Conversation_MessageEditedLabel: String { return self._s[1827]! } - public var Notification_Exceptions_AlwaysOff: String { return self._s[1828]! } - public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[1829]! } + public var Notification_Mute1hMin: String { return self._s[1835]! } + public var Notifications_GroupNotificationsSound: String { return self._s[1836]! } + public var SocksProxySetup_ShareProxyList: String { return self._s[1837]! } + public var Conversation_MessageEditedLabel: String { return self._s[1838]! } + public var Notification_Exceptions_AlwaysOff: String { return self._s[1839]! } + public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[1840]! } public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1830]!, self._r[1830]!, [_0, _1, _2]) + return formatWithArgumentRanges(self._s[1841]!, self._r[1841]!, [_0, _1, _2]) } - public var NetworkUsageSettings_ResetStats: String { return self._s[1831]! } + public var NetworkUsageSettings_ResetStats: String { return self._s[1842]! } public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1832]!, self._r[1832]!, [_1]) + return formatWithArgumentRanges(self._s[1843]!, self._r[1843]!, [_1]) } - public var AccessDenied_LocationTracking: String { return self._s[1833]! } - public var Month_GenOctober: String { return self._s[1834]! } - public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[1835]! } - public var EnterPasscode_EnterPasscode: String { return self._s[1836]! } - public var MediaPicker_TimerTooltip: String { return self._s[1838]! } - public var SharedMedia_TitleAll: String { return self._s[1839]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[1842]! } - public var Conversation_RestrictedMedia: String { return self._s[1843]! } - public var AccessDenied_PhotosRestricted: String { return self._s[1844]! } - public var Privacy_Forwards_WhoCanForward: String { return self._s[1846]! } - public var ChangePhoneNumberCode_Called: String { return self._s[1847]! } + public var AccessDenied_LocationTracking: String { return self._s[1844]! } + public var Month_GenOctober: String { return self._s[1845]! } + public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[1846]! } + public var EnterPasscode_EnterPasscode: String { return self._s[1847]! } + public var MediaPicker_TimerTooltip: String { return self._s[1849]! } + public var SharedMedia_TitleAll: String { return self._s[1850]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[1853]! } + public var Conversation_RestrictedMedia: String { return self._s[1854]! } + public var AccessDenied_PhotosRestricted: String { return self._s[1855]! } + public var Privacy_Forwards_WhoCanForward: String { return self._s[1857]! } + public var ChangePhoneNumberCode_Called: String { return self._s[1858]! } public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1848]!, self._r[1848]!, [_0]) + return formatWithArgumentRanges(self._s[1859]!, self._r[1859]!, [_0]) } - public var Conversation_SavedMessages: String { return self._s[1851]! } - public var Your_cards_expiration_month_is_invalid: String { return self._s[1853]! } - public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[1854]! } + public var Conversation_SavedMessages: String { return self._s[1862]! } + public var Your_cards_expiration_month_is_invalid: String { return self._s[1864]! } + public var FastTwoStepSetup_PasswordPlaceholder: String { return self._s[1865]! } public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1856]!, self._r[1856]!, [_0]) + return formatWithArgumentRanges(self._s[1867]!, self._r[1867]!, [_0]) } - public var ReportPeer_AlertSuccess: String { return self._s[1857]! } - public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[1858]! } + public var ReportPeer_AlertSuccess: String { return self._s[1868]! } + public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[1869]! } public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1859]!, self._r[1859]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1870]!, self._r[1870]!, [_1, _2]) } - public var Checkout_PasswordEntry_Title: String { return self._s[1860]! } - public var PhotoEditor_FadeTool: String { return self._s[1861]! } - public var Privacy_ContactsReset: String { return self._s[1862]! } + public var Checkout_PasswordEntry_Title: String { return self._s[1871]! } + public var PhotoEditor_FadeTool: String { return self._s[1872]! } + public var Privacy_ContactsReset: String { return self._s[1873]! } public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1864]!, self._r[1864]!, [_0]) + return formatWithArgumentRanges(self._s[1875]!, self._r[1875]!, [_0]) } - public var Message_PinnedVideoMessage: String { return self._s[1865]! } - public var ChatList_Mute: String { return self._s[1866]! } - public var Permissions_CellularDataText_v0: String { return self._s[1867]! } - public var ShareMenu_SelectChats: String { return self._s[1869]! } - public var MusicPlayer_VoiceNote: String { return self._s[1870]! } - public var Conversation_RestrictedText: String { return self._s[1871]! } - public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[1872]! } - public var TwoStepAuth_DisableSuccess: String { return self._s[1873]! } - public var Cache_Videos: String { return self._s[1874]! } - public var PrivacySettings_PhoneNumber: String { return self._s[1875]! } - public var FeatureDisabled_Oops: String { return self._s[1877]! } - public var Passport_Address_PostcodePlaceholder: String { return self._s[1878]! } + public var Message_PinnedVideoMessage: String { return self._s[1876]! } + public var ChatList_Mute: String { return self._s[1877]! } + public var Permissions_CellularDataText_v0: String { return self._s[1878]! } + public var ShareMenu_SelectChats: String { return self._s[1880]! } + public var MusicPlayer_VoiceNote: String { return self._s[1881]! } + public var Conversation_RestrictedText: String { return self._s[1882]! } + public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[1883]! } + public var TwoStepAuth_DisableSuccess: String { return self._s[1884]! } + public var Cache_Videos: String { return self._s[1885]! } + public var PrivacySettings_PhoneNumber: String { return self._s[1886]! } + public var FeatureDisabled_Oops: String { return self._s[1888]! } + public var Passport_Address_PostcodePlaceholder: String { return self._s[1889]! } public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1879]!, self._r[1879]!, [_0]) + return formatWithArgumentRanges(self._s[1890]!, self._r[1890]!, [_0]) } - public var Stickers_GroupStickersHelp: String { return self._s[1880]! } - public var GroupPermission_NoSendPolls: String { return self._s[1881]! } - public var Message_VideoExpired: String { return self._s[1883]! } - public var Notifications_Badge: String { return self._s[1884]! } - public var GroupInfo_GroupHistoryVisible: String { return self._s[1885]! } - public var CreatePoll_OptionPlaceholder: String { return self._s[1886]! } - public var Username_InvalidTooShort: String { return self._s[1887]! } - public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[1888]! } - public var Channel_AdminLog_PinMessages: String { return self._s[1889]! } - public var ArchivedChats_IntroTitle3: String { return self._s[1890]! } + public var Stickers_GroupStickersHelp: String { return self._s[1891]! } + public var GroupPermission_NoSendPolls: String { return self._s[1892]! } + public var Message_VideoExpired: String { return self._s[1894]! } + public var Notifications_Badge: String { return self._s[1895]! } + public var GroupInfo_GroupHistoryVisible: String { return self._s[1896]! } + public var CreatePoll_OptionPlaceholder: String { return self._s[1897]! } + public var Username_InvalidTooShort: String { return self._s[1898]! } + public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[1899]! } + public var Channel_AdminLog_PinMessages: String { return self._s[1900]! } + public var ArchivedChats_IntroTitle3: String { return self._s[1901]! } public func Notification_MessageLifetimeRemoved(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1891]!, self._r[1891]!, [_1]) + return formatWithArgumentRanges(self._s[1902]!, self._r[1902]!, [_1]) } - public var Permissions_SiriAllowInSettings_v0: String { return self._s[1892]! } - public var Conversation_DefaultRestrictedText: String { return self._s[1893]! } - public var SharedMedia_CategoryDocs: String { return self._s[1896]! } + public var Permissions_SiriAllowInSettings_v0: String { return self._s[1903]! } + public var Conversation_DefaultRestrictedText: String { return self._s[1904]! } + public var SharedMedia_CategoryDocs: String { return self._s[1907]! } public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1897]!, self._r[1897]!, [_1]) + return formatWithArgumentRanges(self._s[1908]!, self._r[1908]!, [_1]) } - public var Privacy_Forwards_NeverLink: String { return self._s[1899]! } + public var Privacy_Forwards_NeverLink: String { return self._s[1910]! } public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1900]!, self._r[1900]!, [_1]) + return formatWithArgumentRanges(self._s[1911]!, self._r[1911]!, [_1]) } - public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[1901]! } + public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[1912]! } public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1902]!, self._r[1902]!, [_0]) + return formatWithArgumentRanges(self._s[1913]!, self._r[1913]!, [_0]) } - public var ChatSettings_PrivateChats: String { return self._s[1903]! } - public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[1904]! } - public var Conversation_PrivateMessageLinkCopied: String { return self._s[1905]! } - public var Channel_UpdatePhotoItem: String { return self._s[1906]! } - public var GroupInfo_LeftStatus: String { return self._s[1907]! } - public var Watch_MessageView_Forward: String { return self._s[1909]! } - public var ReportPeer_ReasonChildAbuse: String { return self._s[1910]! } - public var Cache_ClearEmpty: String { return self._s[1912]! } - public var Localization_LanguageName: String { return self._s[1913]! } - public var WebSearch_GIFs: String { return self._s[1914]! } - public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1915]! } - public var Username_InvalidStartsWithNumber: String { return self._s[1916]! } - public var Common_Back: String { return self._s[1917]! } - public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[1918]! } + public var ChatSettings_PrivateChats: String { return self._s[1914]! } + public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[1915]! } + public var Conversation_PrivateMessageLinkCopied: String { return self._s[1916]! } + public var Channel_UpdatePhotoItem: String { return self._s[1917]! } + public var GroupInfo_LeftStatus: String { return self._s[1918]! } + public var Watch_MessageView_Forward: String { return self._s[1920]! } + public var ReportPeer_ReasonChildAbuse: String { return self._s[1921]! } + public var Cache_ClearEmpty: String { return self._s[1923]! } + public var Localization_LanguageName: String { return self._s[1924]! } + public var WebSearch_GIFs: String { return self._s[1925]! } + public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1926]! } + public var Username_InvalidStartsWithNumber: String { return self._s[1927]! } + public var Common_Back: String { return self._s[1928]! } + public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[1929]! } public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1919]!, self._r[1919]!, [_1, _2]) + return formatWithArgumentRanges(self._s[1930]!, self._r[1930]!, [_1, _2]) } - public var Passport_Email_Help: String { return self._s[1920]! } - public var Watch_Conversation_Reply: String { return self._s[1922]! } - public var Conversation_EditingMessageMediaChange: String { return self._s[1924]! } - public var Passport_Identity_IssueDatePlaceholder: String { return self._s[1925]! } - public var Channel_BanUser_Unban: String { return self._s[1927]! } - public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[1928]! } - public var Group_Username_CreatePublicLinkHelp: String { return self._s[1929]! } - public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[1931]! } - public var Passport_Identity_Name: String { return self._s[1932]! } + public var Passport_Email_Help: String { return self._s[1931]! } + public var Watch_Conversation_Reply: String { return self._s[1933]! } + public var Conversation_EditingMessageMediaChange: String { return self._s[1935]! } + public var Passport_Identity_IssueDatePlaceholder: String { return self._s[1936]! } + public var Channel_BanUser_Unban: String { return self._s[1938]! } + public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[1939]! } + public var Group_Username_CreatePublicLinkHelp: String { return self._s[1940]! } + public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[1942]! } + public var Passport_Identity_Name: String { return self._s[1943]! } public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1933]!, self._r[1933]!, [_0]) + return formatWithArgumentRanges(self._s[1944]!, self._r[1944]!, [_0]) } - public var GroupRemoved_ViewUserInfo: String { return self._s[1934]! } - public var Conversation_BlockUser: String { return self._s[1935]! } - public var Month_GenJanuary: String { return self._s[1936]! } - public var ChatSettings_TextSize: String { return self._s[1937]! } - public var Notification_PassportValuePhone: String { return self._s[1938]! } - public var Passport_Language_ne: String { return self._s[1939]! } - public var Notification_CallBack: String { return self._s[1940]! } - public var TwoStepAuth_EmailHelp: String { return self._s[1941]! } + public var GroupRemoved_ViewUserInfo: String { return self._s[1945]! } + public var Conversation_BlockUser: String { return self._s[1946]! } + public var Month_GenJanuary: String { return self._s[1947]! } + public var ChatSettings_TextSize: String { return self._s[1948]! } + public var Notification_PassportValuePhone: String { return self._s[1949]! } + public var Passport_Language_ne: String { return self._s[1950]! } + public var Notification_CallBack: String { return self._s[1951]! } + public var TwoStepAuth_EmailHelp: String { return self._s[1952]! } public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1942]!, self._r[1942]!, [_0]) - } - public var Channel_Info_Management: String { return self._s[1943]! } - public var Passport_FieldIdentityUploadHelp: String { return self._s[1944]! } - public var Stickers_FrequentlyUsed: String { return self._s[1945]! } - public var Channel_BanUser_PermissionSendMessages: String { return self._s[1946]! } - public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1948]! } - public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1949]!, self._r[1949]!, [_1, "\(_2)"]) - } - public var Passport_Address_EditResidentialAddress: String { return self._s[1950]! } - public var PrivacyPolicy_DeclineTitle: String { return self._s[1951]! } - public var CreatePoll_TextHeader: String { return self._s[1952]! } - public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[1953]!, self._r[1953]!, [_0]) } - public var PhotoEditor_QualityMedium: String { return self._s[1954]! } - public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[1955]! } - public var Conversation_StatusKickedFromChannel: String { return self._s[1957]! } - public var CheckoutInfo_ReceiverInfoName: String { return self._s[1958]! } - public var Group_ErrorSendRestrictedStickers: String { return self._s[1959]! } + public var Channel_Info_Management: String { return self._s[1954]! } + public var Passport_FieldIdentityUploadHelp: String { return self._s[1955]! } + public var Stickers_FrequentlyUsed: String { return self._s[1956]! } + public var Channel_BanUser_PermissionSendMessages: String { return self._s[1957]! } + public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1959]! } + public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1960]!, self._r[1960]!, [_1, "\(_2)"]) + } + public var Passport_Address_EditResidentialAddress: String { return self._s[1961]! } + public var PrivacyPolicy_DeclineTitle: String { return self._s[1962]! } + public var CreatePoll_TextHeader: String { return self._s[1963]! } + public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[1964]!, self._r[1964]!, [_0]) + } + public var PhotoEditor_QualityMedium: String { return self._s[1965]! } + public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[1966]! } + public var Conversation_StatusKickedFromChannel: String { return self._s[1968]! } + public var CheckoutInfo_ReceiverInfoName: String { return self._s[1969]! } + public var Group_ErrorSendRestrictedStickers: String { return self._s[1970]! } public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1960]!, self._r[1960]!, [_0]) + return formatWithArgumentRanges(self._s[1971]!, self._r[1971]!, [_0]) } public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1961]!, self._r[1961]!, [_1]) + return formatWithArgumentRanges(self._s[1972]!, self._r[1972]!, [_1]) } - public var Conversation_LinkDialogOpen: String { return self._s[1963]! } - public var Settings_Username: String { return self._s[1964]! } - public var Conversation_Block: String { return self._s[1966]! } - public var Wallpaper_Wallpaper: String { return self._s[1967]! } - public var SocksProxySetup_UseProxy: String { return self._s[1969]! } - public var UserInfo_ShareMyContactInfo: String { return self._s[1970]! } - public var MessageTimer_Forever: String { return self._s[1971]! } - public var Privacy_Calls_WhoCanCallMe: String { return self._s[1972]! } - public var PhotoEditor_DiscardChanges: String { return self._s[1973]! } - public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1974]! } - public var Passport_Language_da: String { return self._s[1975]! } - public var SocksProxySetup_PortPlaceholder: String { return self._s[1976]! } + public var Conversation_LinkDialogOpen: String { return self._s[1974]! } + public var Settings_Username: String { return self._s[1975]! } + public var Conversation_Block: String { return self._s[1977]! } + public var Wallpaper_Wallpaper: String { return self._s[1978]! } + public var SocksProxySetup_UseProxy: String { return self._s[1980]! } + public var UserInfo_ShareMyContactInfo: String { return self._s[1981]! } + public var MessageTimer_Forever: String { return self._s[1982]! } + public var Privacy_Calls_WhoCanCallMe: String { return self._s[1983]! } + public var PhotoEditor_DiscardChanges: String { return self._s[1984]! } + public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1985]! } + public var Passport_Language_da: String { return self._s[1986]! } + public var SocksProxySetup_PortPlaceholder: String { return self._s[1987]! } public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1977]!, self._r[1977]!, [_0]) + return formatWithArgumentRanges(self._s[1988]!, self._r[1988]!, [_0]) } - public var Passport_Address_EditPassportRegistration: String { return self._s[1978]! } + public var Passport_Address_EditPassportRegistration: String { return self._s[1989]! } public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1980]!, self._r[1980]!, [_0]) + return formatWithArgumentRanges(self._s[1991]!, self._r[1991]!, [_0]) } - public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[1982]! } - public var Conversation_SearchByName_Prefix: String { return self._s[1983]! } - public var Conversation_PinnedPoll: String { return self._s[1984]! } - public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[1985]! } + public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[1993]! } + public var Conversation_SearchByName_Prefix: String { return self._s[1994]! } + public var Conversation_PinnedPoll: String { return self._s[1995]! } + public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[1996]! } public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1986]!, self._r[1986]!, [_1]) + return formatWithArgumentRanges(self._s[1997]!, self._r[1997]!, [_1]) } - public var WallpaperSearch_ColorPurple: String { return self._s[1987]! } - public var Cache_ByPeerHeader: String { return self._s[1988]! } + public var WallpaperSearch_ColorPurple: String { return self._s[1998]! } + public var Cache_ByPeerHeader: String { return self._s[1999]! } public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1989]!, self._r[1989]!, [_0]) + return formatWithArgumentRanges(self._s[2000]!, self._r[2000]!, [_0]) } - public var ChatSettings_AutoDownloadDocuments: String { return self._s[1990]! } - public var Notification_PinnedMessage: String { return self._s[1993]! } - public var Contacts_SortBy: String { return self._s[1995]! } + public var ChatSettings_AutoDownloadDocuments: String { return self._s[2001]! } + public var Notification_PinnedMessage: String { return self._s[2004]! } + public var Contacts_SortBy: String { return self._s[2006]! } public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1996]!, self._r[1996]!, [_1]) + return formatWithArgumentRanges(self._s[2007]!, self._r[2007]!, [_1]) } public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[1998]!, self._r[1998]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2009]!, self._r[2009]!, [_1, _2]) } - public var Call_EncryptionKey_Title: String { return self._s[1999]! } - public var Watch_UserInfo_Service: String { return self._s[2000]! } - public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2002]! } - public var Conversation_Unpin: String { return self._s[2004]! } - public var CancelResetAccount_Title: String { return self._s[2005]! } - public var Map_LiveLocationFor15Minutes: String { return self._s[2006]! } + public var Call_EncryptionKey_Title: String { return self._s[2010]! } + public var Watch_UserInfo_Service: String { return self._s[2011]! } + public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[2013]! } + public var Conversation_Unpin: String { return self._s[2015]! } + public var CancelResetAccount_Title: String { return self._s[2016]! } + public var Map_LiveLocationFor15Minutes: String { return self._s[2017]! } public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2008]!, self._r[2008]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2019]!, self._r[2019]!, [_1, _2, _3]) } - public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2009]! } - public var CallSettings_Title: String { return self._s[2010]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2011]! } - public var PasscodeSettings_EncryptDataHelp: String { return self._s[2013]! } - public var AutoDownloadSettings_Contacts: String { return self._s[2014]! } - public var Passport_Identity_DocumentDetails: String { return self._s[2015]! } - public var LoginPassword_PasswordHelp: String { return self._s[2016]! } - public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2017]! } - public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2018]! } - public var Checkout_TotalPaidAmount: String { return self._s[2019]! } + public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[2020]! } + public var CallSettings_Title: String { return self._s[2021]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[2022]! } + public var PasscodeSettings_EncryptDataHelp: String { return self._s[2024]! } + public var AutoDownloadSettings_Contacts: String { return self._s[2025]! } + public var Passport_Identity_DocumentDetails: String { return self._s[2026]! } + public var LoginPassword_PasswordHelp: String { return self._s[2027]! } + public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[2028]! } + public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2029]! } + public var Checkout_TotalPaidAmount: String { return self._s[2030]! } public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2020]!, self._r[2020]!, [_0]) - } - public var PasscodeSettings_ChangePasscode: String { return self._s[2021]! } - public var Conversation_SecretLinkPreviewAlert: String { return self._s[2023]! } - public var Privacy_SecretChatsLinkPreviews: String { return self._s[2024]! } - public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2025]!, self._r[2025]!, [_1]) - } - public var Contacts_InviteFriends: String { return self._s[2027]! } - public var Map_ChooseLocationTitle: String { return self._s[2028]! } - public var Conversation_StopPoll: String { return self._s[2030]! } - public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2031]!, self._r[2031]!, [_0]) } - public var Call_Camera: String { return self._s[2032]! } - public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2033]! } - public var Calls_RatingFeedback: String { return self._s[2034]! } - public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2035]! } - public var NotificationsSound_Pulse: String { return self._s[2036]! } - public var Watch_LastSeen_Lately: String { return self._s[2037]! } - public var ReportGroupLocation_Report: String { return self._s[2040]! } - public var Widget_NoUsers: String { return self._s[2041]! } - public var Conversation_UnvotePoll: String { return self._s[2042]! } - public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2044]! } - public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2045]! } - public var NotificationsSound_Circles: String { return self._s[2046]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2048]! } - public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2049]! } - public var Proxy_TooltipUnavailable: String { return self._s[2050]! } - public var Passport_Identity_CountryPlaceholder: String { return self._s[2052]! } - public var Conversation_FileDropbox: String { return self._s[2054]! } - public var Notifications_ExceptionsUnmuted: String { return self._s[2055]! } - public var Tour_Text3: String { return self._s[2057]! } - public var Login_ResetAccountProtected_Title: String { return self._s[2059]! } - public var GroupPermission_NoSendMessages: String { return self._s[2060]! } - public var WallpaperSearch_ColorTitle: String { return self._s[2061]! } - public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2062]! } - public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2064]!, self._r[2064]!, [_0]) + public var PasscodeSettings_ChangePasscode: String { return self._s[2032]! } + public var Conversation_SecretLinkPreviewAlert: String { return self._s[2034]! } + public var Privacy_SecretChatsLinkPreviews: String { return self._s[2035]! } + public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2036]!, self._r[2036]!, [_1]) } - public var GroupInfo_AddParticipantTitle: String { return self._s[2065]! } - public var Checkout_ShippingOption_Title: String { return self._s[2066]! } - public var ChatSettings_AutoDownloadTitle: String { return self._s[2067]! } + public var Contacts_InviteFriends: String { return self._s[2038]! } + public var Map_ChooseLocationTitle: String { return self._s[2039]! } + public var Conversation_StopPoll: String { return self._s[2041]! } + public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2042]!, self._r[2042]!, [_0]) + } + public var Call_Camera: String { return self._s[2043]! } + public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2044]! } + public var Calls_RatingFeedback: String { return self._s[2045]! } + public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[2046]! } + public var NotificationsSound_Pulse: String { return self._s[2047]! } + public var Watch_LastSeen_Lately: String { return self._s[2048]! } + public var ReportGroupLocation_Report: String { return self._s[2051]! } + public var Widget_NoUsers: String { return self._s[2052]! } + public var Conversation_UnvotePoll: String { return self._s[2053]! } + public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[2055]! } + public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[2056]! } + public var NotificationsSound_Circles: String { return self._s[2057]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[2059]! } + public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2060]! } + public var Proxy_TooltipUnavailable: String { return self._s[2061]! } + public var Passport_Identity_CountryPlaceholder: String { return self._s[2063]! } + public var Conversation_FileDropbox: String { return self._s[2065]! } + public var Notifications_ExceptionsUnmuted: String { return self._s[2066]! } + public var Tour_Text3: String { return self._s[2068]! } + public var Login_ResetAccountProtected_Title: String { return self._s[2070]! } + public var GroupPermission_NoSendMessages: String { return self._s[2071]! } + public var WallpaperSearch_ColorTitle: String { return self._s[2072]! } + public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2073]! } + public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2075]!, self._r[2075]!, [_0]) + } + public var GroupInfo_AddParticipantTitle: String { return self._s[2076]! } + public var Checkout_ShippingOption_Title: String { return self._s[2077]! } + public var ChatSettings_AutoDownloadTitle: String { return self._s[2078]! } public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2068]!, self._r[2068]!, [_0]) + return formatWithArgumentRanges(self._s[2079]!, self._r[2079]!, [_0]) } public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2069]!, self._r[2069]!, [_0]) + return formatWithArgumentRanges(self._s[2080]!, self._r[2080]!, [_0]) } - public var Channel_Management_LabelAdministrator: String { return self._s[2070]! } - public var OwnershipTransfer_ComeBackLater: String { return self._s[2071]! } - public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2072]! } - public var AutoDownloadSettings_Photos: String { return self._s[2074]! } - public var Appearance_PreviewIncomingText: String { return self._s[2075]! } - public var ChannelInfo_ConfirmLeave: String { return self._s[2076]! } - public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2077]! } - public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2078]! } - public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2079]! } - public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2080]! } - public var GroupInfo_SetGroupPhotoStop: String { return self._s[2081]! } - public var Notification_SecretChatScreenshot: String { return self._s[2082]! } - public var AccessDenied_Wallpapers: String { return self._s[2083]! } - public var Passport_Address_City: String { return self._s[2085]! } - public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2086]! } - public var Appearance_ThemeCarouselClassic: String { return self._s[2087]! } - public var SocksProxySetup_SecretPlaceholder: String { return self._s[2088]! } - public var AccessDenied_LocationDisabled: String { return self._s[2089]! } - public var Group_Location_Title: String { return self._s[2090]! } - public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2092]! } - public var GroupInfo_Sound: String { return self._s[2093]! } - public var ChannelInfo_ScamChannelWarning: String { return self._s[2094]! } - public var Stickers_RemoveFromFavorites: String { return self._s[2095]! } - public var Contacts_Title: String { return self._s[2096]! } - public var Passport_Language_fr: String { return self._s[2097]! } - public var Notifications_ResetAllNotifications: String { return self._s[2098]! } - public var PrivacySettings_SecurityTitle: String { return self._s[2101]! } - public var Checkout_NewCard_Title: String { return self._s[2102]! } - public var Login_HaveNotReceivedCodeInternal: String { return self._s[2103]! } - public var Conversation_ForwardChats: String { return self._s[2104]! } - public var PasscodeSettings_4DigitCode: String { return self._s[2106]! } - public var Settings_FAQ: String { return self._s[2108]! } - public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2109]! } - public var Conversation_ContextMenuForward: String { return self._s[2110]! } - public var PrivacyPolicy_Title: String { return self._s[2115]! } - public var Notifications_TextTone: String { return self._s[2116]! } - public var Profile_CreateNewContact: String { return self._s[2117]! } - public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2118]! } - public var Call_Speaker: String { return self._s[2120]! } - public var AutoNightTheme_AutomaticSection: String { return self._s[2121]! } - public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2123]! } - public var Channel_Username_InvalidCharacters: String { return self._s[2124]! } + public var Channel_Management_LabelAdministrator: String { return self._s[2081]! } + public var OwnershipTransfer_ComeBackLater: String { return self._s[2082]! } + public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[2083]! } + public var AutoDownloadSettings_Photos: String { return self._s[2085]! } + public var Appearance_PreviewIncomingText: String { return self._s[2086]! } + public var ChannelInfo_ConfirmLeave: String { return self._s[2087]! } + public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[2088]! } + public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2089]! } + public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[2090]! } + public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[2091]! } + public var GroupInfo_SetGroupPhotoStop: String { return self._s[2092]! } + public var Notification_SecretChatScreenshot: String { return self._s[2093]! } + public var AccessDenied_Wallpapers: String { return self._s[2094]! } + public var Passport_Address_City: String { return self._s[2096]! } + public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[2097]! } + public var Appearance_ThemeCarouselClassic: String { return self._s[2098]! } + public var SocksProxySetup_SecretPlaceholder: String { return self._s[2099]! } + public var AccessDenied_LocationDisabled: String { return self._s[2100]! } + public var Group_Location_Title: String { return self._s[2101]! } + public var SocksProxySetup_HostnamePlaceholder: String { return self._s[2103]! } + public var GroupInfo_Sound: String { return self._s[2104]! } + public var ChannelInfo_ScamChannelWarning: String { return self._s[2105]! } + public var Stickers_RemoveFromFavorites: String { return self._s[2106]! } + public var Contacts_Title: String { return self._s[2107]! } + public var Passport_Language_fr: String { return self._s[2108]! } + public var Notifications_ResetAllNotifications: String { return self._s[2109]! } + public var PrivacySettings_SecurityTitle: String { return self._s[2112]! } + public var Checkout_NewCard_Title: String { return self._s[2113]! } + public var Login_HaveNotReceivedCodeInternal: String { return self._s[2114]! } + public var Conversation_ForwardChats: String { return self._s[2115]! } + public var PasscodeSettings_4DigitCode: String { return self._s[2117]! } + public var Settings_FAQ: String { return self._s[2119]! } + public var AutoDownloadSettings_DocumentsTitle: String { return self._s[2120]! } + public var Conversation_ContextMenuForward: String { return self._s[2121]! } + public var PrivacyPolicy_Title: String { return self._s[2126]! } + public var Notifications_TextTone: String { return self._s[2127]! } + public var Profile_CreateNewContact: String { return self._s[2128]! } + public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[2129]! } + public var Call_Speaker: String { return self._s[2131]! } + public var AutoNightTheme_AutomaticSection: String { return self._s[2132]! } + public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2134]! } + public var Channel_Username_InvalidCharacters: String { return self._s[2135]! } public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2125]!, self._r[2125]!, [_0]) + return formatWithArgumentRanges(self._s[2136]!, self._r[2136]!, [_0]) } - public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2126]! } - public var PrivacySettings_LastSeenTitle: String { return self._s[2127]! } - public var Channel_AdminLog_CanInviteUsers: String { return self._s[2128]! } - public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2129]! } - public var OwnershipTransfer_SecurityCheck: String { return self._s[2130]! } - public var Conversation_MessageDeliveryFailed: String { return self._s[2131]! } - public var Watch_ChatList_NoConversationsText: String { return self._s[2132]! } - public var Bot_Unblock: String { return self._s[2133]! } - public var TextFormat_Italic: String { return self._s[2134]! } - public var WallpaperSearch_ColorPink: String { return self._s[2135]! } - public var Settings_About_Help: String { return self._s[2136]! } - public var SearchImages_Title: String { return self._s[2137]! } - public var Weekday_Wednesday: String { return self._s[2138]! } - public var Conversation_ClousStorageInfo_Description1: String { return self._s[2139]! } - public var ExplicitContent_AlertTitle: String { return self._s[2140]! } + public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[2137]! } + public var PrivacySettings_LastSeenTitle: String { return self._s[2138]! } + public var Channel_AdminLog_CanInviteUsers: String { return self._s[2139]! } + public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[2140]! } + public var OwnershipTransfer_SecurityCheck: String { return self._s[2141]! } + public var Conversation_MessageDeliveryFailed: String { return self._s[2142]! } + public var Watch_ChatList_NoConversationsText: String { return self._s[2143]! } + public var Bot_Unblock: String { return self._s[2144]! } + public var TextFormat_Italic: String { return self._s[2145]! } + public var WallpaperSearch_ColorPink: String { return self._s[2146]! } + public var Settings_About_Help: String { return self._s[2147]! } + public var SearchImages_Title: String { return self._s[2148]! } + public var Weekday_Wednesday: String { return self._s[2149]! } + public var Conversation_ClousStorageInfo_Description1: String { return self._s[2150]! } + public var ExplicitContent_AlertTitle: String { return self._s[2151]! } public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2141]!, self._r[2141]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2152]!, self._r[2152]!, [_1, _2, _3]) } - public var Channel_DiscussionGroup_Create: String { return self._s[2142]! } - public var Weekday_Thursday: String { return self._s[2143]! } - public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2144]! } - public var Channel_Members_AddMembersHelp: String { return self._s[2145]! } + public var Channel_DiscussionGroup_Create: String { return self._s[2153]! } + public var Weekday_Thursday: String { return self._s[2154]! } + public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[2155]! } + public var Channel_Members_AddMembersHelp: String { return self._s[2156]! } public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2146]!, self._r[2146]!, [_0]) + return formatWithArgumentRanges(self._s[2157]!, self._r[2157]!, [_0]) } - public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2147]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2148]! } - public var Passport_RequestedInformation: String { return self._s[2149]! } - public var Login_PhoneAndCountryHelp: String { return self._s[2150]! } - public var Conversation_EncryptionProcessing: String { return self._s[2152]! } - public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2153]! } - public var PhotoEditor_EnhanceTool: String { return self._s[2155]! } - public var Channel_Setup_Title: String { return self._s[2156]! } - public var Conversation_SearchPlaceholder: String { return self._s[2157]! } - public var AccessDenied_LocationAlwaysDenied: String { return self._s[2158]! } - public var Checkout_ErrorGeneric: String { return self._s[2159]! } - public var Passport_Language_hu: String { return self._s[2160]! } + public var Channel_DiscussionGroup_LinkGroup: String { return self._s[2158]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2159]! } + public var Passport_RequestedInformation: String { return self._s[2160]! } + public var Login_PhoneAndCountryHelp: String { return self._s[2161]! } + public var Conversation_EncryptionProcessing: String { return self._s[2163]! } + public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[2164]! } + public var PhotoEditor_EnhanceTool: String { return self._s[2166]! } + public var Channel_Setup_Title: String { return self._s[2167]! } + public var Conversation_SearchPlaceholder: String { return self._s[2168]! } + public var AccessDenied_LocationAlwaysDenied: String { return self._s[2169]! } + public var Checkout_ErrorGeneric: String { return self._s[2170]! } + public var Passport_Language_hu: String { return self._s[2171]! } public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2162]!, self._r[2162]!, [_0]) + return formatWithArgumentRanges(self._s[2173]!, self._r[2173]!, [_0]) } public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2165]!, self._r[2165]!, [_1]) + return formatWithArgumentRanges(self._s[2176]!, self._r[2176]!, [_1]) } public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2166]!, self._r[2166]!, [_0]) + return formatWithArgumentRanges(self._s[2177]!, self._r[2177]!, [_0]) } - public var Group_Location_Info: String { return self._s[2167]! } - public var Conversation_CloudStorageInfo_Title: String { return self._s[2168]! } - public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2169]! } - public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2170]! } + public var Group_Location_Info: String { return self._s[2178]! } + public var Conversation_CloudStorageInfo_Title: String { return self._s[2179]! } + public var Permissions_PeopleNearbyAllow_v0: String { return self._s[2180]! } + public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2181]! } public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2171]!, self._r[2171]!, [_0]) + return formatWithArgumentRanges(self._s[2182]!, self._r[2182]!, [_0]) } - public var Conversation_ClearPrivateHistory: String { return self._s[2172]! } - public var ContactInfo_PhoneLabelHome: String { return self._s[2173]! } - public var PrivacySettings_LastSeenContacts: String { return self._s[2174]! } + public var Conversation_ClearPrivateHistory: String { return self._s[2183]! } + public var ContactInfo_PhoneLabelHome: String { return self._s[2184]! } + public var PrivacySettings_LastSeenContacts: String { return self._s[2185]! } public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2175]!, self._r[2175]!, [_0]) - } - public var Passport_Language_cs: String { return self._s[2176]! } - public var Message_PinnedAnimationMessage: String { return self._s[2178]! } - public var Passport_Identity_ReverseSideHelp: String { return self._s[2180]! } - public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2181]! } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2183]! } - public var Embed_PlayingInPIP: String { return self._s[2184]! } - public var AutoNightTheme_ScheduleSection: String { return self._s[2185]! } - public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2186]!, self._r[2186]!, [_0]) } - public var MediaPicker_LivePhotoDescription: String { return self._s[2187]! } - public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2188]!, self._r[2188]!, [_1]) + public var Passport_Language_cs: String { return self._s[2187]! } + public var Message_PinnedAnimationMessage: String { return self._s[2189]! } + public var Passport_Identity_ReverseSideHelp: String { return self._s[2191]! } + public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[2192]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[2194]! } + public var Embed_PlayingInPIP: String { return self._s[2195]! } + public var AutoNightTheme_ScheduleSection: String { return self._s[2196]! } + public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_0]) } - public var Notification_PaymentSent: String { return self._s[2189]! } - public var PhotoEditor_CurvesGreen: String { return self._s[2190]! } - public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2191]! } - public var SaveIncomingPhotosSettings_Title: String { return self._s[2192]! } - public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2193]! } + public var MediaPicker_LivePhotoDescription: String { return self._s[2198]! } + public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2199]!, self._r[2199]!, [_1]) + } + public var Notification_PaymentSent: String { return self._s[2200]! } + public var PhotoEditor_CurvesGreen: String { return self._s[2201]! } + public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[2202]! } + public var SaveIncomingPhotosSettings_Title: String { return self._s[2203]! } + public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[2204]! } public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2196]!, self._r[2196]!, [_1]) + return formatWithArgumentRanges(self._s[2207]!, self._r[2207]!, [_1]) } public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_1]) + return formatWithArgumentRanges(self._s[2208]!, self._r[2208]!, [_1]) } public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2198]!, self._r[2198]!, [_1]) + return formatWithArgumentRanges(self._s[2209]!, self._r[2209]!, [_1]) } - public var NetworkUsageSettings_CallDataSection: String { return self._s[2200]! } - public var PasscodeSettings_HelpTop: String { return self._s[2201]! } - public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2202]! } - public var Passport_Address_TypeRentalAgreement: String { return self._s[2203]! } - public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2204]! } - public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2205]! } - public var Call_Accept: String { return self._s[2207]! } - public var GroupRemoved_RemoveInfo: String { return self._s[2208]! } - public var Month_GenMarch: String { return self._s[2210]! } - public var PhotoEditor_ShadowsTool: String { return self._s[2211]! } - public var LoginPassword_Title: String { return self._s[2212]! } - public var Call_End: String { return self._s[2213]! } - public var Watch_Conversation_GroupInfo: String { return self._s[2214]! } - public var CallSettings_Always: String { return self._s[2215]! } - public var CallFeedback_Success: String { return self._s[2216]! } - public var TwoStepAuth_SetupHint: String { return self._s[2217]! } + public var NetworkUsageSettings_CallDataSection: String { return self._s[2211]! } + public var PasscodeSettings_HelpTop: String { return self._s[2212]! } + public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2213]! } + public var Passport_Address_TypeRentalAgreement: String { return self._s[2214]! } + public var ReportPeer_ReasonOther_Placeholder: String { return self._s[2215]! } + public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[2216]! } + public var Call_Accept: String { return self._s[2218]! } + public var GroupRemoved_RemoveInfo: String { return self._s[2219]! } + public var Month_GenMarch: String { return self._s[2221]! } + public var PhotoEditor_ShadowsTool: String { return self._s[2222]! } + public var LoginPassword_Title: String { return self._s[2223]! } + public var Call_End: String { return self._s[2224]! } + public var Watch_Conversation_GroupInfo: String { return self._s[2225]! } + public var CallSettings_Always: String { return self._s[2226]! } + public var CallFeedback_Success: String { return self._s[2227]! } + public var TwoStepAuth_SetupHint: String { return self._s[2228]! } public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_1]) + return formatWithArgumentRanges(self._s[2229]!, self._r[2229]!, [_1]) } - public var ConversationProfile_UsersTooMuchError: String { return self._s[2219]! } - public var Login_PhoneTitle: String { return self._s[2220]! } - public var Passport_FieldPhoneHelp: String { return self._s[2221]! } - public var Weekday_ShortSunday: String { return self._s[2222]! } - public var Passport_InfoFAQ_URL: String { return self._s[2223]! } - public var ContactInfo_Job: String { return self._s[2225]! } - public var UserInfo_InviteBotToGroup: String { return self._s[2226]! } - public var Appearance_ThemeCarouselNightBlue: String { return self._s[2227]! } - public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2228]! } - public var Invite_ChannelsTooMuch: String { return self._s[2229]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2230]! } - public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2231]! } - public var CallFeedback_ReasonNoise: String { return self._s[2232]! } - public var Appearance_AppIconDefault: String { return self._s[2234]! } - public var Passport_Identity_AddInternalPassport: String { return self._s[2235]! } - public var MediaPicker_AddCaption: String { return self._s[2236]! } - public var CallSettings_TabIconDescription: String { return self._s[2237]! } - public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2238]! } - public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2239]! } - public var Passport_Identity_TypePersonalDetails: String { return self._s[2240]! } - public var DialogList_SearchSectionRecent: String { return self._s[2241]! } - public var PrivacyPolicy_DeclineMessage: String { return self._s[2242]! } - public var LogoutOptions_ClearCacheText: String { return self._s[2245]! } - public var LastSeen_WithinAWeek: String { return self._s[2246]! } - public var ChannelMembers_GroupAdminsTitle: String { return self._s[2247]! } - public var Conversation_CloudStorage_ChatStatus: String { return self._s[2249]! } + public var ConversationProfile_UsersTooMuchError: String { return self._s[2230]! } + public var Login_PhoneTitle: String { return self._s[2231]! } + public var Passport_FieldPhoneHelp: String { return self._s[2232]! } + public var Weekday_ShortSunday: String { return self._s[2233]! } + public var Passport_InfoFAQ_URL: String { return self._s[2234]! } + public var ContactInfo_Job: String { return self._s[2236]! } + public var UserInfo_InviteBotToGroup: String { return self._s[2237]! } + public var Appearance_ThemeCarouselNightBlue: String { return self._s[2238]! } + public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2239]! } + public var Invite_ChannelsTooMuch: String { return self._s[2240]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[2241]! } + public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2242]! } + public var CallFeedback_ReasonNoise: String { return self._s[2243]! } + public var Appearance_AppIconDefault: String { return self._s[2245]! } + public var Passport_Identity_AddInternalPassport: String { return self._s[2246]! } + public var MediaPicker_AddCaption: String { return self._s[2247]! } + public var CallSettings_TabIconDescription: String { return self._s[2248]! } + public var ChatList_UndoArchiveHiddenTitle: String { return self._s[2249]! } + public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[2250]! } + public var Passport_Identity_TypePersonalDetails: String { return self._s[2251]! } + public var DialogList_SearchSectionRecent: String { return self._s[2252]! } + public var PrivacyPolicy_DeclineMessage: String { return self._s[2253]! } + public var LogoutOptions_ClearCacheText: String { return self._s[2256]! } + public var LastSeen_WithinAWeek: String { return self._s[2257]! } + public var ChannelMembers_GroupAdminsTitle: String { return self._s[2258]! } + public var Conversation_CloudStorage_ChatStatus: String { return self._s[2260]! } public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2250]!, self._r[2250]!, [_0]) + return formatWithArgumentRanges(self._s[2261]!, self._r[2261]!, [_0]) } - public var Passport_Address_TypeResidentialAddress: String { return self._s[2251]! } - public var Conversation_StatusLeftGroup: String { return self._s[2252]! } - public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2253]! } - public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2255]! } - public var GroupPermission_AddSuccess: String { return self._s[2256]! } - public var PhotoEditor_BlurToolRadial: String { return self._s[2258]! } - public var Conversation_ContextMenuCopy: String { return self._s[2259]! } - public var AccessDenied_CallMicrophone: String { return self._s[2260]! } + public var Passport_Address_TypeResidentialAddress: String { return self._s[2262]! } + public var Conversation_StatusLeftGroup: String { return self._s[2263]! } + public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[2264]! } + public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[2266]! } + public var GroupPermission_AddSuccess: String { return self._s[2267]! } + public var PhotoEditor_BlurToolRadial: String { return self._s[2269]! } + public var Conversation_ContextMenuCopy: String { return self._s[2270]! } + public var AccessDenied_CallMicrophone: String { return self._s[2271]! } public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2261]!, self._r[2261]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2272]!, self._r[2272]!, [_1, _2, _3]) } - public var Login_InvalidFirstNameError: String { return self._s[2262]! } - public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2263]! } - public var Checkout_PaymentMethod_New: String { return self._s[2264]! } - public var ShareMenu_CopyShareLinkGame: String { return self._s[2265]! } - public var PhotoEditor_QualityTool: String { return self._s[2266]! } - public var Login_SendCodeViaSms: String { return self._s[2267]! } - public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2268]! } - public var Login_EmailNotConfiguredError: String { return self._s[2269]! } - public var SocksProxySetup_Status: String { return self._s[2270]! } - public var PrivacyPolicy_Accept: String { return self._s[2271]! } - public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2272]! } - public var Appearance_AppIconClassicX: String { return self._s[2273]! } + public var Login_InvalidFirstNameError: String { return self._s[2273]! } + public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2274]! } + public var Checkout_PaymentMethod_New: String { return self._s[2275]! } + public var ShareMenu_CopyShareLinkGame: String { return self._s[2276]! } + public var PhotoEditor_QualityTool: String { return self._s[2277]! } + public var Login_SendCodeViaSms: String { return self._s[2278]! } + public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2279]! } + public var Login_EmailNotConfiguredError: String { return self._s[2280]! } + public var SocksProxySetup_Status: String { return self._s[2281]! } + public var PrivacyPolicy_Accept: String { return self._s[2282]! } + public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[2283]! } + public var Appearance_AppIconClassicX: String { return self._s[2284]! } public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2274]!, self._r[2274]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2285]!, self._r[2285]!, [_1, _2, _3]) } - public var OwnershipTransfer_SecurityRequirements: String { return self._s[2275]! } - public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2276]! } - public var AutoNightTheme_Automatic: String { return self._s[2277]! } - public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2278]! } - public var Privacy_ContactsSyncHelp: String { return self._s[2279]! } - public var Cache_Help: String { return self._s[2280]! } - public var Group_ErrorAccessDenied: String { return self._s[2281]! } - public var Passport_Language_fa: String { return self._s[2282]! } - public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2283]! } - public var PrivacySettings_LastSeen: String { return self._s[2284]! } + public var OwnershipTransfer_SecurityRequirements: String { return self._s[2286]! } + public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[2287]! } + public var AutoNightTheme_Automatic: String { return self._s[2288]! } + public var Channel_Username_InvalidStartsWithNumber: String { return self._s[2289]! } + public var Privacy_ContactsSyncHelp: String { return self._s[2290]! } + public var Cache_Help: String { return self._s[2291]! } + public var Group_ErrorAccessDenied: String { return self._s[2292]! } + public var Passport_Language_fa: String { return self._s[2293]! } + public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2294]! } + public var PrivacySettings_LastSeen: String { return self._s[2295]! } public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2285]!, self._r[2285]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2296]!, self._r[2296]!, [_0, _1]) } - public var Preview_SaveGif: String { return self._s[2289]! } - public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2290]! } - public var Profile_About: String { return self._s[2291]! } - public var Channel_About_Placeholder: String { return self._s[2292]! } - public var Login_InfoTitle: String { return self._s[2293]! } + public var Preview_SaveGif: String { return self._s[2300]! } + public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[2301]! } + public var Profile_About: String { return self._s[2302]! } + public var Channel_About_Placeholder: String { return self._s[2303]! } + public var Login_InfoTitle: String { return self._s[2304]! } public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2294]!, self._r[2294]!, [_0]) + return formatWithArgumentRanges(self._s[2305]!, self._r[2305]!, [_0]) } - public var Watch_Suggestion_CantTalk: String { return self._s[2296]! } - public var ContactInfo_Title: String { return self._s[2297]! } - public var Media_ShareThisVideo: String { return self._s[2298]! } - public var Weekday_ShortFriday: String { return self._s[2299]! } - public var AccessDenied_Contacts: String { return self._s[2300]! } - public var Notification_CallIncomingShort: String { return self._s[2301]! } - public var Group_Setup_TypePublic: String { return self._s[2302]! } - public var Notifications_MessageNotificationsExceptions: String { return self._s[2303]! } - public var Notifications_Badge_IncludeChannels: String { return self._s[2304]! } - public var Notifications_MessageNotificationsPreview: String { return self._s[2307]! } - public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2308]! } - public var Group_ErrorAddTooMuchBots: String { return self._s[2309]! } - public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2310]! } - public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2311]! } - public var DialogList_Typing: String { return self._s[2312]! } - public var CallFeedback_IncludeLogs: String { return self._s[2314]! } - public var Checkout_Phone: String { return self._s[2316]! } - public var Login_InfoFirstNamePlaceholder: String { return self._s[2319]! } - public var Privacy_Calls_Integration: String { return self._s[2320]! } - public var Notifications_PermissionsAllow: String { return self._s[2321]! } - public var TwoStepAuth_AddHintDescription: String { return self._s[2325]! } - public var Settings_ChatSettings: String { return self._s[2326]! } + public var Watch_Suggestion_CantTalk: String { return self._s[2307]! } + public var ContactInfo_Title: String { return self._s[2308]! } + public var Media_ShareThisVideo: String { return self._s[2309]! } + public var Weekday_ShortFriday: String { return self._s[2310]! } + public var AccessDenied_Contacts: String { return self._s[2311]! } + public var Notification_CallIncomingShort: String { return self._s[2312]! } + public var Group_Setup_TypePublic: String { return self._s[2313]! } + public var Notifications_MessageNotificationsExceptions: String { return self._s[2314]! } + public var Notifications_Badge_IncludeChannels: String { return self._s[2315]! } + public var Notifications_MessageNotificationsPreview: String { return self._s[2318]! } + public var ConversationProfile_ErrorCreatingConversation: String { return self._s[2319]! } + public var Group_ErrorAddTooMuchBots: String { return self._s[2320]! } + public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[2321]! } + public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[2322]! } + public var DialogList_Typing: String { return self._s[2323]! } + public var CallFeedback_IncludeLogs: String { return self._s[2325]! } + public var Checkout_Phone: String { return self._s[2327]! } + public var Login_InfoFirstNamePlaceholder: String { return self._s[2330]! } + public var Privacy_Calls_Integration: String { return self._s[2331]! } + public var Notifications_PermissionsAllow: String { return self._s[2332]! } + public var TwoStepAuth_AddHintDescription: String { return self._s[2336]! } + public var Settings_ChatSettings: String { return self._s[2337]! } public func PUSH_MESSAGE_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2327]!, self._r[2327]!, [_1]) + return formatWithArgumentRanges(self._s[2338]!, self._r[2338]!, [_1]) } public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2328]!, self._r[2328]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2339]!, self._r[2339]!, [_1, _2]) } - public var GroupRemoved_DeleteUser: String { return self._s[2330]! } + public var GroupRemoved_DeleteUser: String { return self._s[2341]! } public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2331]!, self._r[2331]!, [_0]) + return formatWithArgumentRanges(self._s[2342]!, self._r[2342]!, [_0]) } public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2332]!, self._r[2332]!, [_1]) + return formatWithArgumentRanges(self._s[2343]!, self._r[2343]!, [_1]) } - public var Login_ContinueWithLocalization: String { return self._s[2333]! } - public var Watch_Message_ForwardedFrom: String { return self._s[2334]! } - public var TwoStepAuth_EnterEmailCode: String { return self._s[2336]! } - public var Conversation_Unblock: String { return self._s[2337]! } - public var PrivacySettings_DataSettings: String { return self._s[2338]! } - public var Group_PublicLink_Info: String { return self._s[2339]! } - public var Notifications_InAppNotificationsVibrate: String { return self._s[2340]! } + public var Login_ContinueWithLocalization: String { return self._s[2344]! } + public var Watch_Message_ForwardedFrom: String { return self._s[2345]! } + public var TwoStepAuth_EnterEmailCode: String { return self._s[2347]! } + public var Conversation_Unblock: String { return self._s[2348]! } + public var PrivacySettings_DataSettings: String { return self._s[2349]! } + public var Group_PublicLink_Info: String { return self._s[2350]! } + public var Notifications_InAppNotificationsVibrate: String { return self._s[2351]! } public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2341]!, self._r[2341]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2352]!, self._r[2352]!, [_0, _1]) } - public var PrivacySettings_Passcode: String { return self._s[2344]! } - public var Call_Mute: String { return self._s[2345]! } - public var Passport_Language_dz: String { return self._s[2346]! } - public var Passport_Language_tk: String { return self._s[2347]! } + public var PrivacySettings_Passcode: String { return self._s[2355]! } + public var Call_Mute: String { return self._s[2356]! } + public var Passport_Language_dz: String { return self._s[2357]! } + public var Passport_Language_tk: String { return self._s[2358]! } public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2348]!, self._r[2348]!, [_0]) + return formatWithArgumentRanges(self._s[2359]!, self._r[2359]!, [_0]) } - public var Settings_Search: String { return self._s[2349]! } - public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2350]! } - public var Conversation_ContextMenuReply: String { return self._s[2351]! } - public var WallpaperSearch_ColorBrown: String { return self._s[2352]! } - public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2353]! } - public var Tour_Title1: String { return self._s[2354]! } - public var Conversation_ClearGroupHistory: String { return self._s[2356]! } - public var WallpaperPreview_Motion: String { return self._s[2357]! } + public var Settings_Search: String { return self._s[2360]! } + public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[2361]! } + public var Conversation_ContextMenuReply: String { return self._s[2362]! } + public var WallpaperSearch_ColorBrown: String { return self._s[2363]! } + public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2364]! } + public var Tour_Title1: String { return self._s[2365]! } + public var Conversation_ClearGroupHistory: String { return self._s[2367]! } + public var WallpaperPreview_Motion: String { return self._s[2368]! } public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2358]!, self._r[2358]!, [_0]) + return formatWithArgumentRanges(self._s[2369]!, self._r[2369]!, [_0]) } - public var Call_RateCall: String { return self._s[2359]! } - public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2360]! } - public var Passport_PasswordCompleteSetup: String { return self._s[2361]! } - public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2362]! } - public var UserInfo_LastNamePlaceholder: String { return self._s[2364]! } + public var Call_RateCall: String { return self._s[2370]! } + public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[2371]! } + public var Passport_PasswordCompleteSetup: String { return self._s[2372]! } + public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[2373]! } + public var UserInfo_LastNamePlaceholder: String { return self._s[2375]! } public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2366]!, self._r[2366]!, [_0]) + return formatWithArgumentRanges(self._s[2377]!, self._r[2377]!, [_0]) } - public var Compose_Create: String { return self._s[2367]! } - public var Contacts_InviteToTelegram: String { return self._s[2368]! } - public var GroupInfo_Notifications: String { return self._s[2369]! } - public var Message_PinnedLiveLocationMessage: String { return self._s[2371]! } - public var Month_GenApril: String { return self._s[2372]! } - public var Appearance_AutoNightTheme: String { return self._s[2373]! } - public var ChatSettings_AutomaticAudioDownload: String { return self._s[2375]! } - public var Login_CodeSentSms: String { return self._s[2377]! } + public var Compose_Create: String { return self._s[2378]! } + public var Contacts_InviteToTelegram: String { return self._s[2379]! } + public var GroupInfo_Notifications: String { return self._s[2380]! } + public var Message_PinnedLiveLocationMessage: String { return self._s[2382]! } + public var Month_GenApril: String { return self._s[2383]! } + public var Appearance_AutoNightTheme: String { return self._s[2384]! } + public var ChatSettings_AutomaticAudioDownload: String { return self._s[2386]! } + public var Login_CodeSentSms: String { return self._s[2388]! } public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2378]!, self._r[2378]!, [_0]) + return formatWithArgumentRanges(self._s[2389]!, self._r[2389]!, [_0]) } - public var EmptyGroupInfo_Line3: String { return self._s[2379]! } - public var LogoutOptions_ContactSupportText: String { return self._s[2380]! } - public var Passport_Language_hr: String { return self._s[2381]! } - public var Common_ActionNotAllowedError: String { return self._s[2382]! } + public var EmptyGroupInfo_Line3: String { return self._s[2390]! } + public var LogoutOptions_ContactSupportText: String { return self._s[2391]! } + public var Passport_Language_hr: String { return self._s[2392]! } + public var Common_ActionNotAllowedError: String { return self._s[2393]! } public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2383]!, self._r[2383]!, [_0]) + return formatWithArgumentRanges(self._s[2394]!, self._r[2394]!, [_0]) } - public var GroupInfo_InviteLink_CopyLink: String { return self._s[2384]! } - public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2385]! } - public var Privacy_SecretChatsTitle: String { return self._s[2386]! } - public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2388]! } - public var GroupInfo_AddUserLeftError: String { return self._s[2389]! } - public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2390]! } - public var LogoutOptions_ContactSupportTitle: String { return self._s[2391]! } - public var Channel_AddBotErrorHaveRights: String { return self._s[2392]! } - public var Preview_DeleteGif: String { return self._s[2393]! } - public var GroupInfo_Permissions_Exceptions: String { return self._s[2394]! } - public var Group_ErrorNotMutualContact: String { return self._s[2395]! } - public var Notification_MessageLifetime5s: String { return self._s[2396]! } + public var GroupInfo_InviteLink_CopyLink: String { return self._s[2395]! } + public var Appearance_ThemePreview_ChatList_8_Text: String { return self._s[2396]! } + public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[2397]! } + public var Privacy_SecretChatsTitle: String { return self._s[2398]! } + public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[2400]! } + public var GroupInfo_AddUserLeftError: String { return self._s[2401]! } + public var AutoDownloadSettings_TypePrivateChats: String { return self._s[2402]! } + public var LogoutOptions_ContactSupportTitle: String { return self._s[2403]! } + public var Channel_AddBotErrorHaveRights: String { return self._s[2404]! } + public var Preview_DeleteGif: String { return self._s[2405]! } + public var GroupInfo_Permissions_Exceptions: String { return self._s[2406]! } + public var Group_ErrorNotMutualContact: String { return self._s[2407]! } + public var Notification_MessageLifetime5s: String { return self._s[2408]! } public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2397]!, self._r[2397]!, [_0]) + return formatWithArgumentRanges(self._s[2409]!, self._r[2409]!, [_0]) } - public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2399]! } - public var ReportSpam_DeleteThisChat: String { return self._s[2400]! } - public var Passport_Address_AddBankStatement: String { return self._s[2401]! } - public var Notification_CallIncoming: String { return self._s[2402]! } - public var Compose_NewGroupTitle: String { return self._s[2403]! } - public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2405]! } - public var Passport_Address_Postcode: String { return self._s[2407]! } + public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[2411]! } + public var ReportSpam_DeleteThisChat: String { return self._s[2412]! } + public var Passport_Address_AddBankStatement: String { return self._s[2413]! } + public var Notification_CallIncoming: String { return self._s[2414]! } + public var Compose_NewGroupTitle: String { return self._s[2415]! } + public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[2417]! } + public var Passport_Address_Postcode: String { return self._s[2419]! } public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2408]!, self._r[2408]!, [_0]) + return formatWithArgumentRanges(self._s[2420]!, self._r[2420]!, [_0]) } - public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2409]! } - public var WallpaperColors_Title: String { return self._s[2410]! } - public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2411]! } - public var GroupPermission_Duration: String { return self._s[2412]! } + public var Checkout_NewCard_SaveInfoHelp: String { return self._s[2421]! } + public var WallpaperColors_Title: String { return self._s[2422]! } + public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[2423]! } + public var GroupPermission_Duration: String { return self._s[2424]! } public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2413]!, self._r[2413]!, [_0]) + return formatWithArgumentRanges(self._s[2425]!, self._r[2425]!, [_0]) } - public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2414]! } - public var Username_Placeholder: String { return self._s[2415]! } - public var CallFeedback_WhatWentWrong: String { return self._s[2416]! } - public var Passport_FieldAddressUploadHelp: String { return self._s[2417]! } - public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2418]! } + public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[2426]! } + public var Username_Placeholder: String { return self._s[2427]! } + public var CallFeedback_WhatWentWrong: String { return self._s[2428]! } + public var Passport_FieldAddressUploadHelp: String { return self._s[2429]! } + public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[2430]! } public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2420]!, self._r[2420]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2432]!, self._r[2432]!, [_1, _2]) } - public var Passport_PasswordDescription: String { return self._s[2421]! } - public var Channel_MessagePhotoUpdated: String { return self._s[2422]! } - public var MediaPicker_TapToUngroupDescription: String { return self._s[2423]! } - public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2424]! } - public var AttachmentMenu_PhotoOrVideo: String { return self._s[2425]! } - public var Conversation_ContextMenuMore: String { return self._s[2426]! } - public var Privacy_PaymentsClearInfo: String { return self._s[2427]! } - public var CallSettings_TabIcon: String { return self._s[2428]! } - public var KeyCommand_Find: String { return self._s[2429]! } - public var Message_PinnedGame: String { return self._s[2430]! } - public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2432]! } - public var Login_CallRequestState2: String { return self._s[2434]! } - public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2436]! } + public var Passport_PasswordDescription: String { return self._s[2433]! } + public var Channel_MessagePhotoUpdated: String { return self._s[2434]! } + public var MediaPicker_TapToUngroupDescription: String { return self._s[2435]! } + public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[2436]! } + public var AttachmentMenu_PhotoOrVideo: String { return self._s[2437]! } + public var Conversation_ContextMenuMore: String { return self._s[2438]! } + public var Privacy_PaymentsClearInfo: String { return self._s[2439]! } + public var CallSettings_TabIcon: String { return self._s[2440]! } + public var KeyCommand_Find: String { return self._s[2441]! } + public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[2442]! } + public var Message_PinnedGame: String { return self._s[2443]! } + public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2445]! } + public var Login_CallRequestState2: String { return self._s[2447]! } + public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[2449]! } public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2438]!, self._r[2438]!, [_0]) + return formatWithArgumentRanges(self._s[2451]!, self._r[2451]!, [_0]) } - public var WallpaperPreview_Blurred: String { return self._s[2439]! } - public var Conversation_InstantPagePreview: String { return self._s[2440]! } + public var WallpaperPreview_Blurred: String { return self._s[2452]! } + public var Conversation_InstantPagePreview: String { return self._s[2453]! } public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2441]!, self._r[2441]!, [_0]) + return formatWithArgumentRanges(self._s[2454]!, self._r[2454]!, [_0]) } - public var SecretTimer_VideoDescription: String { return self._s[2444]! } - public var WallpaperSearch_ColorRed: String { return self._s[2445]! } - public var GroupPermission_NoPinMessages: String { return self._s[2446]! } - public var Passport_Language_es: String { return self._s[2447]! } - public var Permissions_ContactsAllow_v0: String { return self._s[2449]! } - public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2450]! } + public var SecretTimer_VideoDescription: String { return self._s[2457]! } + public var WallpaperSearch_ColorRed: String { return self._s[2458]! } + public var GroupPermission_NoPinMessages: String { return self._s[2459]! } + public var Passport_Language_es: String { return self._s[2460]! } + public var Permissions_ContactsAllow_v0: String { return self._s[2462]! } + public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2463]! } public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2451]!, self._r[2451]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2464]!, self._r[2464]!, [_1, _2]) } - public var Privacy_Forwards_CustomHelp: String { return self._s[2452]! } - public var WebPreview_GettingLinkInfo: String { return self._s[2453]! } - public var Watch_UserInfo_Unmute: String { return self._s[2454]! } - public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2455]! } - public var AccessDenied_CameraRestricted: String { return self._s[2457]! } + public var Privacy_Forwards_CustomHelp: String { return self._s[2465]! } + public var WebPreview_GettingLinkInfo: String { return self._s[2466]! } + public var Watch_UserInfo_Unmute: String { return self._s[2467]! } + public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[2468]! } + public var AccessDenied_CameraRestricted: String { return self._s[2470]! } public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2458]!, self._r[2458]!, ["\(_0)"]) + return formatWithArgumentRanges(self._s[2471]!, self._r[2471]!, ["\(_0)"]) } - public var ChatList_ReadAll: String { return self._s[2460]! } - public var Settings_CopyUsername: String { return self._s[2461]! } - public var Contacts_SearchLabel: String { return self._s[2462]! } - public var Map_OpenInYandexNavigator: String { return self._s[2464]! } - public var PasscodeSettings_EncryptData: String { return self._s[2465]! } - public var WallpaperSearch_ColorPrefix: String { return self._s[2466]! } - public var Notifications_GroupNotificationsPreview: String { return self._s[2467]! } - public var DialogList_AdNoticeAlert: String { return self._s[2468]! } - public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2470]! } - public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2471]! } - public var Localization_LanguageCustom: String { return self._s[2472]! } - public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2473]! } - public var CallFeedback_Title: String { return self._s[2474]! } - public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2477]! } - public var Conversation_InfoGroup: String { return self._s[2478]! } - public var Compose_NewMessage: String { return self._s[2479]! } - public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2480]! } - public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2481]! } - public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2482]! } + public var ChatList_ReadAll: String { return self._s[2473]! } + public var Settings_CopyUsername: String { return self._s[2474]! } + public var Contacts_SearchLabel: String { return self._s[2475]! } + public var Map_OpenInYandexNavigator: String { return self._s[2477]! } + public var PasscodeSettings_EncryptData: String { return self._s[2478]! } + public var WallpaperSearch_ColorPrefix: String { return self._s[2479]! } + public var Notifications_GroupNotificationsPreview: String { return self._s[2480]! } + public var DialogList_AdNoticeAlert: String { return self._s[2481]! } + public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2483]! } + public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2484]! } + public var Localization_LanguageCustom: String { return self._s[2485]! } + public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[2486]! } + public var CallFeedback_Title: String { return self._s[2487]! } + public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2490]! } + public var Conversation_InfoGroup: String { return self._s[2491]! } + public var Compose_NewMessage: String { return self._s[2492]! } + public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2493]! } + public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2494]! } + public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2495]! } public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2483]!, self._r[2483]!, [_0]) + return formatWithArgumentRanges(self._s[2496]!, self._r[2496]!, [_0]) } - public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2484]! } - public var Login_CancelSignUpConfirmation: String { return self._s[2485]! } - public var ChangePhoneNumberCode_Help: String { return self._s[2486]! } - public var PrivacySettings_DeleteAccountHelp: String { return self._s[2487]! } - public var Channel_BlackList_Title: String { return self._s[2488]! } - public var UserInfo_PhoneCall: String { return self._s[2489]! } - public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2491]! } - public var State_connecting: String { return self._s[2492]! } + public var Channel_AdminLog_CanDeleteMessages: String { return self._s[2497]! } + public var Login_CancelSignUpConfirmation: String { return self._s[2498]! } + public var ChangePhoneNumberCode_Help: String { return self._s[2499]! } + public var PrivacySettings_DeleteAccountHelp: String { return self._s[2500]! } + public var Channel_BlackList_Title: String { return self._s[2501]! } + public var UserInfo_PhoneCall: String { return self._s[2502]! } + public var Passport_Address_OneOfTypeBankStatement: String { return self._s[2504]! } + public var State_connecting: String { return self._s[2505]! } + public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[2506]! } public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2493]!, self._r[2493]!, [_0]) + return formatWithArgumentRanges(self._s[2507]!, self._r[2507]!, [_0]) } - public var Notifications_GroupNotifications: String { return self._s[2494]! } - public var Passport_Identity_EditPassport: String { return self._s[2495]! } - public var EnterPasscode_RepeatNewPasscode: String { return self._s[2497]! } - public var Localization_EnglishLanguageName: String { return self._s[2498]! } - public var Share_AuthDescription: String { return self._s[2499]! } - public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2500]! } - public var Passport_Identity_Surname: String { return self._s[2501]! } - public var Compose_TokenListPlaceholder: String { return self._s[2502]! } - public var Passport_Identity_OneOfTypePassport: String { return self._s[2503]! } - public var Settings_AboutEmpty: String { return self._s[2504]! } - public var Conversation_Unmute: String { return self._s[2505]! } - public var CreateGroup_ChannelsTooMuch: String { return self._s[2507]! } + public var Notifications_GroupNotifications: String { return self._s[2508]! } + public var Passport_Identity_EditPassport: String { return self._s[2509]! } + public var EnterPasscode_RepeatNewPasscode: String { return self._s[2511]! } + public var Localization_EnglishLanguageName: String { return self._s[2512]! } + public var Share_AuthDescription: String { return self._s[2513]! } + public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[2514]! } + public var Passport_Identity_Surname: String { return self._s[2515]! } + public var Compose_TokenListPlaceholder: String { return self._s[2516]! } + public var Passport_Identity_OneOfTypePassport: String { return self._s[2517]! } + public var Settings_AboutEmpty: String { return self._s[2518]! } + public var Conversation_Unmute: String { return self._s[2519]! } + public var CreateGroup_ChannelsTooMuch: String { return self._s[2521]! } public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2508]!, self._r[2508]!, [_1]) + return formatWithArgumentRanges(self._s[2522]!, self._r[2522]!, [_1]) } - public var Login_CodeSentCall: String { return self._s[2509]! } - public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2511]! } - public var ChatSettings_Appearance: String { return self._s[2512]! } - public var Appearance_PickAccentColor: String { return self._s[2513]! } + public var Login_CodeSentCall: String { return self._s[2523]! } + public var ContactInfo_PhoneLabelHomeFax: String { return self._s[2525]! } + public var ChatSettings_Appearance: String { return self._s[2526]! } + public var Appearance_PickAccentColor: String { return self._s[2527]! } public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2514]!, self._r[2514]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2528]!, self._r[2528]!, [_1, _2]) } public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2515]!, self._r[2515]!, [_1]) + return formatWithArgumentRanges(self._s[2529]!, self._r[2529]!, [_1]) } - public var Notification_CallMissed: String { return self._s[2516]! } - public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2517]! } - public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2518]! } - public var ChatAdmins_AdminLabel: String { return self._s[2520]! } - public var KeyCommand_JumpToNextChat: String { return self._s[2521]! } - public var Conversation_StopPollConfirmationTitle: String { return self._s[2523]! } - public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2524]! } - public var Month_GenJune: String { return self._s[2525]! } - public var Watch_Location_Current: String { return self._s[2526]! } - public var Conversation_TitleMute: String { return self._s[2527]! } + public var Notification_CallMissed: String { return self._s[2530]! } + public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[2531]! } + public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2532]! } + public var ChatAdmins_AdminLabel: String { return self._s[2534]! } + public var KeyCommand_JumpToNextChat: String { return self._s[2535]! } + public var Conversation_StopPollConfirmationTitle: String { return self._s[2537]! } + public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[2538]! } + public var Month_GenJune: String { return self._s[2539]! } + public var Watch_Location_Current: String { return self._s[2540]! } + public var Conversation_TitleMute: String { return self._s[2541]! } public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2528]!, self._r[2528]!, [_1]) + return formatWithArgumentRanges(self._s[2542]!, self._r[2542]!, [_1]) } - public var GroupInfo_DeleteAndExit: String { return self._s[2529]! } + public var GroupInfo_DeleteAndExit: String { return self._s[2543]! } public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2530]!, self._r[2530]!, [_0]) + return formatWithArgumentRanges(self._s[2544]!, self._r[2544]!, [_0]) } - public var Call_ReportPlaceholder: String { return self._s[2531]! } - public var MaskStickerSettings_Info: String { return self._s[2532]! } + public var Call_ReportPlaceholder: String { return self._s[2545]! } + public var MaskStickerSettings_Info: String { return self._s[2546]! } public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2533]!, self._r[2533]!, [_0]) + return formatWithArgumentRanges(self._s[2547]!, self._r[2547]!, [_0]) } - public var Checkout_NewCard_PostcodeTitle: String { return self._s[2534]! } - public var Passport_Address_RegionPlaceholder: String { return self._s[2536]! } - public var Contacts_ShareTelegram: String { return self._s[2537]! } - public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2538]! } - public var Channel_ErrorAccessDenied: String { return self._s[2539]! } - public var UserInfo_ScamBotWarning: String { return self._s[2541]! } - public var Stickers_GroupChooseStickerPack: String { return self._s[2542]! } - public var Call_ConnectionErrorTitle: String { return self._s[2543]! } - public var UserInfo_NotificationsEnable: String { return self._s[2544]! } - public var ArchivedChats_IntroText1: String { return self._s[2545]! } - public var Tour_Text4: String { return self._s[2548]! } - public var WallpaperSearch_Recent: String { return self._s[2549]! } - public var GroupInfo_ScamGroupWarning: String { return self._s[2550]! } - public var Profile_MessageLifetime2s: String { return self._s[2552]! } - public var Notification_MessageLifetime2s: String { return self._s[2553]! } + public var Checkout_NewCard_PostcodeTitle: String { return self._s[2548]! } + public var Passport_Address_RegionPlaceholder: String { return self._s[2550]! } + public var Contacts_ShareTelegram: String { return self._s[2551]! } + public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[2552]! } + public var Channel_ErrorAccessDenied: String { return self._s[2553]! } + public var UserInfo_ScamBotWarning: String { return self._s[2555]! } + public var Stickers_GroupChooseStickerPack: String { return self._s[2556]! } + public var Call_ConnectionErrorTitle: String { return self._s[2557]! } + public var UserInfo_NotificationsEnable: String { return self._s[2558]! } + public var ArchivedChats_IntroText1: String { return self._s[2559]! } + public var Tour_Text4: String { return self._s[2562]! } + public var WallpaperSearch_Recent: String { return self._s[2563]! } + public var GroupInfo_ScamGroupWarning: String { return self._s[2564]! } + public var Profile_MessageLifetime2s: String { return self._s[2566]! } + public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[2567]! } + public var Notification_MessageLifetime2s: String { return self._s[2568]! } public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2554]!, self._r[2554]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2569]!, self._r[2569]!, [_1, _2, _3]) } - public var Cache_ClearCache: String { return self._s[2555]! } - public var AutoNightTheme_UpdateLocation: String { return self._s[2556]! } - public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2557]! } + public var Cache_ClearCache: String { return self._s[2570]! } + public var AutoNightTheme_UpdateLocation: String { return self._s[2571]! } + public var Permissions_NotificationsUnreachableText_v0: String { return self._s[2572]! } public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2561]!, self._r[2561]!, [_0]) + return formatWithArgumentRanges(self._s[2576]!, self._r[2576]!, [_0]) } public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2563]!, self._r[2563]!, [_0]) + return formatWithArgumentRanges(self._s[2578]!, self._r[2578]!, [_0]) } - public var LocalGroup_Text: String { return self._s[2564]! } - public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2565]! } - public var SocksProxySetup_TypeSocks: String { return self._s[2566]! } - public var ChatList_UnarchiveAction: String { return self._s[2567]! } - public var AutoNightTheme_Title: String { return self._s[2568]! } - public var InstantPage_FeedbackButton: String { return self._s[2569]! } - public var Passport_FieldAddress: String { return self._s[2570]! } - public var Month_ShortMarch: String { return self._s[2571]! } + public var LocalGroup_Text: String { return self._s[2579]! } + public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[2580]! } + public var SocksProxySetup_TypeSocks: String { return self._s[2581]! } + public var ChatList_UnarchiveAction: String { return self._s[2582]! } + public var AutoNightTheme_Title: String { return self._s[2583]! } + public var InstantPage_FeedbackButton: String { return self._s[2584]! } + public var Passport_FieldAddress: String { return self._s[2585]! } + public var Month_ShortMarch: String { return self._s[2586]! } public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2572]!, self._r[2572]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2587]!, self._r[2587]!, [_1, _2]) } - public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2573]! } - public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2574]! } - public var Passport_FloodError: String { return self._s[2575]! } - public var SecretGif_Title: String { return self._s[2576]! } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2577]! } - public var Passport_Language_th: String { return self._s[2579]! } - public var Passport_Address_Address: String { return self._s[2580]! } - public var Login_InvalidLastNameError: String { return self._s[2581]! } - public var Notifications_InAppNotificationsPreview: String { return self._s[2582]! } - public var Notifications_PermissionsUnreachableTitle: String { return self._s[2583]! } - public var SettingsSearch_FAQ: String { return self._s[2584]! } - public var ShareMenu_Send: String { return self._s[2585]! } - public var WallpaperSearch_ColorYellow: String { return self._s[2587]! } - public var Month_GenNovember: String { return self._s[2589]! } - public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2591]! } + public var SocksProxySetup_UsernamePlaceholder: String { return self._s[2588]! } + public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[2589]! } + public var Passport_FloodError: String { return self._s[2590]! } + public var SecretGif_Title: String { return self._s[2591]! } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2592]! } + public var Passport_Language_th: String { return self._s[2594]! } + public var Passport_Address_Address: String { return self._s[2595]! } + public var Login_InvalidLastNameError: String { return self._s[2596]! } + public var Notifications_InAppNotificationsPreview: String { return self._s[2597]! } + public var Notifications_PermissionsUnreachableTitle: String { return self._s[2598]! } + public var SettingsSearch_FAQ: String { return self._s[2599]! } + public var ShareMenu_Send: String { return self._s[2600]! } + public var WallpaperSearch_ColorYellow: String { return self._s[2602]! } + public var Month_GenNovember: String { return self._s[2604]! } + public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[2606]! } public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2592]!, self._r[2592]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2607]!, self._r[2607]!, [_1, _2]) } - public var Checkout_Email: String { return self._s[2593]! } - public var NotificationsSound_Tritone: String { return self._s[2594]! } - public var StickerPacksSettings_ManagingHelp: String { return self._s[2596]! } + public var Checkout_Email: String { return self._s[2608]! } + public var NotificationsSound_Tritone: String { return self._s[2609]! } + public var StickerPacksSettings_ManagingHelp: String { return self._s[2611]! } public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2599]!, self._r[2599]!, [_1]) + return formatWithArgumentRanges(self._s[2614]!, self._r[2614]!, [_1]) } - public var ChangePhoneNumberNumber_Help: String { return self._s[2600]! } + public var ChangePhoneNumberNumber_Help: String { return self._s[2615]! } public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2601]!, self._r[2601]!, [_1, _1, _1, _2]) + return formatWithArgumentRanges(self._s[2616]!, self._r[2616]!, [_1, _1, _1, _2]) } - public var ChatList_UndoArchiveTitle: String { return self._s[2602]! } - public var Notification_Exceptions_Add: String { return self._s[2603]! } - public var DialogList_You: String { return self._s[2604]! } - public var MediaPicker_Send: String { return self._s[2607]! } - public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2608]! } - public var Call_AudioRouteSpeaker: String { return self._s[2609]! } - public var Watch_UserInfo_Title: String { return self._s[2610]! } - public var Appearance_AccentColor: String { return self._s[2611]! } + public var ChatList_UndoArchiveTitle: String { return self._s[2617]! } + public var Notification_Exceptions_Add: String { return self._s[2618]! } + public var DialogList_You: String { return self._s[2619]! } + public var MediaPicker_Send: String { return self._s[2622]! } + public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2623]! } + public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[2624]! } + public var Call_AudioRouteSpeaker: String { return self._s[2625]! } + public var Watch_UserInfo_Title: String { return self._s[2626]! } + public var Appearance_AccentColor: String { return self._s[2627]! } public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2612]!, self._r[2612]!, [_0]) + return formatWithArgumentRanges(self._s[2628]!, self._r[2628]!, [_0]) } - public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2613]! } + public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2629]! } public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2614]!, self._r[2614]!, [_1, _2]) - } - public var Conversation_ClousStorageInfo_Description2: String { return self._s[2615]! } - public var WebSearch_RecentClearConfirmation: String { return self._s[2616]! } - public var Notification_CallOutgoing: String { return self._s[2617]! } - public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2618]! } - public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[2619]! } - public var Call_RecordingDisabledMessage: String { return self._s[2620]! } - public var Message_Game: String { return self._s[2621]! } - public var Conversation_PressVolumeButtonForSound: String { return self._s[2622]! } - public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2623]! } - public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[2624]! } - public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2625]! } - public var Date_DialogDateFormat: String { return self._s[2626]! } - public var WallpaperColors_SetCustomColor: String { return self._s[2627]! } - public var Notifications_InAppNotifications: String { return self._s[2628]! } - public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2629]!, self._r[2629]!, [_0]) - } - public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2630]!, self._r[2630]!, [_1, _2]) } - public var NewContact_Title: String { return self._s[2631]! } + public var Conversation_ClousStorageInfo_Description2: String { return self._s[2631]! } + public var WebSearch_RecentClearConfirmation: String { return self._s[2632]! } + public var Notification_CallOutgoing: String { return self._s[2633]! } + public var PrivacySettings_PasscodeAndFaceId: String { return self._s[2634]! } + public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[2635]! } + public var Call_RecordingDisabledMessage: String { return self._s[2636]! } + public var Message_Game: String { return self._s[2637]! } + public var Conversation_PressVolumeButtonForSound: String { return self._s[2638]! } + public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[2639]! } + public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[2640]! } + public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[2641]! } + public var Date_DialogDateFormat: String { return self._s[2642]! } + public var WallpaperColors_SetCustomColor: String { return self._s[2643]! } + public var Notifications_InAppNotifications: String { return self._s[2644]! } + public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2645]!, self._r[2645]!, [_0]) + } + public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2646]!, self._r[2646]!, [_1, _2]) + } + public var NewContact_Title: String { return self._s[2647]! } public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2632]!, self._r[2632]!, [_0]) + return formatWithArgumentRanges(self._s[2648]!, self._r[2648]!, [_0]) } - public var Conversation_ViewContactDetails: String { return self._s[2633]! } + public var Conversation_ViewContactDetails: String { return self._s[2649]! } public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2635]!, self._r[2635]!, [_1]) + return formatWithArgumentRanges(self._s[2651]!, self._r[2651]!, [_1]) } - public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2636]! } - public var Passport_Identity_ExpiryDateNone: String { return self._s[2637]! } - public var PrivacySettings_Title: String { return self._s[2638]! } - public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2641]! } - public var GroupRemoved_UsersSectionTitle: String { return self._s[2642]! } - public var Contacts_PhoneNumber: String { return self._s[2643]! } - public var Map_ShowPlaces: String { return self._s[2645]! } - public var ChatAdmins_Title: String { return self._s[2646]! } - public var InstantPage_Reference: String { return self._s[2648]! } - public var ReportGroupLocation_Text: String { return self._s[2649]! } + public var Checkout_NewCard_CardholderNameTitle: String { return self._s[2652]! } + public var Passport_Identity_ExpiryDateNone: String { return self._s[2653]! } + public var PrivacySettings_Title: String { return self._s[2654]! } + public var Conversation_SilentBroadcastTooltipOff: String { return self._s[2657]! } + public var GroupRemoved_UsersSectionTitle: String { return self._s[2658]! } + public var Contacts_PhoneNumber: String { return self._s[2659]! } + public var Map_ShowPlaces: String { return self._s[2661]! } + public var ChatAdmins_Title: String { return self._s[2662]! } + public var InstantPage_Reference: String { return self._s[2664]! } + public var ReportGroupLocation_Text: String { return self._s[2665]! } public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2650]!, self._r[2650]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2666]!, self._r[2666]!, [_1, _2]) } - public var Camera_FlashOff: String { return self._s[2651]! } - public var Watch_UserInfo_Block: String { return self._s[2652]! } - public var ChatSettings_Stickers: String { return self._s[2653]! } - public var ChatSettings_DownloadInBackground: String { return self._s[2654]! } + public var Camera_FlashOff: String { return self._s[2667]! } + public var Watch_UserInfo_Block: String { return self._s[2668]! } + public var ChatSettings_Stickers: String { return self._s[2669]! } + public var ChatSettings_DownloadInBackground: String { return self._s[2670]! } public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2655]!, self._r[2655]!, [_0]) - } - public var Settings_ViewPhoto: String { return self._s[2656]! } - public var Login_CheckOtherSessionMessages: String { return self._s[2657]! } - public var AutoDownloadSettings_Cellular: String { return self._s[2658]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2659]! } - public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2661]!, self._r[2661]!, [_0]) - } - public var Privacy_DeleteDrafts: String { return self._s[2662]! } - public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2663]! } - public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2664]!, self._r[2664]!, [_0]) - } - public var DialogList_SavedMessagesHelp: String { return self._s[2665]! } - public var DialogList_SavedMessages: String { return self._s[2666]! } - public var GroupInfo_UpgradeButton: String { return self._s[2667]! } - public var DialogList_Pin: String { return self._s[2669]! } - public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2670]!, self._r[2670]!, [_0, _1]) - } - public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2671]!, self._r[2671]!, [_0]) } - public var Notification_Exceptions_AlwaysOn: String { return self._s[2672]! } - public var UserInfo_NotificationsDisable: String { return self._s[2673]! } - public var Paint_Outlined: String { return self._s[2674]! } - public var Activity_PlayingGame: String { return self._s[2675]! } - public var SearchImages_NoImagesFound: String { return self._s[2676]! } - public var SocksProxySetup_ProxyType: String { return self._s[2677]! } - public var AppleWatch_ReplyPresetsHelp: String { return self._s[2679]! } - public var Conversation_ContextMenuCancelSending: String { return self._s[2680]! } - public var Settings_AppLanguage: String { return self._s[2681]! } - public var TwoStepAuth_ResetAccountHelp: String { return self._s[2682]! } - public var Common_ChoosePhoto: String { return self._s[2683]! } - public var CallFeedback_ReasonEcho: String { return self._s[2684]! } + public var Settings_ViewPhoto: String { return self._s[2672]! } + public var Login_CheckOtherSessionMessages: String { return self._s[2673]! } + public var AutoDownloadSettings_Cellular: String { return self._s[2674]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2675]! } + public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2677]!, self._r[2677]!, [_0]) + } + public var Privacy_DeleteDrafts: String { return self._s[2678]! } + public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[2679]! } + public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2680]!, self._r[2680]!, [_0]) + } + public var DialogList_SavedMessagesHelp: String { return self._s[2681]! } + public var DialogList_SavedMessages: String { return self._s[2682]! } + public var GroupInfo_UpgradeButton: String { return self._s[2683]! } + public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[2685]! } + public var DialogList_Pin: String { return self._s[2686]! } + public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2687]!, self._r[2687]!, [_0, _1]) + } + public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2688]!, self._r[2688]!, [_0]) + } + public var Notification_Exceptions_AlwaysOn: String { return self._s[2689]! } + public var UserInfo_NotificationsDisable: String { return self._s[2690]! } + public var Paint_Outlined: String { return self._s[2691]! } + public var Activity_PlayingGame: String { return self._s[2692]! } + public var SearchImages_NoImagesFound: String { return self._s[2693]! } + public var SocksProxySetup_ProxyType: String { return self._s[2694]! } + public var AppleWatch_ReplyPresetsHelp: String { return self._s[2696]! } + public var Conversation_ContextMenuCancelSending: String { return self._s[2697]! } + public var Settings_AppLanguage: String { return self._s[2698]! } + public var TwoStepAuth_ResetAccountHelp: String { return self._s[2699]! } + public var Common_ChoosePhoto: String { return self._s[2700]! } + public var CallFeedback_ReasonEcho: String { return self._s[2701]! } public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2685]!, self._r[2685]!, [_1]) + return formatWithArgumentRanges(self._s[2702]!, self._r[2702]!, [_1]) } - public var Privacy_Calls_AlwaysAllow: String { return self._s[2686]! } - public var Activity_UploadingVideo: String { return self._s[2687]! } - public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2688]! } - public var NetworkUsageSettings_Wifi: String { return self._s[2689]! } - public var Channel_BanUser_PermissionReadMessages: String { return self._s[2690]! } - public var Checkout_PayWithTouchId: String { return self._s[2691]! } - public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2692]! } + public var Privacy_Calls_AlwaysAllow: String { return self._s[2703]! } + public var Activity_UploadingVideo: String { return self._s[2704]! } + public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[2705]! } + public var NetworkUsageSettings_Wifi: String { return self._s[2706]! } + public var Channel_BanUser_PermissionReadMessages: String { return self._s[2707]! } + public var Checkout_PayWithTouchId: String { return self._s[2708]! } + public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2709]! } public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2694]!, self._r[2694]!, [_1]) + return formatWithArgumentRanges(self._s[2711]!, self._r[2711]!, [_1]) } - public var Notifications_ExceptionsNone: String { return self._s[2695]! } + public var Notifications_ExceptionsNone: String { return self._s[2712]! } public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2696]!, self._r[2696]!, [_0]) + return formatWithArgumentRanges(self._s[2713]!, self._r[2713]!, [_0]) } public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2697]!, self._r[2697]!, [_1]) + return formatWithArgumentRanges(self._s[2714]!, self._r[2714]!, [_1]) } - public var AuthSessions_IncompleteAttempts: String { return self._s[2699]! } - public var Passport_Address_Region: String { return self._s[2702]! } - public var ChatList_DeleteChat: String { return self._s[2703]! } - public var LogoutOptions_ClearCacheTitle: String { return self._s[2704]! } - public var PhotoEditor_TiltShift: String { return self._s[2705]! } - public var Settings_FAQ_URL: String { return self._s[2706]! } - public var Passport_Language_sl: String { return self._s[2707]! } - public var Settings_PrivacySettings: String { return self._s[2709]! } - public var SharedMedia_TitleLink: String { return self._s[2710]! } - public var Passport_Identity_TypePassportUploadScan: String { return self._s[2711]! } - public var Settings_SetProfilePhoto: String { return self._s[2712]! } - public var Channel_About_Help: String { return self._s[2713]! } - public var Contacts_PermissionsEnable: String { return self._s[2714]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[2715]! } - public var AttachmentMenu_SendAsFiles: String { return self._s[2716]! } - public var CallFeedback_ReasonInterruption: String { return self._s[2718]! } - public var Passport_Address_AddTemporaryRegistration: String { return self._s[2719]! } - public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[2720]! } - public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[2721]! } - public var PrivacySettings_DeleteAccountTitle: String { return self._s[2722]! } - public var AccessDenied_VideoMessageCamera: String { return self._s[2724]! } - public var Map_OpenInYandexMaps: String { return self._s[2726]! } - public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[2727]! } - public var PhotoEditor_SaturationTool: String { return self._s[2728]! } + public var AuthSessions_IncompleteAttempts: String { return self._s[2716]! } + public var Passport_Address_Region: String { return self._s[2719]! } + public var ChatList_DeleteChat: String { return self._s[2720]! } + public var LogoutOptions_ClearCacheTitle: String { return self._s[2721]! } + public var PhotoEditor_TiltShift: String { return self._s[2722]! } + public var Settings_FAQ_URL: String { return self._s[2723]! } + public var Passport_Language_sl: String { return self._s[2724]! } + public var Settings_PrivacySettings: String { return self._s[2726]! } + public var SharedMedia_TitleLink: String { return self._s[2727]! } + public var Passport_Identity_TypePassportUploadScan: String { return self._s[2728]! } + public var Settings_SetProfilePhoto: String { return self._s[2729]! } + public var Channel_About_Help: String { return self._s[2730]! } + public var Contacts_PermissionsEnable: String { return self._s[2731]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[2732]! } + public var AttachmentMenu_SendAsFiles: String { return self._s[2733]! } + public var CallFeedback_ReasonInterruption: String { return self._s[2735]! } + public var Passport_Address_AddTemporaryRegistration: String { return self._s[2736]! } + public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[2737]! } + public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[2738]! } + public var PrivacySettings_DeleteAccountTitle: String { return self._s[2739]! } + public var AccessDenied_VideoMessageCamera: String { return self._s[2741]! } + public var Map_OpenInYandexMaps: String { return self._s[2743]! } + public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[2744]! } + public var PhotoEditor_SaturationTool: String { return self._s[2745]! } public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2729]!, self._r[2729]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2746]!, self._r[2746]!, [_1, _2]) } - public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[2730]! } - public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2731]! } - public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[2732]! } - public var Appearance_TextSize: String { return self._s[2733]! } + public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[2747]! } + public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[2748]! } + public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[2749]! } + public var Appearance_TextSize: String { return self._s[2750]! } public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2734]!, self._r[2734]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[2751]!, self._r[2751]!, [_1, "\(_2)"]) } - public var Channel_Username_InvalidTooShort: String { return self._s[2736]! } + public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[2752]! } + public var Channel_Username_InvalidTooShort: String { return self._s[2754]! } public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2737]!, self._r[2737]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2755]!, self._r[2755]!, [_1, _2]) } public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2738]!, self._r[2738]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2756]!, self._r[2756]!, [_1, _2, _3]) } - public var GroupInfo_PublicLinkAdd: String { return self._s[2739]! } - public var Passport_PassportInformation: String { return self._s[2742]! } - public var WatchRemote_AlertTitle: String { return self._s[2743]! } - public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2744]! } - public var ConvertToSupergroup_HelpText: String { return self._s[2746]! } + public var GroupInfo_PublicLinkAdd: String { return self._s[2757]! } + public var Passport_PassportInformation: String { return self._s[2760]! } + public var WatchRemote_AlertTitle: String { return self._s[2761]! } + public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2762]! } + public var ConvertToSupergroup_HelpText: String { return self._s[2764]! } public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2747]!, self._r[2747]!, [_0]) + return formatWithArgumentRanges(self._s[2765]!, self._r[2765]!, [_0]) } public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2748]!, self._r[2748]!, [_1]) + return formatWithArgumentRanges(self._s[2766]!, self._r[2766]!, [_1]) } - public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2749]! } - public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2751]! } - public var AccessDenied_CameraDisabled: String { return self._s[2752]! } + public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2767]! } + public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[2769]! } + public var AccessDenied_CameraDisabled: String { return self._s[2770]! } public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2753]!, self._r[2753]!, [_0]) - } - public var PhotoEditor_ContrastTool: String { return self._s[2756]! } - public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2757]!, self._r[2757]!, [_1]) - } - public var DialogList_Draft: String { return self._s[2758]! } - public var Privacy_TopPeersDelete: String { return self._s[2760]! } - public var LoginPassword_PasswordPlaceholder: String { return self._s[2761]! } - public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2762]! } - public var WebSearch_RecentSectionClear: String { return self._s[2763]! } - public var Watch_ChatList_NoConversationsTitle: String { return self._s[2765]! } - public var Common_Done: String { return self._s[2767]! } - public var AuthSessions_EmptyText: String { return self._s[2768]! } - public var Conversation_ShareBotContactConfirmation: String { return self._s[2769]! } - public var Tour_Title5: String { return self._s[2770]! } - public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2771]!, self._r[2771]!, [_0]) } - public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2772]! } - public var Conversation_LinkDialogSave: String { return self._s[2773]! } - public var GroupInfo_ActionRestrict: String { return self._s[2774]! } - public var Checkout_Title: String { return self._s[2775]! } - public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[2777]! } - public var Channel_AdminLog_CanChangeInfo: String { return self._s[2779]! } - public var Notification_RenamedGroup: String { return self._s[2780]! } - public var PeopleNearby_Groups: String { return self._s[2781]! } - public var Checkout_PayWithFaceId: String { return self._s[2782]! } - public var Channel_BanList_BlockedTitle: String { return self._s[2783]! } - public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2785]! } - public var Checkout_WebConfirmation_Title: String { return self._s[2786]! } - public var Notifications_MessageNotificationsAlert: String { return self._s[2787]! } + public var PhotoEditor_ContrastTool: String { return self._s[2774]! } + public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2775]!, self._r[2775]!, [_1]) + } + public var DialogList_Draft: String { return self._s[2776]! } + public var Privacy_TopPeersDelete: String { return self._s[2778]! } + public var LoginPassword_PasswordPlaceholder: String { return self._s[2779]! } + public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[2780]! } + public var WebSearch_RecentSectionClear: String { return self._s[2781]! } + public var Watch_ChatList_NoConversationsTitle: String { return self._s[2783]! } + public var Common_Done: String { return self._s[2785]! } + public var AuthSessions_EmptyText: String { return self._s[2786]! } + public var Conversation_ShareBotContactConfirmation: String { return self._s[2787]! } + public var Tour_Title5: String { return self._s[2788]! } + public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2789]!, self._r[2789]!, [_0]) + } + public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2790]! } + public var Conversation_LinkDialogSave: String { return self._s[2791]! } + public var GroupInfo_ActionRestrict: String { return self._s[2792]! } + public var Checkout_Title: String { return self._s[2793]! } + public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[2795]! } + public var Channel_AdminLog_CanChangeInfo: String { return self._s[2797]! } + public var Notification_RenamedGroup: String { return self._s[2798]! } + public var PeopleNearby_Groups: String { return self._s[2799]! } + public var Checkout_PayWithFaceId: String { return self._s[2800]! } + public var Channel_BanList_BlockedTitle: String { return self._s[2801]! } + public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2803]! } + public var Checkout_WebConfirmation_Title: String { return self._s[2804]! } + public var Notifications_MessageNotificationsAlert: String { return self._s[2805]! } public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2788]!, self._r[2788]!, [_0]) + return formatWithArgumentRanges(self._s[2806]!, self._r[2806]!, [_0]) } - public var Profile_AddToExisting: String { return self._s[2790]! } + public var Profile_AddToExisting: String { return self._s[2808]! } public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2791]!, self._r[2791]!, [_0, _1]) + return formatWithArgumentRanges(self._s[2809]!, self._r[2809]!, [_0, _1]) } - public var Cache_Files: String { return self._s[2793]! } - public var Permissions_PrivacyPolicy: String { return self._s[2794]! } - public var SocksProxySetup_ConnectAndSave: String { return self._s[2795]! } - public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2796]! } - public var AutoDownloadSettings_TypeContacts: String { return self._s[2798]! } - public var Calls_NoCallsPlaceholder: String { return self._s[2800]! } - public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2801]! } - public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2803]! } + public var Cache_Files: String { return self._s[2811]! } + public var Permissions_PrivacyPolicy: String { return self._s[2812]! } + public var SocksProxySetup_ConnectAndSave: String { return self._s[2813]! } + public var UserInfo_NotificationsDefaultDisabled: String { return self._s[2814]! } + public var AutoDownloadSettings_TypeContacts: String { return self._s[2816]! } + public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[2818]! } + public var Calls_NoCallsPlaceholder: String { return self._s[2819]! } + public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2820]! } + public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[2822]! } public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2804]!, self._r[2804]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[2823]!, self._r[2823]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2805]! } - public var Passport_FieldAddressHelp: String { return self._s[2806]! } - public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2807]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2824]! } + public var Passport_FieldAddressHelp: String { return self._s[2825]! } + public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[2826]! } public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2808]!, self._r[2808]!, [_0]) + return formatWithArgumentRanges(self._s[2827]!, self._r[2827]!, [_0]) } - public var Channel_AdminLog_EmptyTitle: String { return self._s[2809]! } - public var Privacy_Calls_NeverAllow_Title: String { return self._s[2811]! } - public var Login_UnknownError: String { return self._s[2812]! } - public var Group_UpgradeNoticeText2: String { return self._s[2814]! } - public var Watch_Compose_AddContact: String { return self._s[2815]! } - public var Web_Error: String { return self._s[2816]! } - public var Gif_Search: String { return self._s[2817]! } - public var Profile_MessageLifetime1h: String { return self._s[2818]! } - public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2819]! } - public var Channel_Username_CheckingUsername: String { return self._s[2820]! } - public var CallFeedback_ReasonSilentRemote: String { return self._s[2821]! } - public var AutoDownloadSettings_TypeChannels: String { return self._s[2822]! } - public var Channel_AboutItem: String { return self._s[2823]! } - public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2825]! } - public var GroupInfo_SharedMedia: String { return self._s[2826]! } + public var Channel_AdminLog_EmptyTitle: String { return self._s[2828]! } + public var Privacy_Calls_NeverAllow_Title: String { return self._s[2830]! } + public var Login_UnknownError: String { return self._s[2831]! } + public var Group_UpgradeNoticeText2: String { return self._s[2833]! } + public var Watch_Compose_AddContact: String { return self._s[2834]! } + public var Web_Error: String { return self._s[2835]! } + public var Gif_Search: String { return self._s[2836]! } + public var Profile_MessageLifetime1h: String { return self._s[2837]! } + public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2838]! } + public var Channel_Username_CheckingUsername: String { return self._s[2839]! } + public var CallFeedback_ReasonSilentRemote: String { return self._s[2840]! } + public var AutoDownloadSettings_TypeChannels: String { return self._s[2841]! } + public var Channel_AboutItem: String { return self._s[2842]! } + public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2844]! } + public var GroupInfo_SharedMedia: String { return self._s[2845]! } public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2827]!, self._r[2827]!, [_1]) + return formatWithArgumentRanges(self._s[2846]!, self._r[2846]!, [_1]) } - public var Call_PhoneCallInProgressMessage: String { return self._s[2828]! } + public var Call_PhoneCallInProgressMessage: String { return self._s[2847]! } public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2829]!, self._r[2829]!, [_1]) + return formatWithArgumentRanges(self._s[2848]!, self._r[2848]!, [_1]) } - public var ChatList_UndoArchiveRevealedText: String { return self._s[2830]! } - public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2831]! } - public var Conversation_SearchByName_Placeholder: String { return self._s[2832]! } - public var CreatePoll_AddOption: String { return self._s[2833]! } - public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[2834]! } - public var Group_UpgradeNoticeHeader: String { return self._s[2835]! } - public var Channel_Management_AddModerator: String { return self._s[2836]! } - public var AutoDownloadSettings_MaxFileSize: String { return self._s[2837]! } - public var StickerPacksSettings_ShowStickersButton: String { return self._s[2838]! } - public var NotificationsSound_Hello: String { return self._s[2839]! } - public var SocksProxySetup_SavedProxies: String { return self._s[2840]! } - public var Channel_Stickers_Placeholder: String { return self._s[2842]! } + public var ChatList_UndoArchiveRevealedText: String { return self._s[2849]! } + public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2850]! } + public var Conversation_SearchByName_Placeholder: String { return self._s[2851]! } + public var CreatePoll_AddOption: String { return self._s[2852]! } + public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[2853]! } + public var Group_UpgradeNoticeHeader: String { return self._s[2854]! } + public var Channel_Management_AddModerator: String { return self._s[2855]! } + public var AutoDownloadSettings_MaxFileSize: String { return self._s[2856]! } + public var StickerPacksSettings_ShowStickersButton: String { return self._s[2857]! } + public var NotificationsSound_Hello: String { return self._s[2858]! } + public var SocksProxySetup_SavedProxies: String { return self._s[2859]! } + public var Channel_Stickers_Placeholder: String { return self._s[2861]! } public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2843]!, self._r[2843]!, [_0]) + return formatWithArgumentRanges(self._s[2862]!, self._r[2862]!, [_0]) } - public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[2844]! } - public var Channel_Management_AddModeratorHelp: String { return self._s[2845]! } - public var ContactInfo_BirthdayLabel: String { return self._s[2846]! } - public var ChangePhoneNumberCode_RequestingACall: String { return self._s[2847]! } - public var AutoDownloadSettings_Channels: String { return self._s[2848]! } - public var Passport_Language_mn: String { return self._s[2849]! } - public var Notifications_ResetAllNotificationsHelp: String { return self._s[2852]! } - public var Passport_Language_ja: String { return self._s[2854]! } - public var Settings_About_Title: String { return self._s[2855]! } - public var Settings_NotificationsAndSounds: String { return self._s[2856]! } - public var ChannelInfo_DeleteGroup: String { return self._s[2857]! } - public var Settings_BlockedUsers: String { return self._s[2858]! } + public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[2863]! } + public var Channel_Management_AddModeratorHelp: String { return self._s[2864]! } + public var ContactInfo_BirthdayLabel: String { return self._s[2865]! } + public var ChangePhoneNumberCode_RequestingACall: String { return self._s[2866]! } + public var AutoDownloadSettings_Channels: String { return self._s[2867]! } + public var Passport_Language_mn: String { return self._s[2868]! } + public var Notifications_ResetAllNotificationsHelp: String { return self._s[2871]! } + public var Passport_Language_ja: String { return self._s[2873]! } + public var Settings_About_Title: String { return self._s[2874]! } + public var Settings_NotificationsAndSounds: String { return self._s[2875]! } + public var ChannelInfo_DeleteGroup: String { return self._s[2876]! } + public var Settings_BlockedUsers: String { return self._s[2877]! } public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2859]!, self._r[2859]!, [_0]) + return formatWithArgumentRanges(self._s[2878]!, self._r[2878]!, [_0]) } - public var AutoDownloadSettings_PreloadVideo: String { return self._s[2860]! } - public var Passport_Address_AddResidentialAddress: String { return self._s[2861]! } - public var Channel_Username_Title: String { return self._s[2862]! } + public var AutoDownloadSettings_PreloadVideo: String { return self._s[2879]! } + public var Passport_Address_AddResidentialAddress: String { return self._s[2880]! } + public var Channel_Username_Title: String { return self._s[2881]! } public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2863]!, self._r[2863]!, [_0]) + return formatWithArgumentRanges(self._s[2882]!, self._r[2882]!, [_0]) } - public var AttachmentMenu_File: String { return self._s[2865]! } - public var AppleWatch_Title: String { return self._s[2866]! } - public var Activity_RecordingVideoMessage: String { return self._s[2867]! } + public var AttachmentMenu_File: String { return self._s[2884]! } + public var AppleWatch_Title: String { return self._s[2885]! } + public var Activity_RecordingVideoMessage: String { return self._s[2886]! } public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2868]!, self._r[2868]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2887]!, self._r[2887]!, [_1, _2]) } - public var Weekday_Saturday: String { return self._s[2869]! } - public var WallpaperPreview_SwipeColorsTopText: String { return self._s[2870]! } - public var Profile_CreateEncryptedChatError: String { return self._s[2871]! } - public var Common_Next: String { return self._s[2873]! } - public var Channel_Stickers_YourStickers: String { return self._s[2875]! } - public var Call_AudioRouteHeadphones: String { return self._s[2876]! } - public var TwoStepAuth_EnterPasswordForgot: String { return self._s[2878]! } - public var Watch_Contacts_NoResults: String { return self._s[2880]! } - public var PhotoEditor_TintTool: String { return self._s[2883]! } - public var LoginPassword_ResetAccount: String { return self._s[2885]! } - public var Settings_SavedMessages: String { return self._s[2886]! } - public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[2887]! } - public var Bot_GenericSupportStatus: String { return self._s[2888]! } - public var StickerPack_Add: String { return self._s[2889]! } - public var Checkout_TotalAmount: String { return self._s[2890]! } - public var Your_cards_number_is_invalid: String { return self._s[2891]! } - public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[2892]! } + public var Weekday_Saturday: String { return self._s[2888]! } + public var WallpaperPreview_SwipeColorsTopText: String { return self._s[2889]! } + public var Profile_CreateEncryptedChatError: String { return self._s[2890]! } + public var Common_Next: String { return self._s[2892]! } + public var Channel_Stickers_YourStickers: String { return self._s[2894]! } + public var Call_AudioRouteHeadphones: String { return self._s[2895]! } + public var TwoStepAuth_EnterPasswordForgot: String { return self._s[2897]! } + public var Watch_Contacts_NoResults: String { return self._s[2899]! } + public var PhotoEditor_TintTool: String { return self._s[2902]! } + public var LoginPassword_ResetAccount: String { return self._s[2904]! } + public var Settings_SavedMessages: String { return self._s[2905]! } + public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[2906]! } + public var Bot_GenericSupportStatus: String { return self._s[2907]! } + public var StickerPack_Add: String { return self._s[2908]! } + public var Checkout_TotalAmount: String { return self._s[2909]! } + public var Your_cards_number_is_invalid: String { return self._s[2910]! } + public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[2911]! } public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2893]!, self._r[2893]!, [_0]) - } - public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2894]!, self._r[2894]!, [_1, _2]) - } - public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[2895]! } - public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2897]!, self._r[2897]!, [_1, _2]) - } - public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2898]!, self._r[2898]!, [_0]) - } - public var GroupInfo_InviteLink_ShareLink: String { return self._s[2899]! } - public var StickerPack_Share: String { return self._s[2900]! } - public var Passport_DeleteAddress: String { return self._s[2901]! } - public var Settings_Passport: String { return self._s[2902]! } - public var SharedMedia_EmptyFilesText: String { return self._s[2903]! } - public var Conversation_DeleteMessagesForMe: String { return self._s[2904]! } - public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[2905]! } - public var Contacts_PermissionsText: String { return self._s[2906]! } - public var Group_Setup_HistoryVisible: String { return self._s[2907]! } - public var Passport_Address_AddRentalAgreement: String { return self._s[2909]! } - public var SocksProxySetup_Title: String { return self._s[2910]! } - public var Notification_Mute1h: String { return self._s[2911]! } - public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2912]!, self._r[2912]!, [_0]) } - public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[2913]! } - public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2914]!, self._r[2914]!, [_1]) + public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2913]!, self._r[2913]!, [_1, _2]) } - public var FastTwoStepSetup_PasswordSection: String { return self._s[2915]! } - public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2918]! } - public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[2920]! } - public var DialogList_NoMessagesText: String { return self._s[2921]! } - public var Privacy_ContactsResetConfirmation: String { return self._s[2922]! } - public var Privacy_Calls_P2PHelp: String { return self._s[2923]! } - public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[2925]! } - public var Your_cards_expiration_year_is_invalid: String { return self._s[2926]! } - public var Common_TakePhotoOrVideo: String { return self._s[2927]! } - public var Call_StatusBusy: String { return self._s[2928]! } - public var Conversation_PinnedMessage: String { return self._s[2929]! } - public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[2930]! } - public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[2931]! } - public var Undo_ChatCleared: String { return self._s[2932]! } - public var AppleWatch_ReplyPresets: String { return self._s[2933]! } - public var Passport_DiscardMessageDescription: String { return self._s[2935]! } - public var Login_NetworkError: String { return self._s[2936]! } + public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[2914]! } + public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2916]!, self._r[2916]!, [_1, _2]) + } + public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2917]!, self._r[2917]!, [_0]) + } + public var GroupInfo_InviteLink_ShareLink: String { return self._s[2918]! } + public var StickerPack_Share: String { return self._s[2919]! } + public var Passport_DeleteAddress: String { return self._s[2920]! } + public var Settings_Passport: String { return self._s[2921]! } + public var SharedMedia_EmptyFilesText: String { return self._s[2922]! } + public var Conversation_DeleteMessagesForMe: String { return self._s[2923]! } + public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[2924]! } + public var Contacts_PermissionsText: String { return self._s[2925]! } + public var Group_Setup_HistoryVisible: String { return self._s[2926]! } + public var Passport_Address_AddRentalAgreement: String { return self._s[2928]! } + public var SocksProxySetup_Title: String { return self._s[2929]! } + public var Notification_Mute1h: String { return self._s[2930]! } + public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2931]!, self._r[2931]!, [_0]) + } + public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[2932]! } + public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2933]!, self._r[2933]!, [_1]) + } + public var FastTwoStepSetup_PasswordSection: String { return self._s[2934]! } + public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2937]! } + public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[2939]! } + public var DialogList_NoMessagesText: String { return self._s[2940]! } + public var Privacy_ContactsResetConfirmation: String { return self._s[2941]! } + public var Privacy_Calls_P2PHelp: String { return self._s[2942]! } + public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[2944]! } + public var Your_cards_expiration_year_is_invalid: String { return self._s[2945]! } + public var Common_TakePhotoOrVideo: String { return self._s[2946]! } + public var Call_StatusBusy: String { return self._s[2947]! } + public var Conversation_PinnedMessage: String { return self._s[2948]! } + public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[2949]! } + public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[2950]! } + public var Undo_ChatCleared: String { return self._s[2951]! } + public var AppleWatch_ReplyPresets: String { return self._s[2952]! } + public var Passport_DiscardMessageDescription: String { return self._s[2954]! } + public var Login_NetworkError: String { return self._s[2955]! } public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2937]!, self._r[2937]!, [_0]) + return formatWithArgumentRanges(self._s[2956]!, self._r[2956]!, [_0]) } public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2938]!, self._r[2938]!, [_0]) - } - public var SocksProxySetup_PasswordPlaceholder: String { return self._s[2939]! } - public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2941]! } - public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2943]!, self._r[2943]!, [_0]) - } - public var Call_ConnectionErrorMessage: String { return self._s[2944]! } - public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[2945]! } - public var Compose_GroupTokenListPlaceholder: String { return self._s[2947]! } - public var ConversationMedia_Title: String { return self._s[2948]! } - public var EncryptionKey_Title: String { return self._s[2950]! } - public var TwoStepAuth_EnterPasswordTitle: String { return self._s[2951]! } - public var Notification_Exceptions_AddException: String { return self._s[2952]! } - public var PrivacySettings_BlockedPeersEmpty: String { return self._s[2953]! } - public var Profile_MessageLifetime1m: String { return self._s[2954]! } - public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2955]!, self._r[2955]!, [_1]) - } - public var Month_GenMay: String { return self._s[2956]! } - public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[2957]!, self._r[2957]!, [_0]) } - public var PeopleNearby_Users: String { return self._s[2958]! } - public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2959]! } - public var AutoDownloadSettings_ResetSettings: String { return self._s[2960]! } - public var Conversation_EmptyPlaceholder: String { return self._s[2962]! } - public var Passport_Address_AddPassportRegistration: String { return self._s[2963]! } - public var Notifications_ChannelNotificationsAlert: String { return self._s[2964]! } - public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[2965]! } - public var Camera_TapAndHoldForVideo: String { return self._s[2966]! } - public var Channel_JoinChannel: String { return self._s[2968]! } - public var Appearance_Animations: String { return self._s[2971]! } + public var SocksProxySetup_PasswordPlaceholder: String { return self._s[2958]! } + public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2960]! } + public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2962]!, self._r[2962]!, [_0]) + } + public var Call_ConnectionErrorMessage: String { return self._s[2963]! } + public var SettingsSearch_Synonyms_Notifications_MessageNotificationsSound: String { return self._s[2964]! } + public var Compose_GroupTokenListPlaceholder: String { return self._s[2966]! } + public var ConversationMedia_Title: String { return self._s[2967]! } + public var EncryptionKey_Title: String { return self._s[2969]! } + public var TwoStepAuth_EnterPasswordTitle: String { return self._s[2970]! } + public var Notification_Exceptions_AddException: String { return self._s[2971]! } + public var PrivacySettings_BlockedPeersEmpty: String { return self._s[2972]! } + public var Profile_MessageLifetime1m: String { return self._s[2973]! } + public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2974]!, self._r[2974]!, [_1]) + } + public var Month_GenMay: String { return self._s[2975]! } + public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[2976]!, self._r[2976]!, [_0]) + } + public var PeopleNearby_Users: String { return self._s[2977]! } + public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2978]! } + public var AutoDownloadSettings_ResetSettings: String { return self._s[2979]! } + public var Conversation_EmptyPlaceholder: String { return self._s[2981]! } + public var Passport_Address_AddPassportRegistration: String { return self._s[2982]! } + public var Notifications_ChannelNotificationsAlert: String { return self._s[2983]! } + public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[2984]! } + public var Camera_TapAndHoldForVideo: String { return self._s[2985]! } + public var Channel_JoinChannel: String { return self._s[2987]! } + public var Appearance_Animations: String { return self._s[2990]! } public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2972]!, self._r[2972]!, [_1, _2]) + return formatWithArgumentRanges(self._s[2991]!, self._r[2991]!, [_1, _2]) } - public var Stickers_GroupStickers: String { return self._s[2974]! } - public var ConvertToSupergroup_HelpTitle: String { return self._s[2976]! } - public var Passport_Address_Street: String { return self._s[2977]! } - public var Conversation_AddContact: String { return self._s[2978]! } - public var Login_PhonePlaceholder: String { return self._s[2979]! } - public var Channel_Members_InviteLink: String { return self._s[2981]! } - public var Bot_Stop: String { return self._s[2982]! } - public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[2984]! } - public var Notification_PassportValueAddress: String { return self._s[2985]! } - public var Month_ShortJuly: String { return self._s[2986]! } - public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[2987]! } - public var Channel_AdminLog_BanSendMedia: String { return self._s[2988]! } - public var Passport_Identity_ReverseSide: String { return self._s[2989]! } - public var Watch_Stickers_Recents: String { return self._s[2992]! } - public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[2994]! } - public var Map_SendThisLocation: String { return self._s[2995]! } + public var Stickers_GroupStickers: String { return self._s[2993]! } + public var ConvertToSupergroup_HelpTitle: String { return self._s[2995]! } + public var Passport_Address_Street: String { return self._s[2996]! } + public var Conversation_AddContact: String { return self._s[2997]! } + public var Login_PhonePlaceholder: String { return self._s[2998]! } + public var Channel_Members_InviteLink: String { return self._s[3000]! } + public var Bot_Stop: String { return self._s[3001]! } + public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[3003]! } + public var Notification_PassportValueAddress: String { return self._s[3004]! } + public var Month_ShortJuly: String { return self._s[3005]! } + public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[3006]! } + public var Channel_AdminLog_BanSendMedia: String { return self._s[3007]! } + public var Passport_Identity_ReverseSide: String { return self._s[3008]! } + public var Watch_Stickers_Recents: String { return self._s[3011]! } + public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3013]! } + public var Map_SendThisLocation: String { return self._s[3014]! } public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2996]!, self._r[2996]!, [_0]) - } - public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2997]!, self._r[2997]!, [_0]) - } - public var ConvertToSupergroup_Note: String { return self._s[2998]! } - public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[2999]!, self._r[2999]!, [_0]) - } - public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3000]! } - public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3001]!, self._r[3001]!, [_0, _1]) - } - public var Login_CallRequestState3: String { return self._s[3003]! } - public var Wallpaper_SearchShort: String { return self._s[3004]! } - public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3006]! } - public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3007]! } - public var Channel_BotDoesntSupportGroups: String { return self._s[3008]! } - public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3009]!, self._r[3009]!, [_1, _2]) - } - public var Channel_AdminLogFilter_Title: String { return self._s[3010]! } - public var Notifications_GroupNotificationsExceptions: String { return self._s[3014]! } - public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3015]!, self._r[3015]!, [_0]) } - public var Passport_CorrectErrors: String { return self._s[3016]! } + public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3016]!, self._r[3016]!, [_0]) + } + public var ConvertToSupergroup_Note: String { return self._s[3017]! } + public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3018]!, self._r[3018]!, [_0]) + } + public var NetworkUsageSettings_GeneralDataSection: String { return self._s[3019]! } + public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3020]!, self._r[3020]!, [_0, _1]) + } + public var Login_CallRequestState3: String { return self._s[3022]! } + public var Wallpaper_SearchShort: String { return self._s[3023]! } + public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[3025]! } + public var PasscodeSettings_UnlockWithFaceId: String { return self._s[3026]! } + public var Channel_BotDoesntSupportGroups: String { return self._s[3027]! } + public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3028]!, self._r[3028]!, [_1, _2]) + } + public var Channel_AdminLogFilter_Title: String { return self._s[3029]! } + public var Notifications_GroupNotificationsExceptions: String { return self._s[3033]! } + public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3034]!, self._r[3034]!, [_0]) + } + public var Passport_CorrectErrors: String { return self._s[3035]! } public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3017]!, self._r[3017]!, [_0]) + return formatWithArgumentRanges(self._s[3036]!, self._r[3036]!, [_0]) } - public var Map_SendMyCurrentLocation: String { return self._s[3018]! } - public var Channel_DiscussionGroup: String { return self._s[3019]! } + public var Map_SendMyCurrentLocation: String { return self._s[3037]! } + public var Channel_DiscussionGroup: String { return self._s[3038]! } public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3020]!, self._r[3020]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3039]!, self._r[3039]!, [_1, _2]) } - public var SharedMedia_SearchNoResults: String { return self._s[3021]! } - public var Permissions_NotificationsText_v0: String { return self._s[3022]! } - public var Appearance_AppIcon: String { return self._s[3023]! } - public var LoginPassword_FloodError: String { return self._s[3024]! } - public var Group_Setup_HistoryHiddenHelp: String { return self._s[3026]! } + public var SharedMedia_SearchNoResults: String { return self._s[3040]! } + public var Permissions_NotificationsText_v0: String { return self._s[3041]! } + public var Appearance_AppIcon: String { return self._s[3042]! } + public var LoginPassword_FloodError: String { return self._s[3043]! } + public var Group_Setup_HistoryHiddenHelp: String { return self._s[3045]! } public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3027]!, self._r[3027]!, [_0]) + return formatWithArgumentRanges(self._s[3046]!, self._r[3046]!, [_0]) } - public var Passport_Language_bn: String { return self._s[3028]! } + public var Passport_Language_bn: String { return self._s[3047]! } public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3029]!, self._r[3029]!, [_0]) + return formatWithArgumentRanges(self._s[3048]!, self._r[3048]!, [_0]) } public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3030]!, self._r[3030]!, [_0]) + return formatWithArgumentRanges(self._s[3049]!, self._r[3049]!, [_0]) } public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3031]!, self._r[3031]!, [_0]) + return formatWithArgumentRanges(self._s[3050]!, self._r[3050]!, [_0]) } - public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3034]! } - public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3036]! } - public var Contacts_PermissionsAllow: String { return self._s[3037]! } - public var ReportPeer_ReasonCopyright: String { return self._s[3038]! } - public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3039]! } - public var WallpaperPreview_Pattern: String { return self._s[3040]! } - public var Paint_Duplicate: String { return self._s[3041]! } - public var Passport_Address_Country: String { return self._s[3042]! } - public var Notification_RenamedChannel: String { return self._s[3044]! } - public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3045]! } - public var Group_MessagePhotoUpdated: String { return self._s[3046]! } - public var Channel_BanUser_PermissionSendMedia: String { return self._s[3047]! } - public var Conversation_ContextMenuBan: String { return self._s[3048]! } - public var TwoStepAuth_EmailSent: String { return self._s[3049]! } - public var MessagePoll_NoVotes: String { return self._s[3050]! } - public var Passport_Language_is: String { return self._s[3051]! } - public var PeopleNearby_UsersEmpty: String { return self._s[3053]! } - public var Tour_Text5: String { return self._s[3054]! } + public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3053]! } + public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3055]! } + public var Contacts_PermissionsAllow: String { return self._s[3056]! } + public var ReportPeer_ReasonCopyright: String { return self._s[3057]! } + public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[3058]! } + public var WallpaperPreview_Pattern: String { return self._s[3059]! } + public var Paint_Duplicate: String { return self._s[3060]! } + public var Passport_Address_Country: String { return self._s[3061]! } + public var Notification_RenamedChannel: String { return self._s[3063]! } + public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3064]! } + public var Group_MessagePhotoUpdated: String { return self._s[3065]! } + public var Channel_BanUser_PermissionSendMedia: String { return self._s[3066]! } + public var Conversation_ContextMenuBan: String { return self._s[3067]! } + public var TwoStepAuth_EmailSent: String { return self._s[3068]! } + public var MessagePoll_NoVotes: String { return self._s[3069]! } + public var Passport_Language_is: String { return self._s[3070]! } + public var PeopleNearby_UsersEmpty: String { return self._s[3072]! } + public var Tour_Text5: String { return self._s[3073]! } public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3056]!, self._r[3056]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3075]!, self._r[3075]!, [_1, _2]) } - public var Undo_SecretChatDeleted: String { return self._s[3057]! } - public var SocksProxySetup_ShareQRCode: String { return self._s[3058]! } - public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3059]! } - public var Paint_Edit: String { return self._s[3061]! } - public var Undo_DeletedGroup: String { return self._s[3064]! } - public var LoginPassword_ForgotPassword: String { return self._s[3065]! } - public var GroupInfo_GroupNamePlaceholder: String { return self._s[3066]! } + public var Undo_SecretChatDeleted: String { return self._s[3076]! } + public var SocksProxySetup_ShareQRCode: String { return self._s[3077]! } + public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3078]! } + public var Paint_Edit: String { return self._s[3080]! } + public var Undo_DeletedGroup: String { return self._s[3083]! } + public var LoginPassword_ForgotPassword: String { return self._s[3084]! } + public var GroupInfo_GroupNamePlaceholder: String { return self._s[3085]! } public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3067]!, self._r[3067]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3086]!, self._r[3086]!, [_0, _1]) } - public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3068]! } - public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3069]! } - public var Passport_Language_uz: String { return self._s[3070]! } - public var Conversation_PinMessageAlertGroup: String { return self._s[3071]! } - public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3072]! } - public var Map_StopLiveLocation: String { return self._s[3074]! } - public var PasscodeSettings_Help: String { return self._s[3076]! } - public var NotificationsSound_Input: String { return self._s[3077]! } - public var Share_Title: String { return self._s[3080]! } - public var LogoutOptions_Title: String { return self._s[3081]! } - public var Login_TermsOfServiceAgree: String { return self._s[3082]! } - public var Compose_NewEncryptedChatTitle: String { return self._s[3083]! } - public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3084]! } - public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3085]! } - public var EnterPasscode_EnterTitle: String { return self._s[3086]! } + public var Conversation_InputTextCaptionPlaceholder: String { return self._s[3087]! } + public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3088]! } + public var Passport_Language_uz: String { return self._s[3089]! } + public var Conversation_PinMessageAlertGroup: String { return self._s[3090]! } + public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[3091]! } + public var Map_StopLiveLocation: String { return self._s[3093]! } + public var PasscodeSettings_Help: String { return self._s[3095]! } + public var NotificationsSound_Input: String { return self._s[3096]! } + public var Share_Title: String { return self._s[3099]! } + public var LogoutOptions_Title: String { return self._s[3100]! } + public var Login_TermsOfServiceAgree: String { return self._s[3101]! } + public var Compose_NewEncryptedChatTitle: String { return self._s[3102]! } + public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3103]! } + public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[3104]! } + public var EnterPasscode_EnterTitle: String { return self._s[3105]! } public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3087]!, self._r[3087]!, [_0]) + return formatWithArgumentRanges(self._s[3106]!, self._r[3106]!, [_0]) } - public var Settings_CopyPhoneNumber: String { return self._s[3088]! } - public var Conversation_AddToContacts: String { return self._s[3089]! } - public var NotificationsSound_Keys: String { return self._s[3090]! } + public var Settings_CopyPhoneNumber: String { return self._s[3107]! } + public var Conversation_AddToContacts: String { return self._s[3108]! } + public var NotificationsSound_Keys: String { return self._s[3109]! } public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3091]!, self._r[3091]!, [_0]) + return formatWithArgumentRanges(self._s[3110]!, self._r[3110]!, [_0]) } - public var Notification_MessageLifetime1w: String { return self._s[3092]! } - public var Message_Video: String { return self._s[3093]! } - public var AutoDownloadSettings_CellularTitle: String { return self._s[3094]! } + public var Notification_MessageLifetime1w: String { return self._s[3111]! } + public var Message_Video: String { return self._s[3112]! } + public var AutoDownloadSettings_CellularTitle: String { return self._s[3113]! } public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3095]!, self._r[3095]!, [_1]) + return formatWithArgumentRanges(self._s[3114]!, self._r[3114]!, [_1]) } public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3098]!, self._r[3098]!, [_0]) + return formatWithArgumentRanges(self._s[3117]!, self._r[3117]!, [_0]) } public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3099]!, self._r[3099]!, [_0]) + return formatWithArgumentRanges(self._s[3118]!, self._r[3118]!, [_0]) } - public var Passport_Language_mk: String { return self._s[3100]! } - public var CreatePoll_CancelConfirmation: String { return self._s[3101]! } - public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3103]! } - public var PrivacyPolicy_Decline: String { return self._s[3104]! } - public var Passport_Identity_DoesNotExpire: String { return self._s[3105]! } - public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3106]! } - public var Permissions_SiriAllow_v0: String { return self._s[3108]! } - public var Appearance_ThemeCarouselNight: String { return self._s[3109]! } + public var Passport_Language_mk: String { return self._s[3119]! } + public var CreatePoll_CancelConfirmation: String { return self._s[3120]! } + public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3122]! } + public var PrivacyPolicy_Decline: String { return self._s[3123]! } + public var Passport_Identity_DoesNotExpire: String { return self._s[3124]! } + public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[3125]! } + public var Permissions_SiriAllow_v0: String { return self._s[3127]! } + public var Appearance_ThemeCarouselNight: String { return self._s[3128]! } public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3110]!, self._r[3110]!, [_1, "\(_2)"]) + return formatWithArgumentRanges(self._s[3129]!, self._r[3129]!, [_1, "\(_2)"]) } public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3111]!, self._r[3111]!, [_0]) + return formatWithArgumentRanges(self._s[3130]!, self._r[3130]!, [_0]) } - public var Paint_Regular: String { return self._s[3112]! } - public var ChatSettings_AutoDownloadReset: String { return self._s[3113]! } - public var SocksProxySetup_ShareLink: String { return self._s[3114]! } - public var BlockedUsers_SelectUserTitle: String { return self._s[3115]! } - public var GroupInfo_InviteByLink: String { return self._s[3117]! } - public var MessageTimer_Custom: String { return self._s[3118]! } - public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3119]! } - public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3121]! } - public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3122]! } - public var Channel_Username_InvalidTaken: String { return self._s[3123]! } - public var Conversation_ClousStorageInfo_Description3: String { return self._s[3124]! } - public var Settings_ChatBackground: String { return self._s[3125]! } - public var Channel_Subscribers_Title: String { return self._s[3126]! } - public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3127]! } - public var Watch_ConnectionDescription: String { return self._s[3128]! } - public var ChatList_ArchivedChatsTitle: String { return self._s[3132]! } - public var Wallpaper_ResetWallpapers: String { return self._s[3133]! } - public var EditProfile_Title: String { return self._s[3134]! } - public var NotificationsSound_Bamboo: String { return self._s[3136]! } - public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3138]! } - public var Login_SmsRequestState2: String { return self._s[3139]! } - public var Passport_Language_ar: String { return self._s[3140]! } + public var Paint_Regular: String { return self._s[3131]! } + public var ChatSettings_AutoDownloadReset: String { return self._s[3132]! } + public var SocksProxySetup_ShareLink: String { return self._s[3133]! } + public var BlockedUsers_SelectUserTitle: String { return self._s[3134]! } + public var GroupInfo_InviteByLink: String { return self._s[3136]! } + public var MessageTimer_Custom: String { return self._s[3137]! } + public var UserInfo_NotificationsDefaultEnabled: String { return self._s[3138]! } + public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3140]! } + public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[3141]! } + public var Channel_Username_InvalidTaken: String { return self._s[3142]! } + public var Conversation_ClousStorageInfo_Description3: String { return self._s[3143]! } + public var Settings_ChatBackground: String { return self._s[3144]! } + public var Channel_Subscribers_Title: String { return self._s[3145]! } + public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[3146]! } + public var Watch_ConnectionDescription: String { return self._s[3147]! } + public var ChatList_ArchivedChatsTitle: String { return self._s[3151]! } + public var Wallpaper_ResetWallpapers: String { return self._s[3152]! } + public var EditProfile_Title: String { return self._s[3153]! } + public var NotificationsSound_Bamboo: String { return self._s[3155]! } + public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[3157]! } + public var Login_SmsRequestState2: String { return self._s[3158]! } + public var Passport_Language_ar: String { return self._s[3159]! } public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3141]!, self._r[3141]!, [_0]) + return formatWithArgumentRanges(self._s[3160]!, self._r[3160]!, [_0]) } - public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3142]! } - public var Conversation_MessageDialogEdit: String { return self._s[3143]! } + public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[3161]! } + public var Conversation_MessageDialogEdit: String { return self._s[3162]! } public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3144]!, self._r[3144]!, [_1]) + return formatWithArgumentRanges(self._s[3163]!, self._r[3163]!, [_1]) } - public var Common_Close: String { return self._s[3145]! } - public var GroupInfo_PublicLink: String { return self._s[3146]! } - public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3147]! } - public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3148]! } + public var Common_Close: String { return self._s[3164]! } + public var GroupInfo_PublicLink: String { return self._s[3165]! } + public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[3166]! } + public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[3167]! } public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3152]!, self._r[3152]!, [_0]) + return formatWithArgumentRanges(self._s[3171]!, self._r[3171]!, [_0]) } - public var UserInfo_About_Placeholder: String { return self._s[3153]! } + public var UserInfo_About_Placeholder: String { return self._s[3172]! } public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3154]!, self._r[3154]!, [_0]) + return formatWithArgumentRanges(self._s[3173]!, self._r[3173]!, [_0]) } - public var GroupInfo_Permissions_SectionTitle: String { return self._s[3155]! } - public var Channel_Info_Banned: String { return self._s[3157]! } + public var GroupInfo_Permissions_SectionTitle: String { return self._s[3174]! } + public var Channel_Info_Banned: String { return self._s[3176]! } public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3158]!, self._r[3158]!, [_0]) + return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_0]) } - public var Appearance_Other: String { return self._s[3159]! } - public var Passport_Language_my: String { return self._s[3160]! } - public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3161]! } + public var Appearance_Other: String { return self._s[3178]! } + public var Passport_Language_my: String { return self._s[3179]! } + public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3180]! } public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3162]!, self._r[3162]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3181]!, self._r[3181]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3163]! } - public var Preview_CopyAddress: String { return self._s[3164]! } + public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[3182]! } + public var Preview_CopyAddress: String { return self._s[3183]! } public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3165]!, self._r[3165]!, [_0]) + return formatWithArgumentRanges(self._s[3184]!, self._r[3184]!, [_0]) } - public var KeyCommand_JumpToPreviousChat: String { return self._s[3166]! } - public var UserInfo_BotSettings: String { return self._s[3167]! } - public var LiveLocation_MenuStopAll: String { return self._s[3169]! } - public var Passport_PasswordCreate: String { return self._s[3170]! } - public var StickerSettings_MaskContextInfo: String { return self._s[3171]! } - public var Message_PinnedLocationMessage: String { return self._s[3172]! } - public var Map_Satellite: String { return self._s[3173]! } - public var Watch_Message_Unsupported: String { return self._s[3174]! } - public var Username_TooManyPublicUsernamesError: String { return self._s[3175]! } - public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3176]! } + public var KeyCommand_JumpToPreviousChat: String { return self._s[3185]! } + public var UserInfo_BotSettings: String { return self._s[3186]! } + public var LiveLocation_MenuStopAll: String { return self._s[3188]! } + public var Passport_PasswordCreate: String { return self._s[3189]! } + public var StickerSettings_MaskContextInfo: String { return self._s[3190]! } + public var Message_PinnedLocationMessage: String { return self._s[3191]! } + public var Map_Satellite: String { return self._s[3192]! } + public var Watch_Message_Unsupported: String { return self._s[3193]! } + public var Username_TooManyPublicUsernamesError: String { return self._s[3194]! } + public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[3195]! } public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3177]!, self._r[3177]!, [_0, _1]) + return formatWithArgumentRanges(self._s[3196]!, self._r[3196]!, [_0, _1]) } public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3178]!, self._r[3178]!, [_0]) - } - public var Notifications_ChannelNotificationsHelp: String { return self._s[3179]! } - public var Privacy_Calls_P2PContacts: String { return self._s[3180]! } - public var NotificationsSound_None: String { return self._s[3181]! } - public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3183]! } - public var AccessDenied_VoiceMicrophone: String { return self._s[3184]! } - public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3185]!, self._r[3185]!, [_1]) - } - public var Cache_Indexing: String { return self._s[3186]! } - public var DialogList_RecentTitlePeople: String { return self._s[3188]! } - public var DialogList_EncryptionRejected: String { return self._s[3189]! } - public var GroupInfo_Administrators: String { return self._s[3190]! } - public var Passport_ScanPassportHelp: String { return self._s[3191]! } - public var Application_Name: String { return self._s[3192]! } - public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3193]! } - public var Appearance_ThemeCarouselDay: String { return self._s[3195]! } - public var Passport_Identity_TranslationHelp: String { return self._s[3196]! } - public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3197]!, self._r[3197]!, [_0]) } + public var Notifications_ChannelNotificationsHelp: String { return self._s[3198]! } + public var Privacy_Calls_P2PContacts: String { return self._s[3199]! } + public var NotificationsSound_None: String { return self._s[3200]! } + public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[3202]! } + public var AccessDenied_VoiceMicrophone: String { return self._s[3203]! } + public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3204]!, self._r[3204]!, [_1]) + } + public var Cache_Indexing: String { return self._s[3205]! } + public var DialogList_RecentTitlePeople: String { return self._s[3207]! } + public var DialogList_EncryptionRejected: String { return self._s[3208]! } + public var GroupInfo_Administrators: String { return self._s[3209]! } + public var Passport_ScanPassportHelp: String { return self._s[3210]! } + public var Application_Name: String { return self._s[3211]! } + public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[3212]! } + public var Appearance_ThemeCarouselDay: String { return self._s[3214]! } + public var Passport_Identity_TranslationHelp: String { return self._s[3215]! } + public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3216]!, self._r[3216]!, [_0]) + } public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3198]!, self._r[3198]!, [_0]) + return formatWithArgumentRanges(self._s[3217]!, self._r[3217]!, [_0]) } - public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3199]! } - public var Privacy_ChatsTitle: String { return self._s[3200]! } - public var DialogList_ClearHistoryConfirmation: String { return self._s[3201]! } - public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3202]! } - public var Watch_Suggestion_HoldOn: String { return self._s[3203]! } - public var Group_EditAdmin_TransferOwnership: String { return self._s[3204]! } - public var Group_LinkedChannel: String { return self._s[3205]! } - public var SocksProxySetup_RequiredCredentials: String { return self._s[3206]! } - public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3207]! } - public var TwoStepAuth_EmailSkipAlert: String { return self._s[3208]! } - public var Channel_Setup_TypePublic: String { return self._s[3211]! } + public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3218]! } + public var Privacy_ChatsTitle: String { return self._s[3219]! } + public var DialogList_ClearHistoryConfirmation: String { return self._s[3220]! } + public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[3221]! } + public var Watch_Suggestion_HoldOn: String { return self._s[3222]! } + public var Group_EditAdmin_TransferOwnership: String { return self._s[3223]! } + public var Group_LinkedChannel: String { return self._s[3224]! } + public var SocksProxySetup_RequiredCredentials: String { return self._s[3225]! } + public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[3226]! } + public var TwoStepAuth_EmailSkipAlert: String { return self._s[3227]! } + public var Channel_Setup_TypePublic: String { return self._s[3230]! } public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3212]!, self._r[3212]!, [_0]) + return formatWithArgumentRanges(self._s[3231]!, self._r[3231]!, [_0]) } - public var Channel_TypeSetup_Title: String { return self._s[3214]! } - public var Map_OpenInMaps: String { return self._s[3216]! } + public var Channel_TypeSetup_Title: String { return self._s[3233]! } + public var Map_OpenInMaps: String { return self._s[3235]! } public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3217]!, self._r[3217]!, [_1]) + return formatWithArgumentRanges(self._s[3236]!, self._r[3236]!, [_1]) } - public var NotificationsSound_Tremolo: String { return self._s[3219]! } + public var NotificationsSound_Tremolo: String { return self._s[3238]! } public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3220]!, self._r[3220]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3239]!, self._r[3239]!, [_1, _2, _3]) } - public var ConversationProfile_UnknownAddMemberError: String { return self._s[3221]! } - public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3222]! } - public var Passport_PasswordHelp: String { return self._s[3223]! } - public var Login_CodeExpiredError: String { return self._s[3224]! } - public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3225]! } - public var Conversation_TitleUnmute: String { return self._s[3226]! } - public var Passport_Identity_ScansHelp: String { return self._s[3227]! } - public var Passport_Language_lo: String { return self._s[3228]! } - public var Camera_FlashAuto: String { return self._s[3229]! } - public var Conversation_OpenBotLinkOpen: String { return self._s[3230]! } - public var Common_Cancel: String { return self._s[3231]! } - public var DialogList_SavedMessagesTooltip: String { return self._s[3232]! } - public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3233]! } - public var Appearance_TintAllColors: String { return self._s[3234]! } + public var ConversationProfile_UnknownAddMemberError: String { return self._s[3240]! } + public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3241]! } + public var Passport_PasswordHelp: String { return self._s[3242]! } + public var Login_CodeExpiredError: String { return self._s[3243]! } + public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[3244]! } + public var Conversation_TitleUnmute: String { return self._s[3245]! } + public var Passport_Identity_ScansHelp: String { return self._s[3246]! } + public var Passport_Language_lo: String { return self._s[3247]! } + public var Camera_FlashAuto: String { return self._s[3248]! } + public var Conversation_OpenBotLinkOpen: String { return self._s[3249]! } + public var Common_Cancel: String { return self._s[3250]! } + public var DialogList_SavedMessagesTooltip: String { return self._s[3251]! } + public var TwoStepAuth_SetupPasswordTitle: String { return self._s[3252]! } + public var Appearance_TintAllColors: String { return self._s[3253]! } public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3235]!, self._r[3235]!, [_1]) + return formatWithArgumentRanges(self._s[3254]!, self._r[3254]!, [_1]) } - public var Conversation_ReportSpamConfirmation: String { return self._s[3236]! } - public var ChatSettings_Title: String { return self._s[3238]! } - public var Passport_PasswordReset: String { return self._s[3239]! } - public var SocksProxySetup_TypeNone: String { return self._s[3240]! } - public var PhoneNumberHelp_Help: String { return self._s[3242]! } - public var Checkout_EnterPassword: String { return self._s[3243]! } - public var Share_AuthTitle: String { return self._s[3245]! } - public var Activity_UploadingDocument: String { return self._s[3246]! } - public var State_Connecting: String { return self._s[3247]! } - public var Profile_MessageLifetime1w: String { return self._s[3248]! } - public var Conversation_ContextMenuReport: String { return self._s[3249]! } - public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3250]! } - public var AutoNightTheme_ScheduledTo: String { return self._s[3251]! } - public var AuthSessions_Terminate: String { return self._s[3252]! } - public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3253]! } - public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3254]! } - public var PhotoEditor_Set: String { return self._s[3255]! } - public var EmptyGroupInfo_Title: String { return self._s[3256]! } - public var Login_PadPhoneHelp: String { return self._s[3257]! } - public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3259]! } - public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3261]! } - public var NotificationsSound_Complete: String { return self._s[3262]! } - public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3263]! } - public var Group_Info_AdminLog: String { return self._s[3264]! } - public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3265]! } - public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3266]! } - public var Conversation_Admin: String { return self._s[3268]! } - public var Conversation_GifTooltip: String { return self._s[3269]! } - public var Passport_NotLoggedInMessage: String { return self._s[3270]! } + public var Conversation_ReportSpamConfirmation: String { return self._s[3255]! } + public var ChatSettings_Title: String { return self._s[3257]! } + public var Passport_PasswordReset: String { return self._s[3258]! } + public var SocksProxySetup_TypeNone: String { return self._s[3259]! } + public var PhoneNumberHelp_Help: String { return self._s[3261]! } + public var Checkout_EnterPassword: String { return self._s[3262]! } + public var Share_AuthTitle: String { return self._s[3264]! } + public var Activity_UploadingDocument: String { return self._s[3265]! } + public var State_Connecting: String { return self._s[3266]! } + public var Profile_MessageLifetime1w: String { return self._s[3267]! } + public var Conversation_ContextMenuReport: String { return self._s[3268]! } + public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3269]! } + public var AutoNightTheme_ScheduledTo: String { return self._s[3270]! } + public var AuthSessions_Terminate: String { return self._s[3271]! } + public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3272]! } + public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[3273]! } + public var PhotoEditor_Set: String { return self._s[3274]! } + public var EmptyGroupInfo_Title: String { return self._s[3275]! } + public var Login_PadPhoneHelp: String { return self._s[3276]! } + public var AutoDownloadSettings_TypeGroupChats: String { return self._s[3278]! } + public var PrivacyPolicy_DeclineLastWarning: String { return self._s[3280]! } + public var NotificationsSound_Complete: String { return self._s[3281]! } + public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[3282]! } + public var Group_Info_AdminLog: String { return self._s[3283]! } + public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[3284]! } + public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[3285]! } + public var Conversation_Admin: String { return self._s[3287]! } + public var Conversation_GifTooltip: String { return self._s[3288]! } + public var Passport_NotLoggedInMessage: String { return self._s[3289]! } public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3271]!, self._r[3271]!, [_0]) - } - public var Profile_MessageLifetimeForever: String { return self._s[3272]! } - public var SharedMedia_EmptyTitle: String { return self._s[3274]! } - public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3276]! } - public var Username_Help: String { return self._s[3277]! } - public var DialogList_LanguageTooltip: String { return self._s[3279]! } - public var Map_LoadError: String { return self._s[3280]! } - public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3281]! } - public var Channel_AdminLog_AddMembers: String { return self._s[3282]! } - public var ArchivedChats_IntroTitle2: String { return self._s[3283]! } - public var Notification_Exceptions_NewException: String { return self._s[3284]! } - public var TwoStepAuth_EmailTitle: String { return self._s[3285]! } - public var WatchRemote_AlertText: String { return self._s[3286]! } - public var ChatSettings_ConnectionType_Title: String { return self._s[3289]! } - public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3290]!, self._r[3290]!, [_0]) } - public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3291]! } - public var Passport_Address_CountryPlaceholder: String { return self._s[3292]! } + public var Profile_MessageLifetimeForever: String { return self._s[3291]! } + public var SharedMedia_EmptyTitle: String { return self._s[3293]! } + public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[3295]! } + public var Username_Help: String { return self._s[3296]! } + public var DialogList_LanguageTooltip: String { return self._s[3298]! } + public var Map_LoadError: String { return self._s[3299]! } + public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3300]! } + public var Channel_AdminLog_AddMembers: String { return self._s[3301]! } + public var ArchivedChats_IntroTitle2: String { return self._s[3302]! } + public var Notification_Exceptions_NewException: String { return self._s[3303]! } + public var TwoStepAuth_EmailTitle: String { return self._s[3304]! } + public var WatchRemote_AlertText: String { return self._s[3305]! } + public var ChatSettings_ConnectionType_Title: String { return self._s[3308]! } + public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3309]!, self._r[3309]!, [_0]) + } + public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3310]! } + public var Passport_Address_CountryPlaceholder: String { return self._s[3311]! } public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3293]!, self._r[3293]!, [_0]) + return formatWithArgumentRanges(self._s[3312]!, self._r[3312]!, [_0]) } public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3294]!, self._r[3294]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3313]!, self._r[3313]!, [_1, _2, _3]) } - public var Group_AdminLog_EmptyText: String { return self._s[3295]! } - public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3296]! } - public var Conversation_PrivateChannelTooltip: String { return self._s[3298]! } - public var ChatList_UndoArchiveText1: String { return self._s[3299]! } - public var AccessDenied_VideoMicrophone: String { return self._s[3300]! } - public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3301]! } - public var Cache_ClearNone: String { return self._s[3302]! } - public var SocksProxySetup_FailedToConnect: String { return self._s[3303]! } - public var Permissions_NotificationsTitle_v0: String { return self._s[3304]! } + public var Group_AdminLog_EmptyText: String { return self._s[3314]! } + public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[3315]! } + public var Conversation_PrivateChannelTooltip: String { return self._s[3317]! } + public var ChatList_UndoArchiveText1: String { return self._s[3318]! } + public var AccessDenied_VideoMicrophone: String { return self._s[3319]! } + public var Conversation_ContextMenuStickerPackAdd: String { return self._s[3320]! } + public var Cache_ClearNone: String { return self._s[3321]! } + public var SocksProxySetup_FailedToConnect: String { return self._s[3322]! } + public var Permissions_NotificationsTitle_v0: String { return self._s[3323]! } public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3305]!, self._r[3305]!, [_0]) + return formatWithArgumentRanges(self._s[3324]!, self._r[3324]!, [_0]) } - public var Passport_Identity_Country: String { return self._s[3306]! } + public var Passport_Identity_Country: String { return self._s[3325]! } public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3307]!, self._r[3307]!, [_0]) + return formatWithArgumentRanges(self._s[3326]!, self._r[3326]!, [_0]) } public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3308]!, self._r[3308]!, [_0]) + return formatWithArgumentRanges(self._s[3327]!, self._r[3327]!, [_0]) } - public var Exceptions_AddToExceptions: String { return self._s[3309]! } - public var AccessDenied_Settings: String { return self._s[3310]! } - public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3311]! } - public var Month_ShortMay: String { return self._s[3312]! } - public var Compose_NewGroup: String { return self._s[3313]! } - public var Group_Setup_TypePrivate: String { return self._s[3315]! } - public var Login_PadPhoneHelpTitle: String { return self._s[3317]! } - public var Appearance_ThemeDayClassic: String { return self._s[3318]! } - public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3319]! } - public var AutoDownloadSettings_OffForAll: String { return self._s[3320]! } - public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3321]! } - public var Conversation_typing: String { return self._s[3323]! } - public var Paint_Masks: String { return self._s[3324]! } - public var Contacts_DeselectAll: String { return self._s[3325]! } - public var Username_InvalidTaken: String { return self._s[3326]! } - public var Call_StatusNoAnswer: String { return self._s[3327]! } - public var TwoStepAuth_EmailAddSuccess: String { return self._s[3328]! } - public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3329]! } - public var Passport_Identity_Selfie: String { return self._s[3330]! } - public var Login_InfoLastNamePlaceholder: String { return self._s[3331]! } - public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3332]! } - public var Conversation_ClearSecretHistory: String { return self._s[3333]! } - public var PeopleNearby_Description: String { return self._s[3335]! } - public var NetworkUsageSettings_Title: String { return self._s[3336]! } - public var Your_cards_security_code_is_invalid: String { return self._s[3338]! } + public var Exceptions_AddToExceptions: String { return self._s[3328]! } + public var AccessDenied_Settings: String { return self._s[3329]! } + public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[3330]! } + public var Month_ShortMay: String { return self._s[3331]! } + public var Compose_NewGroup: String { return self._s[3332]! } + public var Group_Setup_TypePrivate: String { return self._s[3334]! } + public var Login_PadPhoneHelpTitle: String { return self._s[3336]! } + public var Appearance_ThemeDayClassic: String { return self._s[3337]! } + public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[3338]! } + public var AutoDownloadSettings_OffForAll: String { return self._s[3339]! } + public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3340]! } + public var Conversation_typing: String { return self._s[3342]! } + public var Paint_Masks: String { return self._s[3343]! } + public var Contacts_DeselectAll: String { return self._s[3344]! } + public var Username_InvalidTaken: String { return self._s[3345]! } + public var Call_StatusNoAnswer: String { return self._s[3346]! } + public var TwoStepAuth_EmailAddSuccess: String { return self._s[3347]! } + public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[3348]! } + public var Passport_Identity_Selfie: String { return self._s[3349]! } + public var Login_InfoLastNamePlaceholder: String { return self._s[3350]! } + public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[3351]! } + public var Conversation_ClearSecretHistory: String { return self._s[3352]! } + public var PeopleNearby_Description: String { return self._s[3354]! } + public var NetworkUsageSettings_Title: String { return self._s[3355]! } + public var Your_cards_security_code_is_invalid: String { return self._s[3357]! } public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3340]!, self._r[3340]!, [_0]) + return formatWithArgumentRanges(self._s[3359]!, self._r[3359]!, [_0]) } public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3341]!, self._r[3341]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3360]!, self._r[3360]!, [_1, _2]) } - public var SaveIncomingPhotosSettings_From: String { return self._s[3343]! } - public var Map_LiveLocationTitle: String { return self._s[3344]! } - public var Login_InfoAvatarAdd: String { return self._s[3345]! } - public var Passport_Identity_FilesView: String { return self._s[3346]! } - public var UserInfo_GenericPhoneLabel: String { return self._s[3347]! } - public var Privacy_Calls_NeverAllow: String { return self._s[3348]! } + public var SaveIncomingPhotosSettings_From: String { return self._s[3362]! } + public var Map_LiveLocationTitle: String { return self._s[3363]! } + public var Login_InfoAvatarAdd: String { return self._s[3364]! } + public var Passport_Identity_FilesView: String { return self._s[3365]! } + public var UserInfo_GenericPhoneLabel: String { return self._s[3366]! } + public var Privacy_Calls_NeverAllow: String { return self._s[3367]! } public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3349]!, self._r[3349]!, [_0]) + return formatWithArgumentRanges(self._s[3368]!, self._r[3368]!, [_0]) } - public var ContactInfo_PhoneNumberHidden: String { return self._s[3350]! } - public var TwoStepAuth_ConfirmationText: String { return self._s[3351]! } - public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3352]! } + public var ContactInfo_PhoneNumberHidden: String { return self._s[3369]! } + public var TwoStepAuth_ConfirmationText: String { return self._s[3370]! } + public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[3371]! } public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3353]!, self._r[3353]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3372]!, self._r[3372]!, [_1, _2, _3]) } - public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3354]! } - public var Tour_Title2: String { return self._s[3355]! } - public var Conversation_FileOpenIn: String { return self._s[3356]! } - public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3357]! } - public var Wallpaper_Set: String { return self._s[3358]! } - public var Passport_Identity_Translations: String { return self._s[3360]! } + public var Channel_AdminLogFilter_AdminsAll: String { return self._s[3373]! } + public var Tour_Title2: String { return self._s[3374]! } + public var Conversation_FileOpenIn: String { return self._s[3375]! } + public var Checkout_ErrorPrecheckoutFailed: String { return self._s[3376]! } + public var Wallpaper_Set: String { return self._s[3377]! } + public var Passport_Identity_Translations: String { return self._s[3379]! } public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3361]!, self._r[3361]!, [_0]) + return formatWithArgumentRanges(self._s[3380]!, self._r[3380]!, [_0]) } - public var Channel_LeaveChannel: String { return self._s[3362]! } + public var Channel_LeaveChannel: String { return self._s[3381]! } public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3363]!, self._r[3363]!, [_1]) + return formatWithArgumentRanges(self._s[3382]!, self._r[3382]!, [_1]) } - public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3364]! } - public var PhotoEditor_HighlightsTint: String { return self._s[3365]! } - public var Passport_Email_Delete: String { return self._s[3366]! } - public var Conversation_Mute: String { return self._s[3368]! } - public var Channel_AddBotAsAdmin: String { return self._s[3369]! } - public var Channel_AdminLog_CanSendMessages: String { return self._s[3371]! } - public var Channel_Management_LabelOwner: String { return self._s[3373]! } + public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[3383]! } + public var PhotoEditor_HighlightsTint: String { return self._s[3384]! } + public var Passport_Email_Delete: String { return self._s[3385]! } + public var Conversation_Mute: String { return self._s[3387]! } + public var Channel_AddBotAsAdmin: String { return self._s[3388]! } + public var Channel_AdminLog_CanSendMessages: String { return self._s[3390]! } + public var Channel_Management_LabelOwner: String { return self._s[3392]! } public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3374]!, self._r[3374]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3393]!, self._r[3393]!, [_1, _2]) } - public var Calls_CallTabDescription: String { return self._s[3375]! } - public var Passport_Identity_NativeNameHelp: String { return self._s[3376]! } - public var Common_No: String { return self._s[3377]! } - public var Weekday_Sunday: String { return self._s[3378]! } - public var Notification_Reply: String { return self._s[3379]! } - public var Conversation_ViewMessage: String { return self._s[3380]! } + public var Calls_CallTabDescription: String { return self._s[3394]! } + public var Passport_Identity_NativeNameHelp: String { return self._s[3395]! } + public var Common_No: String { return self._s[3396]! } + public var Weekday_Sunday: String { return self._s[3397]! } + public var Notification_Reply: String { return self._s[3398]! } + public var Conversation_ViewMessage: String { return self._s[3399]! } public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3381]!, self._r[3381]!, [_0]) + return formatWithArgumentRanges(self._s[3400]!, self._r[3400]!, [_0]) } public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3382]!, self._r[3382]!, [_0]) - } - public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3383]! } - public var Message_PinnedDocumentMessage: String { return self._s[3384]! } - public var DialogList_TabTitle: String { return self._s[3386]! } - public var ChatSettings_AutoPlayTitle: String { return self._s[3387]! } - public var Passport_FieldEmail: String { return self._s[3388]! } - public var Conversation_UnpinMessageAlert: String { return self._s[3389]! } - public var Passport_Address_TypeBankStatement: String { return self._s[3390]! } - public var Passport_Identity_ExpiryDate: String { return self._s[3391]! } - public var Privacy_Calls_P2P: String { return self._s[3392]! } - public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3394]!, self._r[3394]!, [_0]) - } - public var SocksProxySetup_UseForCallsHelp: String { return self._s[3395]! } - public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3396]!, self._r[3396]!, [_1, _2]) - } - public var Stickers_ClearRecent: String { return self._s[3397]! } - public var EnterPasscode_ChangeTitle: String { return self._s[3398]! } - public var Passport_InfoText: String { return self._s[3399]! } - public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3400]! } - public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3401]!, self._r[3401]!, [_0]) } + public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[3402]! } + public var Message_PinnedDocumentMessage: String { return self._s[3403]! } + public var DialogList_TabTitle: String { return self._s[3405]! } + public var ChatSettings_AutoPlayTitle: String { return self._s[3406]! } + public var Passport_FieldEmail: String { return self._s[3407]! } + public var Conversation_UnpinMessageAlert: String { return self._s[3408]! } + public var Passport_Address_TypeBankStatement: String { return self._s[3409]! } + public var Passport_Identity_ExpiryDate: String { return self._s[3410]! } + public var Privacy_Calls_P2P: String { return self._s[3411]! } + public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3413]!, self._r[3413]!, [_0]) + } + public var SocksProxySetup_UseForCallsHelp: String { return self._s[3414]! } + public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3415]!, self._r[3415]!, [_1, _2]) + } + public var Stickers_ClearRecent: String { return self._s[3416]! } + public var EnterPasscode_ChangeTitle: String { return self._s[3417]! } + public var Passport_InfoText: String { return self._s[3418]! } + public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[3419]! } + public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3420]!, self._r[3420]!, [_0]) + } public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3402]!, self._r[3402]!, [_1, _2, _3]) + return formatWithArgumentRanges(self._s[3421]!, self._r[3421]!, [_1, _2, _3]) } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3403]! } - public var Passport_Identity_EditDriversLicense: String { return self._s[3404]! } - public var Conversation_TapAndHoldToRecord: String { return self._s[3406]! } - public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3407]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[3422]! } + public var Passport_Identity_EditDriversLicense: String { return self._s[3423]! } + public var Conversation_TapAndHoldToRecord: String { return self._s[3425]! } + public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[3426]! } public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3408]!, self._r[3408]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3427]!, self._r[3427]!, [_1, _2]) } - public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3410]! } + public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3429]! } public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3412]!, self._r[3412]!, [_0]) + return formatWithArgumentRanges(self._s[3431]!, self._r[3431]!, [_0]) } - public var DialogList_Unread: String { return self._s[3413]! } + public var DialogList_Unread: String { return self._s[3432]! } public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3414]!, self._r[3414]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3433]!, self._r[3433]!, [_1, _2]) } - public var User_DeletedAccount: String { return self._s[3415]! } - public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3416]! } + public var User_DeletedAccount: String { return self._s[3434]! } + public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[3435]! } public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3417]!, self._r[3417]!, [_0]) + return formatWithArgumentRanges(self._s[3436]!, self._r[3436]!, [_0]) } - public var UserInfo_NotificationsDefault: String { return self._s[3418]! } - public var SharedMedia_CategoryMedia: String { return self._s[3419]! } - public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3420]! } - public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3421]! } - public var Watch_ChatList_Compose: String { return self._s[3422]! } - public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3423]! } - public var AutoDownloadSettings_Delimeter: String { return self._s[3424]! } - public var Watch_Microphone_Access: String { return self._s[3425]! } - public var Group_Setup_HistoryHeader: String { return self._s[3426]! } - public var Map_SetThisLocation: String { return self._s[3427]! } - public var Activity_UploadingPhoto: String { return self._s[3428]! } - public var Conversation_Edit: String { return self._s[3430]! } - public var Group_ErrorSendRestrictedMedia: String { return self._s[3431]! } - public var Login_TermsOfServiceDecline: String { return self._s[3432]! } - public var Message_PinnedContactMessage: String { return self._s[3433]! } + public var UserInfo_NotificationsDefault: String { return self._s[3437]! } + public var SharedMedia_CategoryMedia: String { return self._s[3438]! } + public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[3439]! } + public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[3440]! } + public var Watch_ChatList_Compose: String { return self._s[3441]! } + public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[3442]! } + public var AutoDownloadSettings_Delimeter: String { return self._s[3443]! } + public var Watch_Microphone_Access: String { return self._s[3444]! } + public var Group_Setup_HistoryHeader: String { return self._s[3445]! } + public var Map_SetThisLocation: String { return self._s[3446]! } + public var Activity_UploadingPhoto: String { return self._s[3447]! } + public var Conversation_Edit: String { return self._s[3449]! } + public var Group_ErrorSendRestrictedMedia: String { return self._s[3450]! } + public var Login_TermsOfServiceDecline: String { return self._s[3451]! } + public var Message_PinnedContactMessage: String { return self._s[3452]! } public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3434]!, self._r[3434]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3453]!, self._r[3453]!, [_1, _2]) } public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3435]!, self._r[3435]!, [_1, _2, _3, _4, _5]) + return formatWithArgumentRanges(self._s[3454]!, self._r[3454]!, [_1, _2, _3, _4, _5]) } - public var Appearance_LargeEmoji: String { return self._s[3436]! } - public var TwoStepAuth_AdditionalPassword: String { return self._s[3438]! } + public var Appearance_LargeEmoji: String { return self._s[3455]! } + public var TwoStepAuth_AdditionalPassword: String { return self._s[3457]! } public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3439]!, self._r[3439]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3458]!, self._r[3458]!, [_1, _2]) } - public var Passport_Phone_EnterOtherNumber: String { return self._s[3440]! } - public var Message_PinnedPhotoMessage: String { return self._s[3441]! } - public var Passport_FieldPhone: String { return self._s[3442]! } - public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3443]! } - public var ChatSettings_AutoPlayGifs: String { return self._s[3444]! } - public var InfoPlist_NSCameraUsageDescription: String { return self._s[3446]! } - public var Conversation_Call: String { return self._s[3447]! } - public var Common_TakePhoto: String { return self._s[3449]! } - public var Channel_NotificationLoading: String { return self._s[3450]! } + public var Passport_Phone_EnterOtherNumber: String { return self._s[3459]! } + public var Message_PinnedPhotoMessage: String { return self._s[3460]! } + public var Passport_FieldPhone: String { return self._s[3461]! } + public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[3462]! } + public var ChatSettings_AutoPlayGifs: String { return self._s[3463]! } + public var InfoPlist_NSCameraUsageDescription: String { return self._s[3465]! } + public var Conversation_Call: String { return self._s[3466]! } + public var Common_TakePhoto: String { return self._s[3468]! } + public var Group_EditAdmin_RankTitle: String { return self._s[3469]! } + public var Channel_NotificationLoading: String { return self._s[3470]! } public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3451]!, self._r[3451]!, [_0]) - } - public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3452]!, self._r[3452]!, [_1]) - } - public var Permissions_SiriTitle_v0: String { return self._s[3453]! } - public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3454]!, self._r[3454]!, [_0]) - } - public var Channel_MessagePhotoRemoved: String { return self._s[3455]! } - public var Common_edit: String { return self._s[3456]! } - public var PrivacySettings_AuthSessions: String { return self._s[3457]! } - public var Month_ShortJune: String { return self._s[3458]! } - public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3459]! } - public var Call_ReportSend: String { return self._s[3460]! } - public var Watch_LastSeen_JustNow: String { return self._s[3461]! } - public var Notifications_MessageNotifications: String { return self._s[3462]! } - public var WallpaperSearch_ColorGreen: String { return self._s[3463]! } - public var BroadcastListInfo_AddRecipient: String { return self._s[3465]! } - public var Group_Status: String { return self._s[3466]! } - public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3467]!, self._r[3467]!, [_0, _1]) - } - public var TextFormat_AddLinkTitle: String { return self._s[3468]! } - public var ShareMenu_ShareTo: String { return self._s[3469]! } - public var Conversation_Moderate_Ban: String { return self._s[3470]! } - public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { return formatWithArgumentRanges(self._s[3471]!, self._r[3471]!, [_0]) } - public var SharedMedia_ViewInChat: String { return self._s[3472]! } - public var Map_LiveLocationFor8Hours: String { return self._s[3473]! } + public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3472]!, self._r[3472]!, [_1]) + } + public var Permissions_SiriTitle_v0: String { return self._s[3473]! } + public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_0]) + } + public var Channel_MessagePhotoRemoved: String { return self._s[3475]! } + public var Common_edit: String { return self._s[3476]! } + public var PrivacySettings_AuthSessions: String { return self._s[3477]! } + public var Month_ShortJune: String { return self._s[3478]! } + public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[3479]! } + public var Call_ReportSend: String { return self._s[3480]! } + public var Watch_LastSeen_JustNow: String { return self._s[3481]! } + public var Notifications_MessageNotifications: String { return self._s[3482]! } + public var WallpaperSearch_ColorGreen: String { return self._s[3483]! } + public var BroadcastListInfo_AddRecipient: String { return self._s[3485]! } + public var Group_Status: String { return self._s[3486]! } + public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3487]!, self._r[3487]!, [_0, _1]) + } + public var TextFormat_AddLinkTitle: String { return self._s[3488]! } + public var ShareMenu_ShareTo: String { return self._s[3489]! } + public var Conversation_Moderate_Ban: String { return self._s[3490]! } + public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) { + return formatWithArgumentRanges(self._s[3491]!, self._r[3491]!, [_0]) + } + public var SharedMedia_ViewInChat: String { return self._s[3492]! } + public var Map_LiveLocationFor8Hours: String { return self._s[3493]! } public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3474]!, self._r[3474]!, [_1]) + return formatWithArgumentRanges(self._s[3494]!, self._r[3494]!, [_1]) } public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3475]!, self._r[3475]!, [_1, _2]) + return formatWithArgumentRanges(self._s[3495]!, self._r[3495]!, [_1, _2]) } public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3477]!, self._r[3477]!, [_0]) + return formatWithArgumentRanges(self._s[3497]!, self._r[3497]!, [_0]) } - public var Map_OpenInHereMaps: String { return self._s[3478]! } - public var Appearance_ReduceMotion: String { return self._s[3479]! } + public var Map_OpenInHereMaps: String { return self._s[3498]! } + public var Appearance_ReduceMotion: String { return self._s[3499]! } public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) { - return formatWithArgumentRanges(self._s[3480]!, self._r[3480]!, [_1, _2]) - } - public var Channel_Setup_TypePublicHelp: String { return self._s[3481]! } - public var Passport_Identity_EditInternalPassport: String { return self._s[3482]! } - public var PhotoEditor_Skip: String { return self._s[3483]! } - public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func SharedMedia_Link(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Media_ShareVideo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Hours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAMinutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ChatList_DeleteConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) + return formatWithArgumentRanges(self._s[3500]!, self._r[3500]!, [_1, _2]) } + public var Channel_Setup_TypePublicHelp: String { return self._s[3501]! } + public var Passport_Identity_EditInternalPassport: String { return self._s[3502]! } + public var PhotoEditor_Skip: String { return self._s[3503]! } public func Notification_GameScoreSimple(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) - } - public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedContacts(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedLocations(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortWeeks(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Invitation_Members(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) - } - public func UserCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortMinutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortSeconds(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func ChatList_SelectedChats(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortSeconds(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusSubscribers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendVideo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) - } - public func InviteText_ContactsCountText(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_File(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_Exceptions(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessagePoll_VotedCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_Seconds(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Map_ETAHours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Contacts_ImportersCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func ForwardedPhotos(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteFor_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Passport_Scans(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Seconds(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Months(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_AddMaskCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_StatusMembers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Generic(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_AddStickerCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedStickers(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortHours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_ShortDays(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) - } - public func StickerPack_StickerCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, _0, _1) - } - public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func AttachmentMenu_SendGif(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedAudios(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MessageTimer_Weeks(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Video(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_MinutesAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_ShareItem(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedPolls(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedFiles(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) - } - public func SharedMedia_Photo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) - } - public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideos(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func GroupInfo_ParticipantCount(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Call_ShortMinutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedVideoMessages(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedGifs(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) - } - public func Media_SharePhoto(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, _2, _1, _3) - } - public func MuteExpires_Hours(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) - } - public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Watch_UserInfo_Mute(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) - } - public func AttachmentMenu_SendItem(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue) - } - public func LastSeen_HoursAgo(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) - } - public func MuteExpires_Minutes(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue) - } - public func ForwardedMessages(_ value: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, value) - let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue) } public func Conversation_StatusOnline(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue) } - public func QuickSend_Photos(_ value: Int32) -> String { + public func SharedMedia_File(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue) } - public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { - let form = presentationStringsPluralizationForm(self.lc, selector) - return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, _1, _2) - } - public func Call_Minutes(_ value: Int32) -> String { + public func LastSeen_MinutesAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedGifs(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareVideo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue) + } + public func CreatePoll_AddMoreOptions(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue) } public func MessageTimer_Years(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) - return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedPolls(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Map_ETAHours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Photo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusSubscribers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_DeleteConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_SharePhoto(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func InviteText_ContactsCountText(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue) + } + public func GroupInfo_ParticipantCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_RemoveStickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func MuteFor_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Generic(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedVideos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocation_MenuChatsCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortDays(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func ForwardedVideoMessages(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_StatusMembers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedMessages(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func ForwardedStickers(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Seconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Media_ShareItem(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendItem(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue) } public func MuteFor_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAudios(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessagePoll_VotedCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_UserInfo_Mute(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue) + } + public func UserCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedFiles(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Passport_Scans(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_RemoveMaskCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Map_ETAMinutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Call_ShortSeconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_StickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue) + } + public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendPhoto(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue) + } + public func LastSeen_HoursAgo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedPhotos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue) + } + public func QuickSend_Photos(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Weeks(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendGif(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MuteExpires_Minutes(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func MessageTimer_Months(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notifications_Exceptions(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_Seconds(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Contacts_ImportersCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessageTimer_ShortWeeks(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Invitation_Members(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue) + } + public func AttachmentMenu_SendVideo(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ChatList_SelectedChats(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, _2, _1, _3) + } + public func ForwardedContacts(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue) + } + public func MessageTimer_ShortHours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Video(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddMaskCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue) + } + public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, _1, _2) + } + public func MessageTimer_Hours(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String { + let form = presentationStringsPluralizationForm(self.lc, selector) + return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, _0, _1) + } + public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ForwardedLocations(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Notification_GameScoreSelfExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue) + } + public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue) + } + public func StickerPack_AddStickerCount(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue) + } + public func SharedMedia_Link(_ value: Int32) -> String { + let form = presentationStringsPluralizationForm(self.lc, value) + let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) + return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue) + } + public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String { let form = presentationStringsPluralizationForm(self.lc, value) let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator) return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue) diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift index 0e43e63e08..d4418a6310 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift @@ -18,21 +18,21 @@ public final class PresentationThemeGradientColors { } } -public final class PresentationThemeAuth { - public let introStartButtonColor: UIColor - public let introDotColor: UIColor +public final class PresentationThemeIntro { + public let startButtonColor: UIColor + public let dotColor: UIColor - public init(introStartButtonColor: UIColor, introDotColor: UIColor) { - self.introStartButtonColor = introStartButtonColor - self.introDotColor = introDotColor + public init(startButtonColor: UIColor, dotColor: UIColor) { + self.startButtonColor = startButtonColor + self.dotColor = dotColor } } public final class PresentationThemePasscode { public let backgroundColors: PresentationThemeGradientColors - public let buttonColor: UIColor? + public let buttonColor: UIColor - public init(backgroundColors: PresentationThemeGradientColors, buttonColor: UIColor?) { + public init(backgroundColors: PresentationThemeGradientColors, buttonColor: UIColor) { self.backgroundColors = backgroundColors self.buttonColor = buttonColor } @@ -62,7 +62,7 @@ public final class PresentationThemeRootTabBar { } } -public enum PresentationThemeStatusBarStyle: Int32, Codable { +public enum PresentationThemeStatusBarStyle: Int32 { case black = 0 case white = 1 @@ -149,7 +149,7 @@ public final class PresentationThemeRootController { } } -public enum PresentationThemeActionSheetBackgroundType: Int32, Codable { +public enum PresentationThemeActionSheetBackgroundType: Int32 { case light case dark } @@ -260,12 +260,14 @@ public final class PresentationThemeFillStrokeForeground { public final class PresentationInputFieldTheme { public let backgroundColor: UIColor + public let strokeColor: UIColor public let placeholderColor: UIColor public let primaryColor: UIColor public let controlColor: UIColor - public init(backgroundColor: UIColor, placeholderColor: UIColor, primaryColor: UIColor, controlColor: UIColor) { + public init(backgroundColor: UIColor, strokeColor: UIColor, placeholderColor: UIColor, primaryColor: UIColor, controlColor: UIColor) { self.backgroundColor = backgroundColor + self.strokeColor = strokeColor self.placeholderColor = placeholderColor self.primaryColor = primaryColor self.controlColor = controlColor @@ -646,7 +648,7 @@ public final class PresentationThemeServiceMessage { } } -public enum PresentationThemeKeyboardColor: Int32, Codable { +public enum PresentationThemeKeyboardColor: Int32 { case light = 0 case dark = 1 @@ -664,25 +666,17 @@ public final class PresentationThemeChatInputPanelMediaRecordingControl { public let buttonColor: UIColor public let micLevelColor: UIColor public let activeIconColor: UIColor - public let panelControlFillColor: UIColor - public let panelControlStrokeColor: UIColor - public let panelControlContentPrimaryColor: UIColor - public let panelControlContentAccentColor: UIColor - init(buttonColor: UIColor, micLevelColor: UIColor, activeIconColor: UIColor, panelControlFillColor: UIColor, panelControlStrokeColor: UIColor, panelControlContentPrimaryColor: UIColor, panelControlContentAccentColor: UIColor) { + init(buttonColor: UIColor, micLevelColor: UIColor, activeIconColor: UIColor) { self.buttonColor = buttonColor self.micLevelColor = micLevelColor self.activeIconColor = activeIconColor - self.panelControlFillColor = panelControlFillColor - self.panelControlStrokeColor = panelControlStrokeColor - self.panelControlContentPrimaryColor = panelControlContentPrimaryColor - self.panelControlContentAccentColor = panelControlContentAccentColor } } public final class PresentationThemeChatInputPanel { public let panelBackgroundColor: UIColor - public let panelStrokeColor: UIColor + public let panelSeparatorColor: UIColor public let panelControlAccentColor: UIColor public let panelControlColor: UIColor public let panelControlDisabledColor: UIColor @@ -700,9 +694,9 @@ public final class PresentationThemeChatInputPanel { public let keyboardColor: PresentationThemeKeyboardColor public let mediaRecordingControl: PresentationThemeChatInputPanelMediaRecordingControl - public init(panelBackgroundColor: UIColor, panelStrokeColor: UIColor, panelControlAccentColor: UIColor, panelControlColor: UIColor, panelControlDisabledColor: UIColor, panelControlDestructiveColor: UIColor, inputBackgroundColor: UIColor, inputStrokeColor: UIColor, inputPlaceholderColor: UIColor, inputTextColor: UIColor, inputControlColor: UIColor, actionControlFillColor: UIColor, actionControlForegroundColor: UIColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, mediaRecordingDotColor: UIColor, keyboardColor: PresentationThemeKeyboardColor, mediaRecordingControl: PresentationThemeChatInputPanelMediaRecordingControl) { + public init(panelBackgroundColor: UIColor, panelSeparatorColor: UIColor, panelControlAccentColor: UIColor, panelControlColor: UIColor, panelControlDisabledColor: UIColor, panelControlDestructiveColor: UIColor, inputBackgroundColor: UIColor, inputStrokeColor: UIColor, inputPlaceholderColor: UIColor, inputTextColor: UIColor, inputControlColor: UIColor, actionControlFillColor: UIColor, actionControlForegroundColor: UIColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, mediaRecordingDotColor: UIColor, keyboardColor: PresentationThemeKeyboardColor, mediaRecordingControl: PresentationThemeChatInputPanelMediaRecordingControl) { self.panelBackgroundColor = panelBackgroundColor - self.panelStrokeColor = panelStrokeColor + self.panelSeparatorColor = panelSeparatorColor self.panelControlAccentColor = panelControlAccentColor self.panelControlColor = panelControlColor self.panelControlDisabledColor = panelControlDisabledColor @@ -787,6 +781,7 @@ public final class PresentationThemeChatHistoryNavigation { } public final class PresentationThemeChat { + public let defaultWallpaper: TelegramWallpaper public let message: PresentationThemeChatMessage public let serviceMessage: PresentationThemeServiceMessage public let inputPanel: PresentationThemeChatInputPanel @@ -794,7 +789,8 @@ public final class PresentationThemeChat { public let inputButtonPanel: PresentationThemeInputButtonPanel public let historyNavigation: PresentationThemeChatHistoryNavigation - public init(message: PresentationThemeChatMessage, serviceMessage: PresentationThemeServiceMessage, inputPanel: PresentationThemeChatInputPanel, inputMediaPanel: PresentationThemeInputMediaPanel, inputButtonPanel: PresentationThemeInputButtonPanel, historyNavigation: PresentationThemeChatHistoryNavigation) { + public init(defaultWallpaper: TelegramWallpaper, message: PresentationThemeChatMessage, serviceMessage: PresentationThemeServiceMessage, inputPanel: PresentationThemeChatInputPanel, inputMediaPanel: PresentationThemeInputMediaPanel, inputButtonPanel: PresentationThemeInputButtonPanel, historyNavigation: PresentationThemeChatHistoryNavigation) { + self.defaultWallpaper = defaultWallpaper self.message = message self.serviceMessage = serviceMessage self.inputPanel = inputPanel @@ -804,7 +800,7 @@ public final class PresentationThemeChat { } } -public enum PresentationThemeExpandedNotificationBackgroundType: Int32, Codable { +public enum PresentationThemeExpandedNotificationBackgroundType: Int32 { case light case dark } @@ -849,7 +845,7 @@ public final class PresentationThemeInAppNotification { public enum PresentationThemeBuiltinName { case dayClassic case day - case nightGrayscale + case night case nightAccent public var reference: PresentationBuiltinThemeReference { @@ -858,8 +854,8 @@ public enum PresentationThemeBuiltinName { return .dayClassic case .day: return .day - case .nightGrayscale: - return .nightGrayscale + case .night: + return .night case .nightAccent: return .nightAccent } @@ -886,13 +882,31 @@ public enum PresentationThemeName: Equatable { } } } + + public var string: String { + switch self { + case let .builtin(name): + switch name { + case .day: + return "Day" + case .dayClassic: + return "Classic" + case .night: + return "Night" + case .nightAccent: + return "Night" + } + case let .custom(name): + return name + } + } } public final class PresentationTheme: Equatable { public let name: PresentationThemeName public let author: String? public let overallDarkAppearance: Bool - public let auth: PresentationThemeAuth + public let intro: PresentationThemeIntro public let passcode: PresentationThemePasscode public let rootController: PresentationThemeRootController public let list: PresentationThemeList @@ -903,11 +917,11 @@ public final class PresentationTheme: Equatable { public let resourceCache: PresentationsResourceCache = PresentationsResourceCache() - public init(name: PresentationThemeName, author: String?, overallDarkAppearance: Bool, auth: PresentationThemeAuth, passcode: PresentationThemePasscode, rootController: PresentationThemeRootController, list: PresentationThemeList, chatList: PresentationThemeChatList, chat: PresentationThemeChat, actionSheet: PresentationThemeActionSheet, inAppNotification: PresentationThemeInAppNotification) { + public init(name: PresentationThemeName, author: String?, overallDarkAppearance: Bool, intro: PresentationThemeIntro, passcode: PresentationThemePasscode, rootController: PresentationThemeRootController, list: PresentationThemeList, chatList: PresentationThemeChatList, chat: PresentationThemeChat, actionSheet: PresentationThemeActionSheet, inAppNotification: PresentationThemeInAppNotification) { self.name = name self.author = author self.overallDarkAppearance = overallDarkAppearance - self.auth = auth + self.intro = intro self.passcode = passcode self.rootController = rootController self.list = list diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift new file mode 100644 index 0000000000..90e07d2ccc --- /dev/null +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift @@ -0,0 +1,1458 @@ +import Foundation +import UIKit +import TelegramCore + +public enum PresentationThemeColorDecodingError: Error { + case generic +} + +private func decodeColor(_ values: KeyedDecodingContainer, _ key: Key) throws -> UIColor { + if let value = try? values.decode(String.self, forKey: key) { + if value.lowercased() == "clear" { + return UIColor.clear + } else if let color = UIColor(hexString: value) { + return color + } + } + throw PresentationThemeColorDecodingError.generic +} + +private func encodeColor(_ values: inout KeyedEncodingContainer, _ value: UIColor, _ key: Key) throws { + if value == UIColor.clear { + try values.encode("clear", forKey: key) + } else if value.alpha < 1.0 { + try values.encode(String(format: "%08x", value.argb), forKey: key) + } else { + try values.encode(String(format: "%06x", value.rgb), forKey: key) + } +} + +extension TelegramWallpaper: Codable { + public init(from decoder: Decoder) throws { + let values = try decoder.singleValueContainer() + if let value = try? values.decode(String.self) { + switch value.lowercased() { + case "builtin": + self = .builtin(WallpaperSettings()) + default: + if let color = UIColor(hexString: value) { + self = .color(Int32(bitPattern: color.rgb)) + } else { + throw PresentationThemeColorDecodingError.generic + } + } + } + throw PresentationThemeColorDecodingError.generic + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.singleValueContainer() + switch self { + case .builtin: + try container.encode("builtin") + case let .color(value): + try container.encode(String(format: "%06x", value)) + default: + break + } + } +} + +extension PresentationThemeStatusBarStyle: Codable { + public init(from decoder: Decoder) throws { + let values = try decoder.singleValueContainer() + if let value = try? values.decode(String.self) { + switch value.lowercased() { + case "black": + self = .black + case "white": + self = .white + default: + self = .black + } + } else { + self = .black + } + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.singleValueContainer() + switch self { + case .black: + try container.encode("black") + case .white: + try container.encode("white") + } + } +} + +extension PresentationThemeActionSheetBackgroundType: Codable { + public init(from decoder: Decoder) throws { + let values = try decoder.singleValueContainer() + if let value = try? values.decode(String.self) { + switch value.lowercased() { + case "light": + self = .light + case "dark": + self = .dark + default: + self = .light + } + } else { + self = .light + } + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.singleValueContainer() + switch self { + case .light: + try container.encode("light") + case .dark: + try container.encode("dark") + } + } +} + +extension PresentationThemeKeyboardColor: Codable { + public init(from decoder: Decoder) throws { + let values = try decoder.singleValueContainer() + if let value = try? values.decode(String.self) { + switch value.lowercased() { + case "light": + self = .light + case "dark": + self = .dark + default: + self = .light + } + } else { + self = .light + } + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.singleValueContainer() + switch self { + case .light: + try container.encode("light") + case .dark: + try container.encode("dark") + } + } +} + +extension PresentationThemeExpandedNotificationBackgroundType: Codable { + public func encode(to encoder: Encoder) throws { + var container = encoder.singleValueContainer() + switch self { + case .light: + try container.encode("light") + case .dark: + try container.encode("dark") + } + } +} + +extension PresentationThemeGradientColors: Codable { + enum CodingKeys: String, CodingKey { + case top + case bottom + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(topColor: try decodeColor(values, .top), + bottomColor: try decodeColor(values, .bottom)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.topColor, .top) + try encodeColor(&values, self.bottomColor, .bottom) + } +} + +extension PresentationThemeIntro: Codable { + enum CodingKeys: String, CodingKey { + case startButton + case dot + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(startButtonColor: try decodeColor(values, .startButton), + dotColor: try decodeColor(values, .dot)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.startButtonColor, .startButton) + try encodeColor(&values, self.dotColor, .dot) + } +} + +extension PresentationThemePasscode: Codable { + enum CodingKeys: String, CodingKey { + case bg + case button + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(backgroundColors: try values.decode(PresentationThemeGradientColors.self, forKey: .bg), + buttonColor: try decodeColor(values, .button)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.backgroundColors, forKey: .bg) + try encodeColor(&values, self.buttonColor, .button) + } +} + +extension PresentationThemeRootTabBar: Codable { + enum CodingKeys: String, CodingKey { + case background + case separator + case icon + case selectedIcon + case text + case selectedText + case badgeBackground + case badgeStroke + case badgeText + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(backgroundColor: try decodeColor(values, .background), + separatorColor: try decodeColor(values, .separator), + iconColor: try decodeColor(values, .icon), + selectedIconColor: try decodeColor(values, .selectedIcon), + textColor: try decodeColor(values, .text), + selectedTextColor: try decodeColor(values, .selectedText), + badgeBackgroundColor: try decodeColor(values, .badgeBackground), + badgeStrokeColor: try decodeColor(values, .badgeStroke), + badgeTextColor: try decodeColor(values, .badgeText)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.backgroundColor, .background) + try encodeColor(&values, self.separatorColor, .separator) + try encodeColor(&values, self.iconColor, .icon) + try encodeColor(&values, self.selectedIconColor, .selectedIcon) + try encodeColor(&values, self.textColor, .text) + try encodeColor(&values, self.selectedTextColor, .selectedText) + try encodeColor(&values, self.badgeBackgroundColor, .badgeBackground) + try encodeColor(&values, self.badgeStrokeColor, .badgeStroke) + try encodeColor(&values, self.badgeTextColor, .badgeText) + } +} + +extension PresentationThemeRootNavigationBar: Codable { + enum CodingKeys: String, CodingKey { + case button + case disabledButton + case primaryText + case secondaryText + case control + case accentText + case background + case separator + case badgeFill + case badgeStroke + case badgeText + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(buttonColor: try decodeColor(values, .button), + disabledButtonColor: try decodeColor(values, .disabledButton), + primaryTextColor: try decodeColor(values, .primaryText), + secondaryTextColor: try decodeColor(values, .secondaryText), + controlColor: try decodeColor(values, .control), + accentTextColor: try decodeColor(values, .accentText), + backgroundColor: try decodeColor(values, .background), + separatorColor: try decodeColor(values, .separator), + badgeBackgroundColor: try decodeColor(values, .badgeFill), + badgeStrokeColor: try decodeColor(values, .badgeStroke), + badgeTextColor: try decodeColor(values, .badgeText)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.buttonColor, .button) + try encodeColor(&values, self.disabledButtonColor, .disabledButton) + try encodeColor(&values, self.primaryTextColor, .primaryText) + try encodeColor(&values, self.secondaryTextColor, .secondaryText) + try encodeColor(&values, self.controlColor, .control) + try encodeColor(&values, self.accentTextColor, .accentText) + try encodeColor(&values, self.backgroundColor, .background) + try encodeColor(&values, self.separatorColor, .separator) + try encodeColor(&values, self.badgeBackgroundColor, .badgeFill) + try encodeColor(&values, self.badgeStrokeColor, .badgeStroke) + try encodeColor(&values, self.badgeTextColor, .badgeText) + } +} + +extension PresentationThemeNavigationSearchBar: Codable { + enum CodingKeys: String, CodingKey { + case background + case accent + case inputFill + case inputText + case inputPlaceholderText + case inputIcon + case inputClearButton + case separator + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(backgroundColor: try decodeColor(values, .background), + accentColor: try decodeColor(values, .accent), + inputFillColor: try decodeColor(values, .inputFill), + inputTextColor: try decodeColor(values, .inputText), + inputPlaceholderTextColor: try decodeColor(values, .inputPlaceholderText), + inputIconColor: try decodeColor(values, .inputIcon), + inputClearButtonColor: try decodeColor(values, .inputClearButton), + separatorColor: try decodeColor(values, .separator)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.backgroundColor, .background) + try encodeColor(&values, self.accentColor, .accent) + try encodeColor(&values, self.inputFillColor, .inputFill) + try encodeColor(&values, self.inputTextColor, .inputText) + try encodeColor(&values, self.inputPlaceholderTextColor, .inputPlaceholderText) + try encodeColor(&values, self.inputIconColor, .inputIcon) + try encodeColor(&values, self.inputClearButtonColor, .inputClearButton) + try encodeColor(&values, self.separatorColor, .separator) + } +} + +extension PresentationThemeRootController: Codable { + enum CodingKeys: String, CodingKey { + case statusBar + case tabBar + case navBar + case searchBar + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(statusBarStyle: try values.decode(PresentationThemeStatusBarStyle.self, forKey: .statusBar), + tabBar: try values.decode(PresentationThemeRootTabBar.self, forKey: .tabBar), + navigationBar: try values.decode(PresentationThemeRootNavigationBar.self, forKey: .navBar), + navigationSearchBar: try values.decode(PresentationThemeNavigationSearchBar.self, forKey: .searchBar)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.statusBarStyle, forKey: .statusBar) + try values.encode(self.tabBar, forKey: .tabBar) + try values.encode(self.navigationBar, forKey: .navBar) + try values.encode(self.navigationSearchBar, forKey: .searchBar) + } +} + +extension PresentationThemeActionSheet: Codable { + enum CodingKeys: String, CodingKey { + case dim + case bgType + case opaqueItemBg + case itemBg + case opaqueItemHighlightedBg + case itemHighlightedBg + case opaqueItemSeparator + case standardActionText + case destructiveActionText + case disabledActionText + case primaryText + case secondaryText + case controlAccent + case inputBg + case inputHollowBg + case inputBorder + case inputPlaceholder + case inputText + case inputClearButton + case checkContent + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(dimColor: try decodeColor(values, .dim), + backgroundType: try values.decode(PresentationThemeActionSheetBackgroundType.self, forKey: .bgType), + opaqueItemBackgroundColor: try decodeColor(values, .opaqueItemBg), + itemBackgroundColor: try decodeColor(values, .itemBg), + opaqueItemHighlightedBackgroundColor: try decodeColor(values, .opaqueItemHighlightedBg), + itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBg), + opaqueItemSeparatorColor: try decodeColor(values, .opaqueItemSeparator), + standardActionTextColor: try decodeColor(values, .standardActionText), + destructiveActionTextColor: try decodeColor(values, .destructiveActionText), + disabledActionTextColor: try decodeColor(values, .disabledActionText), + primaryTextColor: try decodeColor(values, .primaryText), + secondaryTextColor: try decodeColor(values, .secondaryText), + controlAccentColor: try decodeColor(values, .controlAccent), + inputBackgroundColor: try decodeColor(values, .inputBg), + inputHollowBackgroundColor: try decodeColor(values, .inputHollowBg), + inputBorderColor: try decodeColor(values, .inputBorder), + inputPlaceholderColor: try decodeColor(values, .inputPlaceholder), + inputTextColor: try decodeColor(values, .inputText), + inputClearButtonColor: try decodeColor(values, .inputClearButton), + checkContentColor: try decodeColor(values, .checkContent)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.dimColor, .dim) + try values.encode(self.backgroundType, forKey: .bgType) + try encodeColor(&values, self.opaqueItemBackgroundColor, .opaqueItemBg) + try encodeColor(&values, self.itemBackgroundColor, .itemBg) + try encodeColor(&values, self.opaqueItemHighlightedBackgroundColor, .opaqueItemHighlightedBg) + try encodeColor(&values, self.opaqueItemSeparatorColor, .opaqueItemSeparator) + try encodeColor(&values, self.standardActionTextColor, .standardActionText) + try encodeColor(&values, self.destructiveActionTextColor, .destructiveActionText) + try encodeColor(&values, self.disabledActionTextColor, .disabledActionText) + try encodeColor(&values, self.primaryTextColor, .primaryText) + try encodeColor(&values, self.secondaryTextColor, .secondaryText) + try encodeColor(&values, self.controlAccentColor, .controlAccent) + try encodeColor(&values, self.inputBackgroundColor, .inputBg) + try encodeColor(&values, self.inputHollowBackgroundColor, .inputHollowBg) + try encodeColor(&values, self.inputBorderColor, .inputBorder) + try encodeColor(&values, self.inputPlaceholderColor, .inputPlaceholder) + try encodeColor(&values, self.inputTextColor, .inputText) + try encodeColor(&values, self.inputClearButtonColor, .inputClearButton) + try encodeColor(&values, self.checkContentColor, .checkContent) + } +} + +extension PresentationThemeSwitch: Codable { + enum CodingKeys: String, CodingKey { + case frame + case handle + case content + case positive + case negative + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(frameColor: try decodeColor(values, .frame), + handleColor: try decodeColor(values, .handle), + contentColor: try decodeColor(values, .content), + positiveColor: try decodeColor(values, .positive), + negativeColor: try decodeColor(values, .negative)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.frameColor, .frame) + try encodeColor(&values, self.handleColor, .handle) + try encodeColor(&values, self.contentColor, .content) + try encodeColor(&values, self.positiveColor, .positive) + try encodeColor(&values, self.negativeColor, .negative) + } +} + +extension PresentationThemeFillForeground: Codable { + enum CodingKeys: String, CodingKey { + case bg + case fg + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(fillColor: try decodeColor(values, .bg), + foregroundColor: try decodeColor(values, .fg)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.fillColor, .bg) + try encodeColor(&values, self.foregroundColor, .fg) + } +} + +extension PresentationThemeItemDisclosureActions: Codable { + enum CodingKeys: String, CodingKey { + case neutral1 + case neutral2 + case destructive + case constructive + case accent + case warning + case inactive + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(neutral1: try values.decode(PresentationThemeFillForeground.self, forKey: .neutral1), + neutral2: try values.decode(PresentationThemeFillForeground.self, forKey: .neutral2), + destructive: try values.decode(PresentationThemeFillForeground.self, forKey: .destructive), + constructive: try values.decode(PresentationThemeFillForeground.self, forKey: .constructive), + accent: try values.decode(PresentationThemeFillForeground.self, forKey: .accent), + warning: try values.decode(PresentationThemeFillForeground.self, forKey: .warning), + inactive: try values.decode(PresentationThemeFillForeground.self, forKey: .inactive)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.neutral1, forKey: .neutral1) + try values.encode(self.neutral2, forKey: .neutral2) + try values.encode(self.destructive, forKey: .destructive) + try values.encode(self.constructive, forKey: .constructive) + try values.encode(self.accent, forKey: .accent) + try values.encode(self.warning, forKey: .warning) + try values.encode(self.inactive, forKey: .inactive) + } +} + +extension PresentationThemeFillStrokeForeground: Codable { + enum CodingKeys: String, CodingKey { + case bg + case stroke + case fg + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(fillColor: try decodeColor(values, .bg), + strokeColor: try decodeColor(values, .stroke), + foregroundColor: try decodeColor(values, .fg)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.fillColor, .bg) + try encodeColor(&values, self.strokeColor, .stroke) + try encodeColor(&values, self.foregroundColor, .fg) + } +} + +extension PresentationInputFieldTheme: Codable { + enum CodingKeys: String, CodingKey { + case bg + case stroke + case placeholder + case primary + case control + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(backgroundColor: try decodeColor(values, .bg), + strokeColor: try decodeColor(values, .stroke), + placeholderColor: try decodeColor(values, .placeholder), + primaryColor: try decodeColor(values, .primary), + controlColor: try decodeColor(values, .control)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.backgroundColor, .bg) + try encodeColor(&values, self.strokeColor, .stroke) + try encodeColor(&values, self.placeholderColor, .placeholder) + try encodeColor(&values, self.primaryColor, .primary) + try encodeColor(&values, self.controlColor, .control) + } +} + +extension PresentationThemeList: Codable { + enum CodingKeys: String, CodingKey { + case blocksBg + case plainBg + case primaryText + case secondaryText + case disabledText + case accent + case highlighted + case destructive + case placeholderText + case itemBlocksBg + case itemHighlightedBg + case blocksSeparator + case plainSeparator + case disclosureArrow + case sectionHeaderText + case freeText + case freeTextError + case freeTextSuccess + case freeMonoIcon + case `switch` + case disclosureActions + case check + case controlSecondary + case freeInputField + case mediaPlaceholder + case scrollIndicator + case pageIndicatorInactive + case inputClearButton + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(blocksBackgroundColor: try decodeColor(values, .blocksBg), + plainBackgroundColor: try decodeColor(values, .plainBg), + itemPrimaryTextColor: try decodeColor(values, .primaryText), + itemSecondaryTextColor: try decodeColor(values, .secondaryText), + itemDisabledTextColor: try decodeColor(values, .disabledText), + itemAccentColor: try decodeColor(values, .accent), + itemHighlightedColor: try decodeColor(values, .highlighted), + itemDestructiveColor: try decodeColor(values, .destructive), + itemPlaceholderTextColor: try decodeColor(values, .placeholderText), + itemBlocksBackgroundColor: try decodeColor(values, .itemBlocksBg), + itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBg), + itemBlocksSeparatorColor: try decodeColor(values, .blocksSeparator), + itemPlainSeparatorColor: try decodeColor(values, .plainSeparator), + disclosureArrowColor: try decodeColor(values, .disclosureArrow), + sectionHeaderTextColor: try decodeColor(values, .sectionHeaderText), + freeTextColor: try decodeColor(values, .freeText), + freeTextErrorColor: try decodeColor(values, .freeTextError), + freeTextSuccessColor: try decodeColor(values, .freeTextSuccess), + freeMonoIconColor: try decodeColor(values, .freeMonoIcon), + itemSwitchColors: try values.decode(PresentationThemeSwitch.self, forKey: .switch), + itemDisclosureActions: try values.decode(PresentationThemeItemDisclosureActions.self, forKey: .disclosureActions), + itemCheckColors: try values.decode(PresentationThemeFillStrokeForeground.self, forKey: .check), + controlSecondaryColor: try decodeColor(values, .controlSecondary), + freeInputField: try values.decode(PresentationInputFieldTheme.self, forKey: .freeInputField), + mediaPlaceholderColor: try decodeColor(values, .mediaPlaceholder), + scrollIndicatorColor: try decodeColor(values, .scrollIndicator), + pageIndicatorInactiveColor: try decodeColor(values, .pageIndicatorInactive), + inputClearButtonColor: try decodeColor(values, .inputClearButton)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.blocksBackgroundColor, .blocksBg) + try encodeColor(&values, self.plainBackgroundColor, .plainBg) + try encodeColor(&values, self.itemPrimaryTextColor, .primaryText) + try encodeColor(&values, self.itemSecondaryTextColor, .secondaryText) + try encodeColor(&values, self.itemDisabledTextColor, .disabledText) + try encodeColor(&values, self.itemAccentColor, .accent) + try encodeColor(&values, self.itemHighlightedColor, .highlighted) + try encodeColor(&values, self.itemDestructiveColor, .destructive) + try encodeColor(&values, self.itemPlaceholderTextColor, .placeholderText) + try encodeColor(&values, self.itemBlocksBackgroundColor, .itemBlocksBg) + try encodeColor(&values, self.itemHighlightedBackgroundColor, .itemHighlightedBg) + try encodeColor(&values, self.itemBlocksSeparatorColor, .blocksSeparator) + try encodeColor(&values, self.itemPlainSeparatorColor, .plainSeparator) + try encodeColor(&values, self.disclosureArrowColor, .disclosureArrow) + try encodeColor(&values, self.sectionHeaderTextColor, .sectionHeaderText) + try encodeColor(&values, self.freeTextColor, .freeText) + try encodeColor(&values, self.freeTextErrorColor, .freeTextError) + try encodeColor(&values, self.freeTextSuccessColor, .freeTextSuccess) + try encodeColor(&values, self.freeMonoIconColor, .freeMonoIcon) + try values.encode(self.itemSwitchColors, forKey: .`switch`) + try values.encode(self.itemDisclosureActions, forKey: .disclosureActions) + try values.encode(self.itemCheckColors, forKey: .check) + try encodeColor(&values, self.controlSecondaryColor, .controlSecondary) + try values.encode(self.freeInputField, forKey: .freeInputField) + try encodeColor(&values, self.mediaPlaceholderColor, .mediaPlaceholder) + try encodeColor(&values, self.scrollIndicatorColor, .scrollIndicator) + try encodeColor(&values, self.pageIndicatorInactiveColor, .pageIndicatorInactive) + try encodeColor(&values, self.inputClearButtonColor, .inputClearButton) + } +} + +extension PresentationThemeArchiveAvatarColors: Codable { + enum CodingKeys: String, CodingKey { + case background + case foreground + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(backgroundColors: try values.decode(PresentationThemeGradientColors.self, forKey: .background), + foregroundColor: try decodeColor(values, .foreground)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.backgroundColors, forKey: .background) + try encodeColor(&values, self.foregroundColor, .foreground) + } +} + +extension PresentationThemeChatList: Codable { + enum CodingKeys: String, CodingKey { + case bg + case itemSeparator + case itemBg + case pinnedItemBg + case itemHighlightedBg + case itemSelectedBg + case title + case secretTitle + case dateText + case authorName + case messageText + case messageDraftText + case checkmark + case pendingIndicator + case failedFill + case failedFg + case muteIcon + case unreadBadgeActiveBg + case unreadBadgeActiveText + case unreadBadgeInactiveBg + case unreadBadgeInactiveText + case pinnedBadge + case pinnedSearchBar + case regularSearchBar + case sectionHeaderBg + case sectionHeaderText + case searchBarKeyboard + case verifiedIconBg + case verifiedIconFg + case secretIcon + case pinnedArchiveAvatar + case unpinnedArchiveAvatar + case onlineDot + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(backgroundColor: try decodeColor(values, .bg), + itemSeparatorColor: try decodeColor(values, .itemSeparator), + itemBackgroundColor: try decodeColor(values, .itemBg), + pinnedItemBackgroundColor: try decodeColor(values, .pinnedItemBg), + itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBg), + itemSelectedBackgroundColor: try decodeColor(values, .itemSelectedBg), + titleColor: try decodeColor(values, .title), + secretTitleColor: try decodeColor(values, .secretTitle), + dateTextColor: try decodeColor(values, .dateText), + authorNameColor: try decodeColor(values, .authorName), + messageTextColor: try decodeColor(values, .messageText), + messageDraftTextColor: try decodeColor(values, .messageDraftText), + checkmarkColor: try decodeColor(values, .checkmark), + pendingIndicatorColor: try decodeColor(values, .pendingIndicator), + failedFillColor: try decodeColor(values, .failedFill), + failedForegroundColor: try decodeColor(values, .failedFg), + muteIconColor: try decodeColor(values, .muteIcon), + unreadBadgeActiveBackgroundColor: try decodeColor(values, .unreadBadgeActiveBg), + unreadBadgeActiveTextColor: try decodeColor(values, .unreadBadgeActiveText), + unreadBadgeInactiveBackgroundColor: try decodeColor(values, .unreadBadgeInactiveBg), + unreadBadgeInactiveTextColor: try decodeColor(values, .unreadBadgeInactiveText), + pinnedBadgeColor: try decodeColor(values, .pinnedBadge), + pinnedSearchBarColor: try decodeColor(values, .pinnedSearchBar), + regularSearchBarColor: try decodeColor(values, .regularSearchBar), + sectionHeaderFillColor: try decodeColor(values, .sectionHeaderBg), + sectionHeaderTextColor: try decodeColor(values, .sectionHeaderText), + searchBarKeyboardColor: try values.decode(PresentationThemeKeyboardColor.self, forKey: .searchBarKeyboard), + verifiedIconFillColor: try decodeColor(values, .verifiedIconBg), + verifiedIconForegroundColor: try decodeColor(values, .verifiedIconFg), + secretIconColor: try decodeColor(values, .secretIcon), + pinnedArchiveAvatarColor: try values.decode(PresentationThemeArchiveAvatarColors.self, forKey: .pinnedArchiveAvatar), + unpinnedArchiveAvatarColor: try values.decode(PresentationThemeArchiveAvatarColors.self, forKey: .unpinnedArchiveAvatar), + onlineDotColor: try decodeColor(values, .onlineDot)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.backgroundColor, .bg) + try encodeColor(&values, self.itemSeparatorColor, .itemSeparator) + try encodeColor(&values, self.itemBackgroundColor, .itemBg) + try encodeColor(&values, self.pinnedItemBackgroundColor, .pinnedItemBg) + try encodeColor(&values, self.itemHighlightedBackgroundColor, .itemHighlightedBg) + try encodeColor(&values, self.itemSelectedBackgroundColor, .itemSelectedBg) + try encodeColor(&values, self.titleColor, .title) + try encodeColor(&values, self.secretTitleColor, .secretTitle) + try encodeColor(&values, self.dateTextColor, .dateText) + try encodeColor(&values, self.authorNameColor, .authorName) + try encodeColor(&values, self.messageTextColor, .messageText) + try encodeColor(&values, self.messageDraftTextColor, .messageDraftText) + try encodeColor(&values, self.checkmarkColor, .checkmark) + try encodeColor(&values, self.pendingIndicatorColor, .pendingIndicator) + try encodeColor(&values, self.failedFillColor, .failedFill) + try encodeColor(&values, self.failedForegroundColor, .failedFg) + try encodeColor(&values, self.muteIconColor, .muteIcon) + try encodeColor(&values, self.unreadBadgeActiveBackgroundColor, .unreadBadgeActiveBg) + try encodeColor(&values, self.unreadBadgeActiveTextColor, .unreadBadgeActiveText) + try encodeColor(&values, self.unreadBadgeInactiveBackgroundColor, .unreadBadgeInactiveBg) + try encodeColor(&values, self.unreadBadgeInactiveTextColor, .unreadBadgeInactiveText) + try encodeColor(&values, self.pinnedBadgeColor, .pinnedBadge) + try encodeColor(&values, self.pinnedSearchBarColor, .pinnedSearchBar) + try encodeColor(&values, self.regularSearchBarColor, .regularSearchBar) + try encodeColor(&values, self.sectionHeaderFillColor, .sectionHeaderBg) + try encodeColor(&values, self.sectionHeaderTextColor, .sectionHeaderText) + try values.encode(self.searchBarKeyboardColor, forKey: .searchBarKeyboard) + try encodeColor(&values, self.verifiedIconFillColor, .verifiedIconBg) + try encodeColor(&values, self.verifiedIconForegroundColor, .verifiedIconFg) + try encodeColor(&values, self.secretIconColor, .secretIcon) + try values.encode(self.pinnedArchiveAvatarColor, forKey: .pinnedArchiveAvatar) + try values.encode(self.unpinnedArchiveAvatarColor, forKey: .unpinnedArchiveAvatar) + try encodeColor(&values, self.onlineDotColor, .onlineDot) + } +} + +extension PresentationThemeBubbleColorComponents: Codable { + enum CodingKeys: String, CodingKey { + case bg + case highlightedBg + case stroke + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(fill: try decodeColor(values, .bg), + highlightedFill: try decodeColor(values, .highlightedBg), + stroke: try decodeColor(values, .stroke)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.fill, .bg) + try encodeColor(&values, self.highlightedFill, .highlightedBg) + try encodeColor(&values, self.stroke, .stroke) + } +} + +extension PresentationThemeBubbleColor: Codable { + enum CodingKeys: String, CodingKey { + case withWp + case withoutWp + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(withWallpaper: try values.decode(PresentationThemeBubbleColorComponents.self, forKey: .withWp), + withoutWallpaper: try values.decode(PresentationThemeBubbleColorComponents.self, forKey: .withoutWp)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.withWallpaper, forKey: .withWp) + try values.encode(self.withoutWallpaper, forKey: .withoutWp) + } +} + +extension PresentationThemeVariableColor: Codable { + enum CodingKeys: String, CodingKey { + case withWp + case withoutWp + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(withWallpaper: try decodeColor(values, .withWp), + withoutWallpaper: try decodeColor(values, .withoutWp)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.withWallpaper, .withWp) + try encodeColor(&values, self.withoutWallpaper, .withoutWp) + } +} + +extension PresentationThemeChatBubblePolls: Codable { + enum CodingKeys: String, CodingKey { + case radioButton + case radioProgress + case highlight + case separator + case bar + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(radioButton: try decodeColor(values, .radioButton), + radioProgress: try decodeColor(values, .radioProgress), + highlight: try decodeColor(values, .highlight), + separator: try decodeColor(values, .separator), + bar: try decodeColor(values, .bar)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.radioButton, .radioButton) + try encodeColor(&values, self.radioProgress, .radioProgress) + try encodeColor(&values, self.highlight, .highlight) + try encodeColor(&values, self.separator, .separator) + try encodeColor(&values, self.bar, .bar) + } +} + +extension PresentationThemePartedColors: Codable { + enum CodingKeys: String, CodingKey { + case bubble + case primaryText + case secondaryText + case linkText + case linkHighlight + case scam + case textHighlight + case accentText + case accentControl + case mediaActiveControl + case mediaInactiveControl + case pendingActivity + case fileTitle + case fileDescription + case fileDuration + case mediaPlaceholder + case polls + case actionButtonsBg + case actionButtonsStroke + case actionButtonsText + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(bubble: try values.decode(PresentationThemeBubbleColor.self, forKey: .bubble), + primaryTextColor: try decodeColor(values, .primaryText), + secondaryTextColor: try decodeColor(values, .secondaryText), + linkTextColor: try decodeColor(values, .linkText), + linkHighlightColor: try decodeColor(values, .linkHighlight), + scamColor: try decodeColor(values, .scam), + textHighlightColor: try decodeColor(values, .textHighlight), + accentTextColor: try decodeColor(values, .accentText), + accentControlColor: try decodeColor(values, .accentControl), + mediaActiveControlColor: try decodeColor(values, .mediaActiveControl), + mediaInactiveControlColor: try decodeColor(values, .mediaInactiveControl), + pendingActivityColor: try decodeColor(values, .pendingActivity), + fileTitleColor: try decodeColor(values, .fileTitle), + fileDescriptionColor: try decodeColor(values, .fileDescription), + fileDurationColor: try decodeColor(values, .fileDuration), + mediaPlaceholderColor: try decodeColor(values, .mediaPlaceholder), + polls: try values.decode(PresentationThemeChatBubblePolls.self, forKey: .polls), + actionButtonsFillColor: try values.decode(PresentationThemeVariableColor.self, forKey: .actionButtonsBg), + actionButtonsStrokeColor: try values.decode(PresentationThemeVariableColor.self, forKey: .actionButtonsStroke), + actionButtonsTextColor: try values.decode(PresentationThemeVariableColor.self, forKey: .actionButtonsText)) + } + + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.bubble, forKey: .bubble) + try encodeColor(&values, self.primaryTextColor, .primaryText) + try encodeColor(&values, self.secondaryTextColor, .secondaryText) + try encodeColor(&values, self.linkTextColor, .linkText) + try encodeColor(&values, self.linkHighlightColor, .linkHighlight) + try encodeColor(&values, self.scamColor, .scam) + try encodeColor(&values, self.textHighlightColor, .textHighlight) + try encodeColor(&values, self.accentTextColor, .accentText) + try encodeColor(&values, self.accentControlColor, .accentControl) + try encodeColor(&values, self.mediaActiveControlColor, .mediaActiveControl) + try encodeColor(&values, self.mediaInactiveControlColor, .mediaInactiveControl) + try encodeColor(&values, self.pendingActivityColor, .pendingActivity) + try encodeColor(&values, self.fileTitleColor, .fileTitle) + try encodeColor(&values, self.fileDescriptionColor, .fileDescription) + try encodeColor(&values, self.fileDurationColor, .fileDuration) + try encodeColor(&values, self.mediaPlaceholderColor, .mediaPlaceholder) + try values.encode(self.polls, forKey: .polls) + try values.encode(self.actionButtonsFillColor, forKey: .actionButtonsBg) + try values.encode(self.actionButtonsStrokeColor, forKey: .actionButtonsStroke) + try values.encode(self.actionButtonsTextColor, forKey: .actionButtonsText) + } +} + +extension PresentationThemeChatMessage: Codable { + enum CodingKeys: String, CodingKey { + case incoming + case outgoing + case freeform + case infoPrimaryText + case infoLinkText + case outgoingCheck + case mediaDateAndStatusBg + case mediaDateAndStatusText + case shareButtonBg + case shareButtonStroke + case shareButtonFg + case mediaOverlayControl + case selectionControl + case deliveryFailed + case mediaHighlightOverlay + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(incoming: try values.decode(PresentationThemePartedColors.self, forKey: .incoming), + outgoing: try values.decode(PresentationThemePartedColors.self, forKey: .outgoing), + freeform: try values.decode(PresentationThemeBubbleColor.self, forKey: .freeform), + infoPrimaryTextColor: try decodeColor(values, .infoPrimaryText), + infoLinkTextColor: try decodeColor(values, .infoLinkText), + outgoingCheckColor: try decodeColor(values, .outgoingCheck), + mediaDateAndStatusFillColor: try decodeColor(values, .mediaDateAndStatusBg), + mediaDateAndStatusTextColor: try decodeColor(values, .mediaDateAndStatusText), + shareButtonFillColor: try values.decode(PresentationThemeVariableColor.self, forKey: .shareButtonBg), + shareButtonStrokeColor: try values.decode(PresentationThemeVariableColor.self, forKey: .shareButtonStroke), + shareButtonForegroundColor: try values.decode(PresentationThemeVariableColor.self, forKey: .shareButtonFg), + mediaOverlayControlColors: try values.decode(PresentationThemeFillForeground.self, forKey: .mediaOverlayControl), + selectionControlColors: try values.decode(PresentationThemeFillStrokeForeground.self, forKey: .selectionControl), + deliveryFailedColors: try values.decode(PresentationThemeFillForeground.self, forKey: .deliveryFailed), + mediaHighlightOverlayColor: try decodeColor(values, .mediaHighlightOverlay)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.incoming, forKey: .incoming) + try values.encode(self.outgoing, forKey: .outgoing) + try values.encode(self.freeform, forKey: .freeform) + try encodeColor(&values, self.infoPrimaryTextColor, .infoPrimaryText) + try encodeColor(&values, self.infoLinkTextColor, .infoLinkText) + try encodeColor(&values, self.outgoingCheckColor, .outgoingCheck) + try encodeColor(&values, self.mediaDateAndStatusFillColor, .mediaDateAndStatusBg) + try encodeColor(&values, self.mediaDateAndStatusTextColor, .mediaDateAndStatusText) + try values.encode(self.shareButtonFillColor, forKey: .shareButtonBg) + try values.encode(self.shareButtonStrokeColor, forKey: .shareButtonStroke) + try values.encode(self.shareButtonForegroundColor, forKey: .shareButtonFg) + try values.encode(self.mediaOverlayControlColors, forKey: .mediaOverlayControl) + try values.encode(self.selectionControlColors, forKey: .selectionControl) + try values.encode(self.deliveryFailedColors, forKey: .deliveryFailed) + try encodeColor(&values, self.mediaHighlightOverlayColor, .mediaHighlightOverlay) + } +} + +extension PresentationThemeServiceMessageColorComponents: Codable { + enum CodingKeys: String, CodingKey { + case bg + case primaryText + case linkHighlight + case scam + case dateFillStatic + case dateFillFloat + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(fill: try decodeColor(values, .bg), + primaryText: try decodeColor(values, .primaryText), + linkHighlight: try decodeColor(values, .linkHighlight), + scam: try decodeColor(values, .scam), + dateFillStatic: try decodeColor(values, .dateFillStatic), + dateFillFloating: try decodeColor(values, .dateFillFloat)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.fill, .bg) + try encodeColor(&values, self.primaryText, .primaryText) + try encodeColor(&values, self.linkHighlight, .linkHighlight) + try encodeColor(&values, self.scam, .scam) + try encodeColor(&values, self.dateFillStatic, .dateFillStatic) + try encodeColor(&values, self.dateFillFloating, .dateFillFloat) + } +} + +extension PresentationThemeServiceMessageColor: Codable { + enum CodingKeys: String, CodingKey { + case withDefaultWp + case withCustomWp + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(withDefaultWallpaper: try values.decode(PresentationThemeServiceMessageColorComponents.self, forKey: .withDefaultWp), + withCustomWallpaper: try values.decode(PresentationThemeServiceMessageColorComponents.self, forKey: .withCustomWp)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.withDefaultWallpaper, forKey: .withDefaultWp) + try values.encode(self.withCustomWallpaper, forKey: .withCustomWp) + } +} + +extension PresentationThemeServiceMessage: Codable { + enum CodingKeys: String, CodingKey { + case components + case unreadBarBg + case unreadBarStroke + case unreadBarText + case dateText + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(components: try values.decode(PresentationThemeServiceMessageColor.self, forKey: .components), + unreadBarFillColor: try decodeColor(values, .unreadBarBg), + unreadBarStrokeColor: try decodeColor(values, .unreadBarStroke), + unreadBarTextColor: try decodeColor(values, .unreadBarText), + dateTextColor: try values.decode(PresentationThemeVariableColor.self, forKey: .dateText)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.components, forKey: .components) + try encodeColor(&values, self.unreadBarFillColor, .unreadBarBg) + try encodeColor(&values, self.unreadBarStrokeColor, .unreadBarStroke) + try encodeColor(&values, self.unreadBarTextColor, .unreadBarText) + try values.encode(self.dateTextColor, forKey: .dateText) + } +} + +extension PresentationThemeChatInputPanelMediaRecordingControl: Codable { + enum CodingKeys: String, CodingKey { + case button + case micLevel + case activeIcon + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(buttonColor: try decodeColor(values, .button), + micLevelColor: try decodeColor(values, .micLevel), + activeIconColor: try decodeColor(values, .activeIcon)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.buttonColor, .button) + try encodeColor(&values, self.micLevelColor, .micLevel) + try encodeColor(&values, self.activeIconColor, .activeIcon) + } +} + +extension PresentationThemeChatInputPanel: Codable { + enum CodingKeys: String, CodingKey { + case panelBg + case panelSeparator + case panelControlAccent + case panelControl + case panelControlDisabled + case panelControlDestructive + case inputBg + case inputStroke + case inputPlaceholder + case inputText + case inputControl + case actionControlBg + case actionControlFg + case primaryText + case secondaryText + case mediaRecordDot + case keyboard + case mediaRecordControl + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(panelBackgroundColor: try decodeColor(values, .panelBg), + panelSeparatorColor: try decodeColor(values, .panelSeparator), + panelControlAccentColor: try decodeColor(values, .panelControlAccent), + panelControlColor: try decodeColor(values, .panelControl), + panelControlDisabledColor: try decodeColor(values, .panelControlDisabled), + panelControlDestructiveColor: try decodeColor(values, .panelControlDestructive), + inputBackgroundColor: try decodeColor(values, .inputBg), + inputStrokeColor: try decodeColor(values, .inputStroke), + inputPlaceholderColor: try decodeColor(values, .inputPlaceholder), + inputTextColor: try decodeColor(values, .inputText), + inputControlColor: try decodeColor(values, .inputControl), + actionControlFillColor: try decodeColor(values, .actionControlBg), + actionControlForegroundColor: try decodeColor(values, .actionControlFg), + primaryTextColor: try decodeColor(values, .primaryText), + secondaryTextColor: try decodeColor(values, .secondaryText), + mediaRecordingDotColor: try decodeColor(values, .mediaRecordDot), + keyboardColor: try values.decode(PresentationThemeKeyboardColor.self, forKey: .keyboard), + mediaRecordingControl: try values.decode(PresentationThemeChatInputPanelMediaRecordingControl.self, forKey: .mediaRecordControl)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.panelBackgroundColor, .panelBg) + try encodeColor(&values, self.panelSeparatorColor, .panelSeparator) + try encodeColor(&values, self.panelControlAccentColor, .panelControlAccent) + try encodeColor(&values, self.panelControlColor, .panelControl) + try encodeColor(&values, self.panelControlDisabledColor, .panelControlDisabled) + try encodeColor(&values, self.panelControlDestructiveColor, .panelControlDestructive) + try encodeColor(&values, self.inputBackgroundColor, .inputBg) + try encodeColor(&values, self.inputStrokeColor, .inputStroke) + try encodeColor(&values, self.inputPlaceholderColor, .inputPlaceholder) + try encodeColor(&values, self.inputTextColor, .inputText) + try encodeColor(&values, self.inputControlColor, .inputControl) + try encodeColor(&values, self.actionControlFillColor, .actionControlBg) + try encodeColor(&values, self.actionControlForegroundColor, .actionControlFg) + try encodeColor(&values, self.primaryTextColor, .primaryText) + try encodeColor(&values, self.secondaryTextColor, .secondaryText) + try encodeColor(&values, self.mediaRecordingDotColor, .mediaRecordDot) + try values.encode(self.keyboardColor, forKey: .keyboard) + try values.encode(self.mediaRecordingControl, forKey: .mediaRecordControl) + } +} + +extension PresentationThemeInputMediaPanel: Codable { + enum CodingKeys: String, CodingKey { + case panelSeparator + case panelIcon + case panelHighlightedIconBg + case stickersBg + case stickersSectionText + case stickersSearchBg + case stickersSearchPlaceholder + case stickersSearchPrimary + case stickersSearchControl + case gifsBg + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(panelSeparatorColor: try decodeColor(values, .panelSeparator), + panelIconColor: try decodeColor(values, .panelIcon), + panelHighlightedIconBackgroundColor: try decodeColor(values, .panelHighlightedIconBg), + stickersBackgroundColor: try decodeColor(values, .stickersBg), + stickersSectionTextColor: try decodeColor(values, .stickersSectionText), + stickersSearchBackgroundColor: try decodeColor(values, .stickersSearchBg), + stickersSearchPlaceholderColor: try decodeColor(values, .stickersSearchPlaceholder), + stickersSearchPrimaryColor: try decodeColor(values, .stickersSearchPrimary), + stickersSearchControlColor: try decodeColor(values, .stickersSearchControl), + gifsBackgroundColor: try decodeColor(values, .gifsBg)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.panelSeparatorColor, .panelSeparator) + try encodeColor(&values, self.panelIconColor, .panelIcon) + try encodeColor(&values, self.panelHighlightedIconBackgroundColor, .panelHighlightedIconBg) + try encodeColor(&values, self.stickersBackgroundColor, .stickersBg) + try encodeColor(&values, self.stickersSectionTextColor, .stickersSectionText) + try encodeColor(&values, self.stickersSearchBackgroundColor, .stickersSearchBg) + try encodeColor(&values, self.stickersSearchPlaceholderColor, .stickersSearchPlaceholder) + try encodeColor(&values, self.stickersSearchPrimaryColor, .stickersSearchPrimary) + try encodeColor(&values, self.stickersSearchControlColor, .stickersSearchControl) + try encodeColor(&values, self.gifsBackgroundColor, .gifsBg) + } +} + +extension PresentationThemeInputButtonPanel: Codable { + enum CodingKeys: String, CodingKey { + case panelBg + case panelSeparator + case buttonBg + case buttonStroke + case buttonHighlightedBg + case buttonHighlightedStroke + case buttonText + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(panelSeparatorColor: try decodeColor(values, .panelSeparator), + panelBackgroundColor: try decodeColor(values, .panelBg), + buttonFillColor: try decodeColor(values, .buttonBg), + buttonStrokeColor: try decodeColor(values, .buttonStroke), + buttonHighlightedFillColor: try decodeColor(values, .buttonHighlightedBg), + buttonHighlightedStrokeColor: try decodeColor(values, .buttonHighlightedStroke), + buttonTextColor: try decodeColor(values, .buttonText)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.panelBackgroundColor, .panelBg) + try encodeColor(&values, self.panelSeparatorColor, .panelSeparator) + try encodeColor(&values, self.buttonFillColor, .buttonBg) + try encodeColor(&values, self.buttonStrokeColor, .buttonStroke) + try encodeColor(&values, self.buttonHighlightedFillColor, .buttonHighlightedBg) + try encodeColor(&values, self.buttonHighlightedStrokeColor, .buttonHighlightedStroke) + try encodeColor(&values, self.buttonTextColor, .buttonText) + } +} + +extension PresentationThemeChatHistoryNavigation: Codable { + enum CodingKeys: String, CodingKey { + case bg + case stroke + case fg + case badgeBg + case badgeStroke + case badgeText + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(fillColor: try decodeColor(values, .bg), + strokeColor: try decodeColor(values, .stroke), + foregroundColor: try decodeColor(values, .fg), + badgeBackgroundColor: try decodeColor(values, .badgeBg), + badgeStrokeColor: try decodeColor(values, .badgeStroke), + badgeTextColor: try decodeColor(values, .badgeText)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.fillColor, .bg) + try encodeColor(&values, self.strokeColor, .stroke) + try encodeColor(&values, self.foregroundColor, .fg) + try encodeColor(&values, self.badgeBackgroundColor, .badgeBg) + try encodeColor(&values, self.badgeStrokeColor, .badgeStroke) + try encodeColor(&values, self.badgeTextColor, .badgeText) + } +} + +extension PresentationThemeChat: Codable { + enum CodingKeys: String, CodingKey { + case defaultWallpaper + case message + case serviceMessage + case inputPanel + case inputMediaPanel + case inputButtonPanel + case historyNav + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(defaultWallpaper: try values.decode(TelegramWallpaper.self, forKey: .defaultWallpaper), + message: try values.decode(PresentationThemeChatMessage.self, forKey: .message), + serviceMessage: try values.decode(PresentationThemeServiceMessage.self, forKey: .serviceMessage), + inputPanel: try values.decode(PresentationThemeChatInputPanel.self, forKey: .inputPanel), + inputMediaPanel: try values.decode(PresentationThemeInputMediaPanel.self, forKey: .inputMediaPanel), + inputButtonPanel: try values.decode(PresentationThemeInputButtonPanel.self, forKey: .inputButtonPanel), + historyNavigation: try values.decode(PresentationThemeChatHistoryNavigation.self, forKey: .historyNav)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.defaultWallpaper, forKey: .defaultWallpaper) + try values.encode(self.message, forKey: .message) + try values.encode(self.serviceMessage, forKey: .serviceMessage) + try values.encode(self.inputPanel, forKey: .inputPanel) + try values.encode(self.inputMediaPanel, forKey: .inputMediaPanel) + try values.encode(self.inputButtonPanel, forKey: .inputButtonPanel) + try values.encode(self.historyNavigation, forKey: .historyNav) + } +} + +extension PresentationThemeExpandedNotificationNavigationBar: Codable { + enum CodingKeys: String, CodingKey { + case background + case primaryText + case control + case separator + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(backgroundColor: try decodeColor(values, .background), + primaryTextColor: try decodeColor(values, .primaryText), + controlColor: try decodeColor(values, .control), + separatorColor: try decodeColor(values, .separator)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.backgroundColor, .background) + try encodeColor(&values, self.primaryTextColor, .primaryText) + try encodeColor(&values, self.controlColor, .control) + try encodeColor(&values, self.separatorColor, .separator) + } +} + +extension PresentationThemeExpandedNotification: Codable { + enum CodingKeys: String, CodingKey { + case bgType + case navBar + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(backgroundType: try values.decode(PresentationThemeExpandedNotificationBackgroundType.self, forKey: .bgType), + navigationBar: try values.decode(PresentationThemeExpandedNotificationNavigationBar.self, forKey: .navBar)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try values.encode(self.backgroundType, forKey: .bgType) + try values.encode(self.navigationBar, forKey: .navBar) + } +} + +extension PresentationThemeInAppNotification: Codable { + enum CodingKeys: String, CodingKey { + case bg + case primaryText + case expanded + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(fillColor: try decodeColor(values, .bg), + primaryTextColor: try decodeColor(values, .primaryText), + expandedNotification: try values.decode(PresentationThemeExpandedNotification.self, forKey: .expanded)) + } + + public func encode(to encoder: Encoder) throws { + var values = encoder.container(keyedBy: CodingKeys.self) + try encodeColor(&values, self.fillColor, .bg) + try encodeColor(&values, self.primaryTextColor, .primaryText) + try values.encode(self.expandedNotification, forKey: .expanded) + } +} + +extension PresentationThemeName: Codable { + public init(from decoder: Decoder) throws { + let value = try decoder.singleValueContainer() + self = .custom(try value.decode(String.self)) + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.singleValueContainer() + switch self { + case let .builtin(name): + switch name { + case .day: + try container.encode("Day") + case .dayClassic: + try container.encode("Classic") + case .nightAccent: + try container.encode("Night Tinted") + case .night: + try container.encode("Night") + } + case let .custom(name): + try container.encode(name) + } + } +} + +extension PresentationTheme: Codable { + enum CodingKeys: String, CodingKey { + case name + case author + case dark + case intro + case passcode + case root + case list + case chatList + case chat + case actionSheet + case notification + } + + public convenience init(from decoder: Decoder) throws { + let values = try decoder.container(keyedBy: CodingKeys.self) + self.init(name: try values.decode(PresentationThemeName.self, forKey: .name), + author: (try? values.decode(String.self, forKey: .author)) ?? nil, + overallDarkAppearance: (try? values.decode(Bool.self, forKey: .dark)) ?? false, + intro: try values.decode(PresentationThemeIntro.self, forKey: .intro), + passcode: try values.decode(PresentationThemePasscode.self, forKey: .passcode), + rootController: try values.decode(PresentationThemeRootController.self, forKey: .root), + list: try values.decode(PresentationThemeList.self, forKey: .list), + chatList: try values.decode(PresentationThemeChatList.self, forKey: .chatList), + chat: try values.decode(PresentationThemeChat.self, forKey: .chat), + actionSheet: try values.decode(PresentationThemeActionSheet.self, forKey: .actionSheet), + inAppNotification: try values.decode(PresentationThemeInAppNotification.self, forKey: .notification)) + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(self.name, forKey: .name) + try container.encode(self.author, forKey: .author) + try container.encode(self.overallDarkAppearance, forKey: .dark) + try container.encode(self.intro, forKey: .intro) + try container.encode(self.passcode, forKey: .passcode) + try container.encode(self.rootController, forKey: .root) + try container.encode(self.list, forKey: .list) + try container.encode(self.chatList, forKey: .chatList) + try container.encode(self.chat, forKey: .chat) + try container.encode(self.actionSheet, forKey: .actionSheet) + try container.encode(self.inAppNotification, forKey: .notification) + } +} diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeDecodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeDecodable.swift deleted file mode 100644 index b11222eab2..0000000000 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeDecodable.swift +++ /dev/null @@ -1,881 +0,0 @@ -import Foundation -import UIKit - -private func decodeColor(_ values: KeyedDecodingContainer, _ key: Key) throws -> UIColor { - return UIColor(rgb: try values.decode(UInt32.self, forKey: key)) -} - -extension PresentationThemeGradientColors: Decodable { - enum CodingKeys: String, CodingKey { - case topColor - case bottomColor - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(topColor: try decodeColor(values, .topColor), - bottomColor: try decodeColor(values, .bottomColor)) - } -} - -extension PresentationThemeAuth: Decodable { - enum CodingKeys: String, CodingKey { - case introStartButton - case introDot - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(introStartButtonColor: try decodeColor(values, .introStartButton), - introDotColor: try decodeColor(values, .introDot)) - } -} - -extension PresentationThemePasscode: Decodable { - enum CodingKeys: String, CodingKey { - case background - case button - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(backgroundColors: try values.decode(PresentationThemeGradientColors.self, forKey: .background), - buttonColor: try decodeColor(values, .button)) - } -} - -extension PresentationThemeRootTabBar: Decodable { - enum CodingKeys: String, CodingKey { - case background - case separator - case icon - case selectedIcon - case text - case selectedText - case badgeBackground - case badgeStroke - case badgeText - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(backgroundColor: try decodeColor(values, .background), - separatorColor: try decodeColor(values, .separator), - iconColor: try decodeColor(values, .icon), - selectedIconColor: try decodeColor(values, .selectedIcon), - textColor: try decodeColor(values, .text), - selectedTextColor: try decodeColor(values, .selectedText), - badgeBackgroundColor: try decodeColor(values, .badgeBackground), - badgeStrokeColor: try decodeColor(values, .badgeStroke), - badgeTextColor: try decodeColor(values, .badgeText)) - } -} - -extension PresentationThemeRootNavigationBar: Decodable { - enum CodingKeys: String, CodingKey { - case button - case disabledButton - case primaryText - case secondaryText - case control - case accentText - case background - case separator - case badgeBackground - case badgeStroke - case badgeText - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(buttonColor: try decodeColor(values, .button), - disabledButtonColor: try decodeColor(values, .disabledButton), - primaryTextColor: try decodeColor(values, .primaryText), - secondaryTextColor: try decodeColor(values, .secondaryText), - controlColor: try decodeColor(values, .control), - accentTextColor: try decodeColor(values, .accentText), - backgroundColor: try decodeColor(values, .background), - separatorColor: try decodeColor(values, .separator), - badgeBackgroundColor: try decodeColor(values, .badgeBackground), - badgeStrokeColor: try decodeColor(values, .badgeStroke), - badgeTextColor: try decodeColor(values, .badgeText)) - } -} - -extension PresentationThemeNavigationSearchBar: Decodable { - enum CodingKeys: String, CodingKey { - case background - case accent - case inputFill - case inputText - case inputPlaceholderText - case inputIcon - case inputClearButton - case separator - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(backgroundColor: try decodeColor(values, .background), - accentColor: try decodeColor(values, .accent), - inputFillColor: try decodeColor(values, .inputFill), - inputTextColor: try decodeColor(values, .inputText), - inputPlaceholderTextColor: try decodeColor(values, .inputPlaceholderText), - inputIconColor: try decodeColor(values, .inputIcon), - inputClearButtonColor: try decodeColor(values, .inputClearButton), - separatorColor: try decodeColor(values, .separator)) - } -} - -extension PresentationThemeRootController: Decodable { - enum CodingKeys: String, CodingKey { - case statusBarStyle - case tabBar - case navigationBar - case navigationSearchBar - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(statusBarStyle: try values.decode(PresentationThemeStatusBarStyle.self, forKey: .statusBarStyle), - tabBar: try values.decode(PresentationThemeRootTabBar.self, forKey: .tabBar), - navigationBar: try values.decode(PresentationThemeRootNavigationBar.self, forKey: .navigationBar), - navigationSearchBar: try values.decode(PresentationThemeNavigationSearchBar.self, forKey: .navigationSearchBar)) - } -} - -extension PresentationThemeActionSheet: Decodable { - enum CodingKeys: String, CodingKey { - case dim - case backgroundType - case opaqueItemBackground - case itemBackground - case opaqueItemHighlightedBackground - case itemHighlightedBackground - case opaqueItemSeparator - case standardActionText - case destructiveActionText - case disabledActionText - case primaryText - case secondaryText - case controlAccent - case inputBackground - case inputHollowBackground - case inputBorder - case inputPlaceholder - case inputText - case inputClearButton - case checkContent - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(dimColor: try decodeColor(values, .dim), - backgroundType: try values.decode(PresentationThemeActionSheetBackgroundType.self, forKey: .backgroundType), - opaqueItemBackgroundColor: try decodeColor(values, .opaqueItemBackground), - itemBackgroundColor: try decodeColor(values, .itemBackground), - opaqueItemHighlightedBackgroundColor: try decodeColor(values, .opaqueItemHighlightedBackground), - itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBackground), - opaqueItemSeparatorColor: try decodeColor(values, .opaqueItemSeparator), - standardActionTextColor: try decodeColor(values, .standardActionText), - destructiveActionTextColor: try decodeColor(values, .destructiveActionText), - disabledActionTextColor: try decodeColor(values, .disabledActionText), - primaryTextColor: try decodeColor(values, .primaryText), - secondaryTextColor: try decodeColor(values, .secondaryText), - controlAccentColor: try decodeColor(values, .controlAccent), - inputBackgroundColor: try decodeColor(values, .inputBackground), - inputHollowBackgroundColor: try decodeColor(values, .inputHollowBackground), - inputBorderColor: try decodeColor(values, .inputBorder), - inputPlaceholderColor: try decodeColor(values, .inputPlaceholder), - inputTextColor: try decodeColor(values, .inputText), - inputClearButtonColor: try decodeColor(values, .inputClearButton), - checkContentColor: try decodeColor(values, .checkContent)) - } -} - -extension PresentationThemeSwitch: Decodable { - enum CodingKeys: String, CodingKey { - case frame - case handle - case content - case positive - case negative - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(frameColor: try decodeColor(values, .frame), - handleColor: try decodeColor(values, .handle), - contentColor: try decodeColor(values, .content), - positiveColor: try decodeColor(values, .positive), - negativeColor: try decodeColor(values, .negative)) - } -} - -extension PresentationThemeFillForeground: Decodable { - enum CodingKeys: String, CodingKey { - case fill - case foreground - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(fillColor: try decodeColor(values, .fill), - foregroundColor: try decodeColor(values, .foreground)) - } -} - -extension PresentationThemeItemDisclosureActions: Decodable { - enum CodingKeys: String, CodingKey { - case neutral1 - case neutral2 - case destructive - case constructive - case accent - case warning - case inactive - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(neutral1: try values.decode(PresentationThemeFillForeground.self, forKey: .neutral1), - neutral2: try values.decode(PresentationThemeFillForeground.self, forKey: .neutral2), - destructive: try values.decode(PresentationThemeFillForeground.self, forKey: .destructive), - constructive: try values.decode(PresentationThemeFillForeground.self, forKey: .constructive), - accent: try values.decode(PresentationThemeFillForeground.self, forKey: .accent), - warning: try values.decode(PresentationThemeFillForeground.self, forKey: .warning), - inactive: try values.decode(PresentationThemeFillForeground.self, forKey: .inactive)) - } -} - -extension PresentationThemeFillStrokeForeground: Decodable { - enum CodingKeys: String, CodingKey { - case fill - case stroke - case foreground - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(fillColor: try decodeColor(values, .fill), - strokeColor: try decodeColor(values, .stroke), - foregroundColor: try decodeColor(values, .foreground)) - } -} - -extension PresentationInputFieldTheme: Decodable { - enum CodingKeys: String, CodingKey { - case background - case placeholder - case primary - case control - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(backgroundColor: try decodeColor(values, .background), - placeholderColor: try decodeColor(values, .placeholder), - primaryColor: try decodeColor(values, .primary), - controlColor: try decodeColor(values, .control)) - } -} - -extension PresentationThemeList: Decodable { - enum CodingKeys: String, CodingKey { - case blocksBackground - case plainBackground - case itemPrimaryText - case itemSecondaryText - case itemDisabledText - case itemAccent - case itemHighlighted - case itemDestructive - case itemPlaceholderText - case itemBlocksBackground - case itemHighlightedBackground - case itemBlocksSeparator - case itemPlainSeparator - case disclosureArrow - case sectionHeaderText - case freeText - case freeTextError - case freeTextSuccess - case freeMonoIcon - case itemSwitch - case itemDisclosureActions - case itemCheck - case controlSecondary - case freeInputField - case mediaPlaceholder - case scrollIndicator - case pageIndicatorInactive - case inputClearButton - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - - self.init(blocksBackgroundColor: try decodeColor(values, .blocksBackground), - plainBackgroundColor: try decodeColor(values, .plainBackground), - itemPrimaryTextColor: try decodeColor(values, .itemPrimaryText), - itemSecondaryTextColor: try decodeColor(values, .itemSecondaryText), - itemDisabledTextColor: try decodeColor(values, .itemDisabledText), - itemAccentColor: try decodeColor(values, .itemAccent), - itemHighlightedColor: try decodeColor(values, .itemHighlighted), - itemDestructiveColor: try decodeColor(values, .itemDestructive), - itemPlaceholderTextColor: try decodeColor(values, .itemPlaceholderText), - itemBlocksBackgroundColor: try decodeColor(values, .itemBlocksBackground), - itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBackground), - itemBlocksSeparatorColor: try decodeColor(values, .itemBlocksSeparator), - itemPlainSeparatorColor: try decodeColor(values, .itemPlainSeparator), - disclosureArrowColor: try decodeColor(values, .disclosureArrow), - sectionHeaderTextColor: try decodeColor(values, .sectionHeaderText), - freeTextColor: try decodeColor(values, .freeText), - freeTextErrorColor: try decodeColor(values, .freeTextError), - freeTextSuccessColor: try decodeColor(values, .freeTextSuccess), - freeMonoIconColor: try decodeColor(values, .freeMonoIcon), - itemSwitchColors: try values.decode(PresentationThemeSwitch.self, forKey: .itemSwitch), - itemDisclosureActions: try values.decode(PresentationThemeItemDisclosureActions.self, forKey: .itemDisclosureActions), - itemCheckColors: try values.decode(PresentationThemeFillStrokeForeground.self, forKey: .itemCheck), - controlSecondaryColor: try decodeColor(values, .controlSecondary), - freeInputField: try values.decode(PresentationInputFieldTheme.self, forKey: .freeInputField), - mediaPlaceholderColor: try decodeColor(values, .mediaPlaceholder), - scrollIndicatorColor: try decodeColor(values, .scrollIndicator), - pageIndicatorInactiveColor: try decodeColor(values, .pageIndicatorInactive), - inputClearButtonColor: try decodeColor(values, .inputClearButton)) - } -} - -extension PresentationThemeArchiveAvatarColors: Decodable { - enum CodingKeys: String, CodingKey { - case background - case foreground - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(backgroundColors: try values.decode(PresentationThemeGradientColors.self, forKey: .background), - foregroundColor: try decodeColor(values, .foreground)) - } -} - -extension PresentationThemeChatList: Decodable { - enum CodingKeys: String, CodingKey { - case background - case itemSeparator - case itemBackground - case pinnedItemBackground - case itemHighlightedBackground - case itemSelectedBackground - case title - case secretTitle - case dateText - case authorName - case messageText - case messageDraftText - case checkmark - case pendingIndicator - case failedFill - case failedForeground - case muteIcon - case unreadBadgeActiveBackground - case unreadBadgeActiveText - case unreadBadgeInactiveBackground - case unreadBadgeInactiveText - case pinnedBadge - case pinnedSearchBar - case regularSearchBar - case sectionHeaderFill - case sectionHeaderText - case searchBarKeyboard - case verifiedIconFill - case verifiedIconForeground - case secretIcon - case pinnedArchiveAvatar - case unpinnedArchiveAvatar - case onlineDot - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(backgroundColor: try decodeColor(values, .background), - itemSeparatorColor: try decodeColor(values, .itemSeparator), - itemBackgroundColor: try decodeColor(values, .itemBackground), - pinnedItemBackgroundColor: try decodeColor(values, .pinnedItemBackground), - itemHighlightedBackgroundColor: try decodeColor(values, .itemHighlightedBackground), - itemSelectedBackgroundColor: try decodeColor(values, .itemSelectedBackground), - titleColor: try decodeColor(values, .title), - secretTitleColor: try decodeColor(values, .secretTitle), - dateTextColor: try decodeColor(values, .dateText), - authorNameColor: try decodeColor(values, .authorName), - messageTextColor: try decodeColor(values, .messageText), - messageDraftTextColor: try decodeColor(values, .messageDraftText), - checkmarkColor: try decodeColor(values, .checkmark), - pendingIndicatorColor: try decodeColor(values, .pendingIndicator), - failedFillColor: try decodeColor(values, .failedFill), - failedForegroundColor: try decodeColor(values, .failedForeground), - muteIconColor: try decodeColor(values, .muteIcon), - unreadBadgeActiveBackgroundColor: try decodeColor(values, .unreadBadgeActiveBackground), - unreadBadgeActiveTextColor: try decodeColor(values, .unreadBadgeActiveText), - unreadBadgeInactiveBackgroundColor: try decodeColor(values, .unreadBadgeInactiveBackground), - unreadBadgeInactiveTextColor: try decodeColor(values, .unreadBadgeInactiveText), - pinnedBadgeColor: try decodeColor(values, .pinnedBadge), - pinnedSearchBarColor: try decodeColor(values, .pinnedSearchBar), - regularSearchBarColor: try decodeColor(values, .regularSearchBar), - sectionHeaderFillColor: try decodeColor(values, .sectionHeaderFill), - sectionHeaderTextColor: try decodeColor(values, .sectionHeaderText), - searchBarKeyboardColor: try values.decode(PresentationThemeKeyboardColor.self, forKey: .searchBarKeyboard), - verifiedIconFillColor: try decodeColor(values, .verifiedIconFill), - verifiedIconForegroundColor: try decodeColor(values, .verifiedIconForeground), - secretIconColor: try decodeColor(values, .secretIcon), - pinnedArchiveAvatarColor: try values.decode(PresentationThemeArchiveAvatarColors.self, forKey: .pinnedArchiveAvatar), - unpinnedArchiveAvatarColor: try values.decode(PresentationThemeArchiveAvatarColors.self, forKey: .unpinnedArchiveAvatar), - onlineDotColor: try decodeColor(values, .onlineDot)) - } -} - -extension PresentationThemeBubbleColorComponents: Decodable { - enum CodingKeys: String, CodingKey { - case fill - case highlightedFill - case stroke - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(fill: try decodeColor(values, .fill), - highlightedFill: try decodeColor(values, .highlightedFill), - stroke: try decodeColor(values, .stroke)) - } -} - -extension PresentationThemeBubbleColor: Decodable { - enum CodingKeys: String, CodingKey { - case withWallpaper - case withoutWallpaper - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(withWallpaper: try values.decode(PresentationThemeBubbleColorComponents.self, forKey: .withWallpaper), - withoutWallpaper: try values.decode(PresentationThemeBubbleColorComponents.self, forKey: .withoutWallpaper)) - } -} - -extension PresentationThemeVariableColor: Decodable { - enum CodingKeys: String, CodingKey { - case withWallpaper - case withoutWallpaper - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(withWallpaper: try decodeColor(values, .withWallpaper), - withoutWallpaper: try decodeColor(values, .withoutWallpaper)) - } -} - -extension PresentationThemeChatBubblePolls: Decodable { - enum CodingKeys: String, CodingKey { - case radioButton - case radioProgress - case highlight - case separator - case bar - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(radioButton: try decodeColor(values, .radioButton), - radioProgress: try decodeColor(values, .radioProgress), - highlight: try decodeColor(values, .highlight), - separator: try decodeColor(values, .separator), - bar: try decodeColor(values, .bar)) - } -} - -extension PresentationThemePartedColors: Decodable { - enum CodingKeys: String, CodingKey { - case bubble - case primaryText - case secondaryText - case linkText - case linkHighlight - case scam - case textHighlight - case accentText - case accentControl - case mediaActiveControl - case mediaInactiveControl - case pendingActivity - case fileTitle - case fileDescription - case fileDuration - case mediaPlaceholder - case polls - case actionButtonsFill - case actionButtonsStroke - case actionButtonsText - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(bubble: try values.decode(PresentationThemeBubbleColor.self, forKey: .bubble), - primaryTextColor: try decodeColor(values, .primaryText), - secondaryTextColor: try decodeColor(values, .secondaryText), - linkTextColor: try decodeColor(values, .linkText), - linkHighlightColor: try decodeColor(values, .linkHighlight), - scamColor: try decodeColor(values, .scam), - textHighlightColor: try decodeColor(values, .textHighlight), - accentTextColor: try decodeColor(values, .accentText), - accentControlColor: try decodeColor(values, .accentControl), - mediaActiveControlColor: try decodeColor(values, .mediaActiveControl), - mediaInactiveControlColor: try decodeColor(values, .mediaInactiveControl), - pendingActivityColor: try decodeColor(values, .pendingActivity), - fileTitleColor: try decodeColor(values, .fileTitle), - fileDescriptionColor: try decodeColor(values, .fileDescription), - fileDurationColor: try decodeColor(values, .fileDuration), - mediaPlaceholderColor: try decodeColor(values, .mediaPlaceholder), - polls: try values.decode(PresentationThemeChatBubblePolls.self, forKey: .polls), - actionButtonsFillColor: try values.decode(PresentationThemeVariableColor.self, forKey: .actionButtonsFill), - actionButtonsStrokeColor: try values.decode(PresentationThemeVariableColor.self, forKey: .actionButtonsStroke), - actionButtonsTextColor: try values.decode(PresentationThemeVariableColor.self, forKey: .actionButtonsText)) - } -} - -extension PresentationThemeChatMessage: Decodable { - enum CodingKeys: String, CodingKey { - case incoming - case outgoing - case freeform - case infoPrimaryText - case infoLinkText - case outgoingCheck - case mediaDateAndStatusFill - case mediaDateAndStatusText - case shareButtonFill - case shareButtonStroke - case shareButtonForeground - case mediaOverlayControl - case selectionControl - case deliveryFailed - case mediaHighlightOverlay - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(incoming: try values.decode(PresentationThemePartedColors.self, forKey: .incoming), - outgoing: try values.decode(PresentationThemePartedColors.self, forKey: .outgoing), - freeform: try values.decode(PresentationThemeBubbleColor.self, forKey: .freeform), - infoPrimaryTextColor: try decodeColor(values, .infoPrimaryText), - infoLinkTextColor: try decodeColor(values, .infoLinkText), - outgoingCheckColor: try decodeColor(values, .outgoingCheck), - mediaDateAndStatusFillColor: try decodeColor(values, .mediaDateAndStatusFill), - mediaDateAndStatusTextColor: try decodeColor(values, .mediaDateAndStatusText), - shareButtonFillColor: try values.decode(PresentationThemeVariableColor.self, forKey: .shareButtonFill), - shareButtonStrokeColor: try values.decode(PresentationThemeVariableColor.self, forKey: .shareButtonStroke), - shareButtonForegroundColor: try values.decode(PresentationThemeVariableColor.self, forKey: .shareButtonForeground), - mediaOverlayControlColors: try values.decode(PresentationThemeFillForeground.self, forKey: .mediaOverlayControl), - selectionControlColors: try values.decode(PresentationThemeFillStrokeForeground.self, forKey: .selectionControl), - deliveryFailedColors: try values.decode(PresentationThemeFillForeground.self, forKey: .deliveryFailed), - mediaHighlightOverlayColor: try decodeColor(values, .mediaHighlightOverlay)) - } -} - -extension PresentationThemeServiceMessageColorComponents: Decodable { - enum CodingKeys: String, CodingKey { - case fill - case primaryText - case linkHighlight - case scam - case dateFillStatic - case dateFillFloating - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(fill: try decodeColor(values, .fill), - primaryText: try decodeColor(values, .primaryText), - linkHighlight: try decodeColor(values, .linkHighlight), - scam: try decodeColor(values, .scam), - dateFillStatic: try decodeColor(values, .dateFillStatic), - dateFillFloating: try decodeColor(values, .dateFillFloating)) - } -} - -extension PresentationThemeServiceMessageColor: Decodable { - enum CodingKeys: String, CodingKey { - case withDefaultWallpaper - case withCustomWallpaper - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(withDefaultWallpaper: try values.decode(PresentationThemeServiceMessageColorComponents.self, forKey: .withDefaultWallpaper), - withCustomWallpaper: try values.decode(PresentationThemeServiceMessageColorComponents.self, forKey: .withCustomWallpaper)) - } -} - -extension PresentationThemeServiceMessage: Decodable { - enum CodingKeys: String, CodingKey { - case components - case unreadBarFill - case unreadBarStroke - case unreadBarText - case dateText - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(components: try values.decode(PresentationThemeServiceMessageColor.self, forKey: .components), - unreadBarFillColor: try decodeColor(values, .unreadBarFill), - unreadBarStrokeColor: try decodeColor(values, .unreadBarStroke), - unreadBarTextColor: try decodeColor(values, .unreadBarText), - dateTextColor: try values.decode(PresentationThemeVariableColor.self, forKey: .dateText)) - } -} - -extension PresentationThemeChatInputPanelMediaRecordingControl: Decodable { - enum CodingKeys: String, CodingKey { - case button - case micLevel - case activeIcon - case panelControlFill - case panelControlStroke - case panelControlContentPrimary - case panelControlContentAccent - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(buttonColor: try decodeColor(values, .button), - micLevelColor: try decodeColor(values, .micLevel), - activeIconColor: try decodeColor(values, .activeIcon), - panelControlFillColor: try decodeColor(values, .panelControlFill), - panelControlStrokeColor: try decodeColor(values, .panelControlStroke), - panelControlContentPrimaryColor: try decodeColor(values, .panelControlContentPrimary), - panelControlContentAccentColor: try decodeColor(values, .panelControlContentAccent)) - } -} - -extension PresentationThemeChatInputPanel: Decodable { - enum CodingKeys: String, CodingKey { - case panelBackground - case panelStroke - case panelControlAccent - case panelControl - case panelControlDisabled - case panelControlDestructive - case inputBackground - case inputStroke - case inputPlaceholder - case inputText - case inputControl - case actionControlFill - case actionControlForeground - case primaryText - case secondaryText - case mediaRecordingDot - case keyboard - case mediaRecordingControl - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(panelBackgroundColor: try decodeColor(values, .panelBackground), - panelStrokeColor: try decodeColor(values, .panelStroke), - panelControlAccentColor: try decodeColor(values, .panelControlAccent), - panelControlColor: try decodeColor(values, .panelControl), - panelControlDisabledColor: try decodeColor(values, .panelControlDisabled), - panelControlDestructiveColor: try decodeColor(values, .panelControlDestructive), - inputBackgroundColor: try decodeColor(values, .inputBackground), - inputStrokeColor: try decodeColor(values, .inputStroke), - inputPlaceholderColor: try decodeColor(values, .inputPlaceholder), - inputTextColor: try decodeColor(values, .inputText), - inputControlColor: try decodeColor(values, .inputControl), - actionControlFillColor: try decodeColor(values, .actionControlFill), - actionControlForegroundColor: try decodeColor(values, .actionControlForeground), - primaryTextColor: try decodeColor(values, .primaryText), - secondaryTextColor: try decodeColor(values, .secondaryText), - mediaRecordingDotColor: try decodeColor(values, .mediaRecordingDot), - keyboardColor: try values.decode(PresentationThemeKeyboardColor.self, forKey: .keyboard), - mediaRecordingControl: try values.decode(PresentationThemeChatInputPanelMediaRecordingControl.self, forKey: .mediaRecordingControl)) - } -} - -extension PresentationThemeInputMediaPanel: Decodable { - enum CodingKeys: String, CodingKey { - case panelSeparator - case panelIcon - case panelHighlightedIconBackground - case stickersBackground - case stickersSectionText - case stickersSearchBackground - case stickersSearchPlaceholder - case stickersSearchPrimary - case stickersSearchControl - case gifsBackground - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(panelSeparatorColor: try decodeColor(values, .panelSeparator), - panelIconColor: try decodeColor(values, .panelIcon), - panelHighlightedIconBackgroundColor: try decodeColor(values, .panelHighlightedIconBackground), - stickersBackgroundColor: try decodeColor(values, .stickersBackground), - stickersSectionTextColor: try decodeColor(values, .stickersSectionText), - stickersSearchBackgroundColor: try decodeColor(values, .stickersSearchBackground), - stickersSearchPlaceholderColor: try decodeColor(values, .stickersSearchPlaceholder), - stickersSearchPrimaryColor: try decodeColor(values, .stickersSearchPrimary), - stickersSearchControlColor: try decodeColor(values, .stickersSearchControl), - gifsBackgroundColor: try decodeColor(values, .gifsBackground)) - } -} - -extension PresentationThemeInputButtonPanel: Decodable { - enum CodingKeys: String, CodingKey { - case panelSeparator - case panelBackground - case buttonFill - case buttonStroke - case buttonHighlightedFill - case buttonHighlightedStroke - case buttonText - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(panelSeparatorColor: try decodeColor(values, .panelSeparator), - panelBackgroundColor: try decodeColor(values, .panelBackground), - buttonFillColor: try decodeColor(values, .buttonFill), - buttonStrokeColor: try decodeColor(values, .buttonStroke), - buttonHighlightedFillColor: try decodeColor(values, .buttonHighlightedFill), - buttonHighlightedStrokeColor: try decodeColor(values, .buttonHighlightedStroke), - buttonTextColor: try decodeColor(values, .buttonText)) - } -} - -extension PresentationThemeChatHistoryNavigation: Decodable { - enum CodingKeys: String, CodingKey { - case fill - case stroke - case foreground - case badgeBackground - case badgeStroke - case badgeText - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(fillColor: try decodeColor(values, .fill), - strokeColor: try decodeColor(values, .stroke), - foregroundColor: try decodeColor(values, .foreground), - badgeBackgroundColor: try decodeColor(values, .badgeBackground), - badgeStrokeColor: try decodeColor(values, .badgeStroke), - badgeTextColor: try decodeColor(values, .badgeText)) - } -} - -extension PresentationThemeChat: Decodable { - enum CodingKeys: String, CodingKey { - case message - case serviceMessage - case inputPanel - case inputMediaPanel - case inputButtonPanel - case historyNavigation - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(message: try values.decode(PresentationThemeChatMessage.self, forKey: .message), - serviceMessage: try values.decode(PresentationThemeServiceMessage.self, forKey: .serviceMessage), - inputPanel: try values.decode(PresentationThemeChatInputPanel.self, forKey: .inputPanel), - inputMediaPanel: try values.decode(PresentationThemeInputMediaPanel.self, forKey: .inputMediaPanel), - inputButtonPanel: try values.decode(PresentationThemeInputButtonPanel.self, forKey: .inputButtonPanel), - historyNavigation: try values.decode(PresentationThemeChatHistoryNavigation.self, forKey: .historyNavigation)) - } -} - -extension PresentationThemeExpandedNotificationNavigationBar: Decodable { - enum CodingKeys: String, CodingKey { - case background - case primaryText - case control - case separator - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(backgroundColor: try decodeColor(values, .background), - primaryTextColor: try decodeColor(values, .primaryText), - controlColor: try decodeColor(values, .control), - separatorColor: try decodeColor(values, .separator)) - } -} - -extension PresentationThemeExpandedNotification: Decodable { - enum CodingKeys: String, CodingKey { - case backgroundType - case navigationBar - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(backgroundType: try values.decode(PresentationThemeExpandedNotificationBackgroundType.self, forKey: .backgroundType), - navigationBar: try values.decode(PresentationThemeExpandedNotificationNavigationBar.self, forKey: .navigationBar)) - } -} - -extension PresentationThemeInAppNotification: Decodable { - enum CodingKeys: String, CodingKey { - case fill - case primaryText - case expandedNotification - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(fillColor: try decodeColor(values, .fill), - primaryTextColor: try decodeColor(values, .primaryText), - expandedNotification: try values.decode(PresentationThemeExpandedNotification.self, forKey: .expandedNotification)) - } -} - -extension PresentationThemeName: Decodable { - public init(from decoder: Decoder) throws { - let value = try decoder.singleValueContainer() - self = .custom(try value.decode(String.self)) - } -} - -extension PresentationTheme: Decodable { - enum CodingKeys: String, CodingKey { - case name - case author - case dark - case auth - case passcode - case root - case list - case chatList - case chat - case actionSheet - case inAppNotification - } - - public convenience init(from decoder: Decoder) throws { - let values = try decoder.container(keyedBy: CodingKeys.self) - self.init(name: try values.decode(PresentationThemeName.self, forKey: .name), - author: (try? values.decode(String.self, forKey: .author)) ?? nil, - overallDarkAppearance: (try? values.decode(Bool.self, forKey: .dark)) ?? false, - auth: try values.decode(PresentationThemeAuth.self, forKey: .auth), - passcode: try values.decode(PresentationThemePasscode.self, forKey: .passcode), - rootController: try values.decode(PresentationThemeRootController.self, forKey: .root), - list: try values.decode(PresentationThemeList.self, forKey: .list), - chatList: try values.decode(PresentationThemeChatList.self, forKey: .chatList), - chat: try values.decode(PresentationThemeChat.self, forKey: .chat), - actionSheet: try values.decode(PresentationThemeActionSheet.self, forKey: .actionSheet), - inAppNotification: try values.decode(PresentationThemeInAppNotification.self, forKey: .inAppNotification)) - } -} diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeDecoder.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeDecoder.swift new file mode 100644 index 0000000000..ee3f80624c --- /dev/null +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeDecoder.swift @@ -0,0 +1,550 @@ +import Foundation + +public enum PresentationThemeDecodingError: Error { + case generic + case dataCorrupted + case valueNotFound + case typeMismatch + case keyNotFound +} + +internal protocol _YAMLStringDictionaryDecodableMarker { + static var elementType: Decodable.Type { get } +} + +extension Dictionary : _YAMLStringDictionaryDecodableMarker where Key == String, Value: Decodable { + static var elementType: Decodable.Type { return Value.self } +} + +open class PresentationThemeDecoder { + public init() {} + + open func decode(_ type: T.Type, from data: Data) throws -> T { + let topLevel: Any + do { + topLevel = try JSONSerialization.jsonObject(with: data) + } catch { + throw PresentationThemeDecodingError.dataCorrupted + } + + let decoder = PresentationThemeDecoding(referencing: topLevel) + guard let value = try decoder.unbox(topLevel, as: type) else { + throw PresentationThemeDecodingError.valueNotFound + } + + return value + } +} + +fileprivate class PresentationThemeDecoding : Decoder { + fileprivate var storage: PresentationThemeDecodingStorage + + fileprivate(set) public var codingPath: [CodingKey] + + public var userInfo: [CodingUserInfoKey : Any] { + return [:] + } + + fileprivate init(referencing container: Any, at codingPath: [CodingKey] = []) { + self.storage = PresentationThemeDecodingStorage() + self.storage.push(container: container) + self.codingPath = codingPath + } + + public func container(keyedBy type: Key.Type) throws -> KeyedDecodingContainer { + guard !(self.storage.topContainer is NSNull) else { + throw PresentationThemeDecodingError.valueNotFound + } + + guard let topContainer = self.storage.topContainer as? [String : Any] else { + throw PresentationThemeDecodingError.typeMismatch + } + + let container = PresentationThemeKeyedDecodingContainer(referencing: self, wrapping: topContainer) + return KeyedDecodingContainer(container) + } + + public func unkeyedContainer() throws -> UnkeyedDecodingContainer { + guard !(self.storage.topContainer is NSNull) else { + throw PresentationThemeDecodingError.valueNotFound + } + + guard let topContainer = self.storage.topContainer as? [Any] else { + throw PresentationThemeDecodingError.typeMismatch + } + + return PresentationThemeUnkeyedDecodingContainer(referencing: self, wrapping: topContainer) + } + + public func singleValueContainer() throws -> SingleValueDecodingContainer { + return self + } +} + +fileprivate struct PresentationThemeDecodingStorage { + private(set) fileprivate var containers: [Any] = [] + + fileprivate init() {} + + fileprivate var count: Int { + return self.containers.count + } + + fileprivate var topContainer: Any { + return self.containers.last! + } + + fileprivate mutating func push(container: __owned Any) { + self.containers.append(container) + } + + fileprivate mutating func popContainer() { + self.containers.removeLast() + } +} + +fileprivate struct PresentationThemeKeyedDecodingContainer : KeyedDecodingContainerProtocol { + typealias Key = K + + private let decoder: PresentationThemeDecoding + private let container: [String : Any] + private(set) public var codingPath: [CodingKey] + + fileprivate init(referencing decoder: PresentationThemeDecoding, wrapping container: [String : Any]) { + self.decoder = decoder + self.container = container + self.codingPath = decoder.codingPath + } + + public var allKeys: [Key] { + return self.container.keys.compactMap { Key(stringValue: $0) } + } + + public func contains(_ key: Key) -> Bool { + return self.container[key.stringValue] != nil + } + + private func _errorDescription(of key: CodingKey) -> String { + return "\(key) (\"\(key.stringValue)\")" + } + + public func decodeNil(forKey key: Key) throws -> Bool { + guard let entry = self.container[key.stringValue] else { + throw PresentationThemeDecodingError.keyNotFound + } + + return entry is NSNull + } + + public func decode(_ type: Bool.Type, forKey key: Key) throws -> Bool { + guard let entry = self.container[key.stringValue] else { + throw PresentationThemeDecodingError.keyNotFound + } + + self.decoder.codingPath.append(key) + defer { self.decoder.codingPath.removeLast() } + + guard let value = try self.decoder.unbox(entry, as: Bool.self) else { + throw PresentationThemeDecodingError.valueNotFound + } + + return value + } + + public func decode(_ type: Int32.Type, forKey key: Key) throws -> Int32 { + guard let entry = self.container[key.stringValue] else { + throw PresentationThemeDecodingError.keyNotFound + } + + self.decoder.codingPath.append(key) + defer { self.decoder.codingPath.removeLast() } + + guard let value = try self.decoder.unbox(entry, as: Int32.self) else { + throw PresentationThemeDecodingError.valueNotFound + } + + return value + } + + public func decode(_ type: String.Type, forKey key: Key) throws -> String { + guard let entry = self.container[key.stringValue] else { + throw PresentationThemeDecodingError.keyNotFound + } + + self.decoder.codingPath.append(key) + defer { self.decoder.codingPath.removeLast() } + + guard let value = try self.decoder.unbox(entry, as: String.self) else { + throw PresentationThemeDecodingError.valueNotFound + } + + return value + } + + public func decode(_ type: T.Type, forKey key: Key) throws -> T { + guard let entry = self.container[key.stringValue] else { + throw PresentationThemeDecodingError.keyNotFound + } + + self.decoder.codingPath.append(key) + defer { self.decoder.codingPath.removeLast() } + + guard let value = try self.decoder.unbox(entry, as: type) else { + throw PresentationThemeDecodingError.valueNotFound + } + + return value + } + + public func nestedContainer(keyedBy type: NestedKey.Type, forKey key: Key) throws -> KeyedDecodingContainer { + self.decoder.codingPath.append(key) + defer { self.decoder.codingPath.removeLast() } + + guard let value = self.container[key.stringValue] else { + throw PresentationThemeDecodingError.keyNotFound + } + + guard let dictionary = value as? [String : Any] else { + throw PresentationThemeDecodingError.typeMismatch + } + + let container = PresentationThemeKeyedDecodingContainer(referencing: self.decoder, wrapping: dictionary) + return KeyedDecodingContainer(container) + } + + public func nestedUnkeyedContainer(forKey key: Key) throws -> UnkeyedDecodingContainer { + self.decoder.codingPath.append(key) + defer { self.decoder.codingPath.removeLast() } + + guard let value = self.container[key.stringValue] else { + throw PresentationThemeDecodingError.keyNotFound + } + + guard let array = value as? [Any] else { + throw PresentationThemeDecodingError.typeMismatch + } + + return PresentationThemeUnkeyedDecodingContainer(referencing: self.decoder, wrapping: array) + } + + private func _superDecoder(forKey key: __owned CodingKey) throws -> Decoder { + self.decoder.codingPath.append(key) + defer { self.decoder.codingPath.removeLast() } + + let value: Any = self.container[key.stringValue] ?? NSNull() + return PresentationThemeDecoding(referencing: value, at: self.decoder.codingPath) + } + + public func superDecoder() throws -> Decoder { + return try _superDecoder(forKey: YAMLKey.super) + } + + public func superDecoder(forKey key: Key) throws -> Decoder { + return try _superDecoder(forKey: key) + } +} + +fileprivate struct PresentationThemeUnkeyedDecodingContainer : UnkeyedDecodingContainer { + private let decoder: PresentationThemeDecoding + + private let container: [Any] + + private(set) public var codingPath: [CodingKey] + private(set) public var currentIndex: Int + + fileprivate init(referencing decoder: PresentationThemeDecoding, wrapping container: [Any]) { + self.decoder = decoder + self.container = container + self.codingPath = decoder.codingPath + self.currentIndex = 0 + } + + public var count: Int? { + return self.container.count + } + + public var isAtEnd: Bool { + return self.currentIndex >= self.count! + } + + public mutating func decodeNil() throws -> Bool { + guard !self.isAtEnd else { + throw PresentationThemeDecodingError.valueNotFound + } + + if self.container[self.currentIndex] is NSNull { + self.currentIndex += 1 + return true + } else { + return false + } + } + + public mutating func decode(_ type: Bool.Type) throws -> Bool { + guard !self.isAtEnd else { + throw PresentationThemeDecodingError.valueNotFound + } + + self.decoder.codingPath.append(YAMLKey(index: self.currentIndex)) + defer { self.decoder.codingPath.removeLast() } + + guard let decoded = try self.decoder.unbox(self.container[self.currentIndex], as: Bool.self) else { + throw PresentationThemeDecodingError.valueNotFound + } + + self.currentIndex += 1 + return decoded + } + + public mutating func decode(_ type: Int32.Type) throws -> Int32 { + guard !self.isAtEnd else { + throw PresentationThemeDecodingError.valueNotFound + } + + self.decoder.codingPath.append(YAMLKey(index: self.currentIndex)) + defer { self.decoder.codingPath.removeLast() } + + guard let decoded = try self.decoder.unbox(self.container[self.currentIndex], as: Int32.self) else { + throw PresentationThemeDecodingError.valueNotFound + } + + self.currentIndex += 1 + return decoded + } + + public mutating func decode(_ type: String.Type) throws -> String { + guard !self.isAtEnd else { + throw PresentationThemeDecodingError.valueNotFound + } + + self.decoder.codingPath.append(YAMLKey(index: self.currentIndex)) + defer { self.decoder.codingPath.removeLast() } + + guard let decoded = try self.decoder.unbox(self.container[self.currentIndex], as: String.self) else { + throw PresentationThemeDecodingError.valueNotFound + } + + self.currentIndex += 1 + return decoded + } + + public mutating func decode(_ type: T.Type) throws -> T { + guard !self.isAtEnd else { + throw PresentationThemeDecodingError.valueNotFound + } + + self.decoder.codingPath.append(YAMLKey(index: self.currentIndex)) + defer { self.decoder.codingPath.removeLast() } + + guard let decoded = try self.decoder.unbox(self.container[self.currentIndex], as: type) else { + throw PresentationThemeDecodingError.valueNotFound + } + + self.currentIndex += 1 + return decoded + } + + public mutating func nestedContainer(keyedBy type: NestedKey.Type) throws -> KeyedDecodingContainer { + self.decoder.codingPath.append(YAMLKey(index: self.currentIndex)) + defer { self.decoder.codingPath.removeLast() } + + guard !self.isAtEnd else { + throw PresentationThemeDecodingError.valueNotFound + } + + let value = self.container[self.currentIndex] + guard !(value is NSNull) else { + throw PresentationThemeDecodingError.valueNotFound + } + + guard let dictionary = value as? [String : Any] else { + throw PresentationThemeDecodingError.typeMismatch + } + + self.currentIndex += 1 + let container = PresentationThemeKeyedDecodingContainer(referencing: self.decoder, wrapping: dictionary) + return KeyedDecodingContainer(container) + } + + public mutating func nestedUnkeyedContainer() throws -> UnkeyedDecodingContainer { + self.decoder.codingPath.append(YAMLKey(index: self.currentIndex)) + defer { self.decoder.codingPath.removeLast() } + + guard !self.isAtEnd else { + throw PresentationThemeDecodingError.valueNotFound + } + + let value = self.container[self.currentIndex] + guard !(value is NSNull) else { + throw PresentationThemeDecodingError.valueNotFound + } + + guard let array = value as? [Any] else { + throw PresentationThemeDecodingError.typeMismatch + } + + self.currentIndex += 1 + return PresentationThemeUnkeyedDecodingContainer(referencing: self.decoder, wrapping: array) + } + + public mutating func superDecoder() throws -> Decoder { + self.decoder.codingPath.append(YAMLKey(index: self.currentIndex)) + defer { self.decoder.codingPath.removeLast() } + + guard !self.isAtEnd else { + throw PresentationThemeDecodingError.valueNotFound + } + + let value = self.container[self.currentIndex] + self.currentIndex += 1 + return PresentationThemeDecoding(referencing: value, at: self.decoder.codingPath) + } +} + +extension PresentationThemeDecoding : SingleValueDecodingContainer { + private func expectNonNull(_ type: T.Type) throws { + guard !self.decodeNil() else { + throw PresentationThemeDecodingError.valueNotFound + } + } + + public func decodeNil() -> Bool { + return self.storage.topContainer is NSNull + } + + public func decode(_ type: Bool.Type) throws -> Bool { + try expectNonNull(Bool.self) + return try self.unbox(self.storage.topContainer, as: Bool.self)! + } + + public func decode(_ type: Int32.Type) throws -> Int32 { + try expectNonNull(Int32.self) + return try self.unbox(self.storage.topContainer, as: Int32.self)! + } + + public func decode(_ type: String.Type) throws -> String { + try expectNonNull(String.self) + return try self.unbox(self.storage.topContainer, as: String.self)! + } + + public func decode(_ type: T.Type) throws -> T { + try expectNonNull(type) + return try self.unbox(self.storage.topContainer, as: type)! + } +} + +extension PresentationThemeDecoding { + fileprivate func unbox(_ value: Any, as type: Bool.Type) throws -> Bool? { + guard !(value is NSNull) else { return nil } + + if let number = value as? NSNumber { + if number === kCFBooleanTrue as NSNumber { + return true + } else if number === kCFBooleanFalse as NSNumber { + return false + } + } + + throw PresentationThemeDecodingError.typeMismatch + } + + fileprivate func unbox(_ value: Any, as type: Int32.Type) throws -> Int32? { + guard !(value is NSNull) else { return nil } + + guard let number = value as? NSNumber, number !== kCFBooleanTrue, number !== kCFBooleanFalse else { + throw PresentationThemeDecodingError.typeMismatch + } + + let int32 = number.int32Value + guard NSNumber(value: int32) == number else { + throw PresentationThemeDecodingError.dataCorrupted + } + + return int32 + } + + fileprivate func unbox(_ value: Any, as type: String.Type) throws -> String? { + guard !(value is NSNull) else { return nil } + + guard let string = value as? String else { + throw PresentationThemeDecodingError.typeMismatch + } + + return string + } + + fileprivate func unbox(_ value: Any, as type: _YAMLStringDictionaryDecodableMarker.Type) throws -> T? { + guard !(value is NSNull) else { return nil } + + var result = [String : Any]() + guard let dict = value as? NSDictionary else { + throw PresentationThemeDecodingError.typeMismatch + } + let elementType = type.elementType + for (key, value) in dict { + let key = key as! String + self.codingPath.append(YAMLKey(stringValue: key, intValue: nil)) + defer { self.codingPath.removeLast() } + + result[key] = try unbox_(value, as: elementType) + } + + return result as? T + } + + fileprivate func unbox(_ value: Any, as type: T.Type) throws -> T? { + return try unbox_(value, as: type) as? T + } + + fileprivate func unbox_(_ value: Any, as type: Decodable.Type) throws -> Any? { + if type == Date.self || type == NSDate.self { + return try self.unbox(value, as: Date.self) + } else if type == Data.self || type == NSData.self { + return try self.unbox(value, as: Data.self) + } else if type == URL.self || type == NSURL.self { + guard let urlString = try self.unbox(value, as: String.self) else { + return nil + } + + guard let url = URL(string: urlString) else { + throw PresentationThemeDecodingError.dataCorrupted + } + return url + } else if type == Decimal.self || type == NSDecimalNumber.self { + return try self.unbox(value, as: Decimal.self) + } else if let stringKeyedDictType = type as? _YAMLStringDictionaryDecodableMarker.Type { + return try self.unbox(value, as: stringKeyedDictType) + } else { + self.storage.push(container: value) + defer { self.storage.popContainer() } + return try type.init(from: self) + } + } +} + +fileprivate struct YAMLKey : CodingKey { + public var stringValue: String + public var intValue: Int? + + public init?(stringValue: String) { + self.stringValue = stringValue + self.intValue = nil + } + + public init?(intValue: Int) { + self.stringValue = "\(intValue)" + self.intValue = intValue + } + + public init(stringValue: String, intValue: Int?) { + self.stringValue = stringValue + self.intValue = intValue + } + + fileprivate init(index: Int) { + self.stringValue = "Index \(index)" + self.intValue = index + } + + fileprivate static let `super` = YAMLKey(stringValue: "super")! +} diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeEncoder.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeEncoder.swift new file mode 100644 index 0000000000..d4938876f3 --- /dev/null +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeEncoder.swift @@ -0,0 +1,274 @@ +import Foundation + +public final class PresentationThemeEncoder { + public init() { + } + + public func encode(_ value: T) throws -> String { + let encoding = PresentationThemeEncoding() + try value.encode(to: encoding) + return encoding.data.formatted + } + + private func stringsFormat(from strings: [(String, String)]) -> String { + let strings = strings.map { "\($0.0): \($0.1)" } + return strings.joined(separator: "\n") + } +} + +private func renderNodes(string: inout String, nodes: [PresentationThemeEncoding.Node], level: Int = 0) { + for node in nodes { + if level > 1 { + string.append(String(repeating: " ", count: level - 1)) + } + switch node.value { + case let .string(value): + if let key = node.key { + string.append("\(key): \(value)\n") + } + case let .subnode(nodes): + if let key = node.key { + string.append("\(key):\n") + } + renderNodes(string: &string, nodes: nodes, level: level + 1) + } + } +} + +fileprivate class PresentationThemeEncoding: Encoder { + fileprivate enum NodeValue { + case string(String) + case subnode([Node]) + } + + fileprivate final class Node { + var key: String? + var value: NodeValue + + init(key: String? = nil, value: NodeValue) { + self.key = key + self.value = value + } + } + + fileprivate final class Data { + private(set) var rootNode = Node(value: .subnode([])) + + func encode(key codingKey: [CodingKey], value: String) { + var currentNode: Node = self.rootNode + for i in 0 ..< codingKey.count { + let key = codingKey[i].stringValue + var found = false + switch currentNode.value { + case var .subnode(nodes): + for node in nodes { + if node.key == key { + currentNode = node + found = true + } + } + if !found { + let newNode: Node + if i == codingKey.count - 1 { + newNode = Node(key: key, value: .string(value)) + } else { + newNode = Node(key: key, value: .subnode([])) + } + nodes.append(newNode) + currentNode.value = .subnode(nodes) + currentNode = newNode + } + case .string: + break + } + } + } + + var formatted: String { + var result = "" + renderNodes(string: &result, nodes: [self.rootNode]) + return result + } + } + + fileprivate var data: Data + var codingPath: [CodingKey] = [] + let userInfo: [CodingUserInfoKey : Any] = [:] + + init(to encodedData: Data = Data()) { + self.data = encodedData + } + + func container(keyedBy type: Key.Type) -> KeyedEncodingContainer { + var container = StringsKeyedEncoding(to: data) + container.codingPath = self.codingPath + return KeyedEncodingContainer(container) + } + + func unkeyedContainer() -> UnkeyedEncodingContainer { + var container = StringsUnkeyedEncoding(to: data) + container.codingPath = self.codingPath + return container + } + + func singleValueContainer() -> SingleValueEncodingContainer { + var container = StringsSingleValueEncoding(to: data) + container.codingPath = self.codingPath + return container + } +} + +fileprivate struct StringsKeyedEncoding: KeyedEncodingContainerProtocol { + private let data: PresentationThemeEncoding.Data + var codingPath: [CodingKey] = [] + + init(to data: PresentationThemeEncoding.Data) { + self.data = data + } + + mutating func encodeNil(forKey key: Key) throws { + } + + mutating func encode(_ value: Bool, forKey key: Key) throws { + self.data.encode(key: codingPath + [key], value: value.description) + } + + mutating func encode(_ value: String, forKey key: Key) throws { + self.data.encode(key: codingPath + [key], value: value) + } + + mutating func encode(_ value: Int32, forKey key: Key) throws { + self.data.encode(key: codingPath + [key], value: value.description) + } + + mutating func encode(_ value: T, forKey key: Key) throws { + let stringsEncoding = PresentationThemeEncoding(to: self.data) + stringsEncoding.codingPath = self.codingPath + [key] + try value.encode(to: stringsEncoding) + } + + mutating func nestedContainer( + keyedBy keyType: NestedKey.Type, + forKey key: Key) -> KeyedEncodingContainer { + var container = StringsKeyedEncoding(to: self.data) + container.codingPath = self.codingPath + [key] + return KeyedEncodingContainer(container) + } + + mutating func nestedUnkeyedContainer(forKey key: Key) -> UnkeyedEncodingContainer { + var container = StringsUnkeyedEncoding(to: data) + container.codingPath = self.codingPath + [key] + return container + } + + mutating func superEncoder() -> Encoder { + let superKey = Key(stringValue: "super")! + return superEncoder(forKey: superKey) + } + + mutating func superEncoder(forKey key: Key) -> Encoder { + let stringsEncoding = PresentationThemeEncoding(to: self.data) + stringsEncoding.codingPath = self.codingPath + [key] + return stringsEncoding + } +} + +fileprivate struct StringsUnkeyedEncoding: UnkeyedEncodingContainer { + private let data: PresentationThemeEncoding.Data + var codingPath: [CodingKey] = [] + private(set) var count: Int = 0 + + init(to data: PresentationThemeEncoding.Data) { + self.data = data + } + + private mutating func nextIndexedKey() -> CodingKey { + let nextCodingKey = IndexedCodingKey(intValue: count)! + self.count += 1 + return nextCodingKey + } + + private struct IndexedCodingKey: CodingKey { + let intValue: Int? + let stringValue: String + + init?(intValue: Int) { + self.intValue = intValue + self.stringValue = intValue.description + } + + init?(stringValue: String) { + return nil + } + } + + mutating func encodeNil() throws { + } + + mutating func encode(_ value: Bool) throws { + self.data.encode(key: self.codingPath + [self.nextIndexedKey()], value: value.description) + } + + mutating func encode(_ value: String) throws { + self.data.encode(key: self.codingPath + [self.nextIndexedKey()], value: value) + } + + mutating func encode(_ value: Int32) throws { + self.data.encode(key: self.codingPath + [self.nextIndexedKey()], value: value.description) + } + + mutating func encode(_ value: T) throws { + let stringsEncoding = PresentationThemeEncoding(to: self.data) + stringsEncoding.codingPath = self.codingPath + [self.nextIndexedKey()] + try value.encode(to: stringsEncoding) + } + + mutating func nestedContainer( + keyedBy keyType: NestedKey.Type) -> KeyedEncodingContainer { + var container = StringsKeyedEncoding(to: self.data) + container.codingPath = self.codingPath + [self.nextIndexedKey()] + return KeyedEncodingContainer(container) + } + + mutating func nestedUnkeyedContainer() -> UnkeyedEncodingContainer { + var container = StringsUnkeyedEncoding(to: self.data) + container.codingPath = self.codingPath + [self.nextIndexedKey()] + return container + } + + mutating func superEncoder() -> Encoder { + let stringsEncoding = PresentationThemeEncoding(to: self.data) + stringsEncoding.codingPath = self.codingPath + return stringsEncoding + } +} + +fileprivate struct StringsSingleValueEncoding: SingleValueEncodingContainer { + private let data: PresentationThemeEncoding.Data + var codingPath: [CodingKey] = [] + + init(to data: PresentationThemeEncoding.Data) { + self.data = data + } + + mutating func encodeNil() throws { + } + + mutating func encode(_ value: Bool) throws { + self.data.encode(key: self.codingPath, value: value.description) + } + + mutating func encode(_ value: String) throws { + self.data.encode(key: self.codingPath, value: value) + } + + mutating func encode(_ value: Int32) throws { + self.data.encode(key: self.codingPath, value: value.description) + } + + mutating func encode(_ value: T) throws { + let stringsEncoding = PresentationThemeEncoding(to: self.data) + stringsEncoding.codingPath = self.codingPath + try value.encode(to: stringsEncoding) + } +} diff --git a/submodules/TelegramPresentationData/TelegramPresentationData_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramPresentationData/TelegramPresentationData_Xcode.xcodeproj/project.pbxproj index e8517f9b66..5955d030f5 100644 --- a/submodules/TelegramPresentationData/TelegramPresentationData_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramPresentationData/TelegramPresentationData_Xcode.xcodeproj/project.pbxproj @@ -7,7 +7,10 @@ objects = { /* Begin PBXBuildFile section */ - 097A581B22D528680078B73C /* PresentationThemeDecodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 097A581A22D528680078B73C /* PresentationThemeDecodable.swift */; }; + 0938677D22E0B9CB000EF19E /* MakePresentationTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0938677C22E0B9CB000EF19E /* MakePresentationTheme.swift */; }; + 0957DE1522D88B82001B4D57 /* PresentationThemeEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0957DE1422D88B82001B4D57 /* PresentationThemeEncoder.swift */; }; + 0957DE1922D95E0F001B4D57 /* PresentationThemeDecoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0957DE1822D95E0F001B4D57 /* PresentationThemeDecoder.swift */; }; + 097A581B22D528680078B73C /* PresentationThemeCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 097A581A22D528680078B73C /* PresentationThemeCodable.swift */; }; D0AE31AB22B273F20058D3BC /* TelegramPresentationData.h in Headers */ = {isa = PBXBuildFile; fileRef = D0AE31A922B273F20058D3BC /* TelegramPresentationData.h */; settings = {ATTRIBUTES = (Public, ); }; }; D0AE31B422B2746B0058D3BC /* PresentationStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31B122B2746B0058D3BC /* PresentationStrings.swift */; }; D0AE31B522B2746B0058D3BC /* PresentationData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31B222B2746B0058D3BC /* PresentationData.swift */; }; @@ -23,16 +26,19 @@ D0AE31CB22B279D00058D3BC /* NumericFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31CA22B279D00058D3BC /* NumericFormat.swift */; }; D0AE31CD22B279FD0058D3BC /* PresentationsResourceCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31CC22B279FD0058D3BC /* PresentationsResourceCache.swift */; }; D0AE31D222B27A780058D3BC /* DefaultDarkPresentationTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31CE22B27A780058D3BC /* DefaultDarkPresentationTheme.swift */; }; - D0AE31D322B27A780058D3BC /* DefaultDarkAccentPresentationTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31CF22B27A780058D3BC /* DefaultDarkAccentPresentationTheme.swift */; }; + D0AE31D322B27A780058D3BC /* DefaultDarkTintedPresentationTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31CF22B27A780058D3BC /* DefaultDarkTintedPresentationTheme.swift */; }; D0AE31D422B27A780058D3BC /* DefaultPresentationStrings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31D022B27A780058D3BC /* DefaultPresentationStrings.swift */; }; - D0AE31D522B27A780058D3BC /* DefaultPresentationTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31D122B27A780058D3BC /* DefaultPresentationTheme.swift */; }; + D0AE31D522B27A780058D3BC /* DefaultDayPresentationTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31D122B27A780058D3BC /* DefaultDayPresentationTheme.swift */; }; D0AE31D822B27AAF0058D3BC /* EDSunriseSet.h in Headers */ = {isa = PBXBuildFile; fileRef = D0AE31D622B27AAE0058D3BC /* EDSunriseSet.h */; settings = {ATTRIBUTES = (Public, ); }; }; D0AE31D922B27AAF0058D3BC /* EDSunriseSet.m in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31D722B27AAE0058D3BC /* EDSunriseSet.m */; }; D0AE321422B2826A0058D3BC /* ComponentsThemes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE321322B282690058D3BC /* ComponentsThemes.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 097A581A22D528680078B73C /* PresentationThemeDecodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationThemeDecodable.swift; sourceTree = ""; }; + 0938677C22E0B9CB000EF19E /* MakePresentationTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MakePresentationTheme.swift; sourceTree = ""; }; + 0957DE1422D88B82001B4D57 /* PresentationThemeEncoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationThemeEncoder.swift; sourceTree = ""; }; + 0957DE1822D95E0F001B4D57 /* PresentationThemeDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationThemeDecoder.swift; sourceTree = ""; }; + 097A581A22D528680078B73C /* PresentationThemeCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationThemeCodable.swift; sourceTree = ""; }; D0AE31A622B273F20058D3BC /* TelegramPresentationData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TelegramPresentationData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0AE31A922B273F20058D3BC /* TelegramPresentationData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TelegramPresentationData.h; sourceTree = ""; }; D0AE31AA22B273F20058D3BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -50,9 +56,9 @@ D0AE31CA22B279D00058D3BC /* NumericFormat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NumericFormat.swift; sourceTree = ""; }; D0AE31CC22B279FD0058D3BC /* PresentationsResourceCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentationsResourceCache.swift; sourceTree = ""; }; D0AE31CE22B27A780058D3BC /* DefaultDarkPresentationTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultDarkPresentationTheme.swift; sourceTree = ""; }; - D0AE31CF22B27A780058D3BC /* DefaultDarkAccentPresentationTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultDarkAccentPresentationTheme.swift; sourceTree = ""; }; + D0AE31CF22B27A780058D3BC /* DefaultDarkTintedPresentationTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultDarkTintedPresentationTheme.swift; sourceTree = ""; }; D0AE31D022B27A780058D3BC /* DefaultPresentationStrings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultPresentationStrings.swift; sourceTree = ""; }; - D0AE31D122B27A780058D3BC /* DefaultPresentationTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultPresentationTheme.swift; sourceTree = ""; }; + D0AE31D122B27A780058D3BC /* DefaultDayPresentationTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultDayPresentationTheme.swift; sourceTree = ""; }; D0AE31D622B27AAE0058D3BC /* EDSunriseSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSunriseSet.h; sourceTree = ""; }; D0AE31D722B27AAE0058D3BC /* EDSunriseSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDSunriseSet.m; sourceTree = ""; }; D0AE321322B282690058D3BC /* ComponentsThemes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComponentsThemes.swift; sourceTree = ""; }; @@ -95,22 +101,25 @@ D0AE31A822B273F20058D3BC /* Sources */ = { isa = PBXGroup; children = ( + D0AE31D122B27A780058D3BC /* DefaultDayPresentationTheme.swift */, + D0AE31CE22B27A780058D3BC /* DefaultDarkPresentationTheme.swift */, + D0AE31CF22B27A780058D3BC /* DefaultDarkTintedPresentationTheme.swift */, + 0938677C22E0B9CB000EF19E /* MakePresentationTheme.swift */, + D0AE31D022B27A780058D3BC /* DefaultPresentationStrings.swift */, + D0AE31C622B2799B0058D3BC /* NumberPluralizationForm.h */, + D0AE31C722B2799B0058D3BC /* NumberPluralizationForm.m */, + D0AE31CA22B279D00058D3BC /* NumericFormat.swift */, + D0AE31C422B279720058D3BC /* StringPluralization.swift */, D0AE321322B282690058D3BC /* ComponentsThemes.swift */, D0AE31D622B27AAE0058D3BC /* EDSunriseSet.h */, D0AE31D722B27AAE0058D3BC /* EDSunriseSet.m */, - D0AE31CF22B27A780058D3BC /* DefaultDarkAccentPresentationTheme.swift */, - D0AE31CE22B27A780058D3BC /* DefaultDarkPresentationTheme.swift */, - D0AE31D022B27A780058D3BC /* DefaultPresentationStrings.swift */, - D0AE31D122B27A780058D3BC /* DefaultPresentationTheme.swift */, D0AE31CC22B279FD0058D3BC /* PresentationsResourceCache.swift */, - D0AE31CA22B279D00058D3BC /* NumericFormat.swift */, - D0AE31C622B2799B0058D3BC /* NumberPluralizationForm.h */, - D0AE31C722B2799B0058D3BC /* NumberPluralizationForm.m */, - D0AE31C422B279720058D3BC /* StringPluralization.swift */, D0AE31B222B2746B0058D3BC /* PresentationData.swift */, D0AE31B122B2746B0058D3BC /* PresentationStrings.swift */, D0AE31B322B2746B0058D3BC /* PresentationTheme.swift */, - 097A581A22D528680078B73C /* PresentationThemeDecodable.swift */, + 097A581A22D528680078B73C /* PresentationThemeCodable.swift */, + 0957DE1422D88B82001B4D57 /* PresentationThemeEncoder.swift */, + 0957DE1822D95E0F001B4D57 /* PresentationThemeDecoder.swift */, D0AE31A922B273F20058D3BC /* TelegramPresentationData.h */, ); path = Sources; @@ -210,10 +219,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D0AE31D522B27A780058D3BC /* DefaultPresentationTheme.swift in Sources */, + D0AE31D522B27A780058D3BC /* DefaultDayPresentationTheme.swift in Sources */, D0AE31D422B27A780058D3BC /* DefaultPresentationStrings.swift in Sources */, - 097A581B22D528680078B73C /* PresentationThemeDecodable.swift in Sources */, + 097A581B22D528680078B73C /* PresentationThemeCodable.swift in Sources */, + 0938677D22E0B9CB000EF19E /* MakePresentationTheme.swift in Sources */, D0AE31CB22B279D00058D3BC /* NumericFormat.swift in Sources */, + 0957DE1922D95E0F001B4D57 /* PresentationThemeDecoder.swift in Sources */, D0AE31B422B2746B0058D3BC /* PresentationStrings.swift in Sources */, D0AE321422B2826A0058D3BC /* ComponentsThemes.swift in Sources */, D0AE31C522B279720058D3BC /* StringPluralization.swift in Sources */, @@ -221,8 +232,9 @@ D0AE31C922B2799B0058D3BC /* NumberPluralizationForm.m in Sources */, D0AE31D922B27AAF0058D3BC /* EDSunriseSet.m in Sources */, D0AE31B522B2746B0058D3BC /* PresentationData.swift in Sources */, - D0AE31D322B27A780058D3BC /* DefaultDarkAccentPresentationTheme.swift in Sources */, + D0AE31D322B27A780058D3BC /* DefaultDarkTintedPresentationTheme.swift in Sources */, D0AE31B622B2746B0058D3BC /* PresentationTheme.swift in Sources */, + 0957DE1522D88B82001B4D57 /* PresentationThemeEncoder.swift in Sources */, D0AE31D222B27A780058D3BC /* DefaultDarkPresentationTheme.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/submodules/TelegramUI/TelegramUI/AppDelegate.swift b/submodules/TelegramUI/TelegramUI/AppDelegate.swift index d93d3bd387..24d8d7fec5 100644 --- a/submodules/TelegramUI/TelegramUI/AppDelegate.swift +++ b/submodules/TelegramUI/TelegramUI/AppDelegate.swift @@ -1866,8 +1866,8 @@ final class SharedApplicationContext { replyMessageCategory = UNNotificationCategory(identifier: "withReply", actions: [reply], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options) replyLegacyMessageCategory = UNNotificationCategory(identifier: "r", actions: [reply], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options) replyLegacyMediaMessageCategory = UNNotificationCategory(identifier: "m", actions: [reply], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options) - legacyChannelMessageCategory = UNNotificationCategory(identifier: "c", actions: [], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options) replyMediaMessageCategory = UNNotificationCategory(identifier: "withReplyMedia", actions: [reply], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options) + legacyChannelMessageCategory = UNNotificationCategory(identifier: "c", actions: [], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options) muteMessageCategory = UNNotificationCategory(identifier: "withMute", actions: [], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options) muteMediaMessageCategory = UNNotificationCategory(identifier: "withMuteMedia", actions: [], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: hiddenContentString, options: options) } else { @@ -1875,8 +1875,8 @@ final class SharedApplicationContext { replyMessageCategory = UNNotificationCategory(identifier: "withReply", actions: [reply], intentIdentifiers: [], options: []) replyLegacyMessageCategory = UNNotificationCategory(identifier: "r", actions: [reply], intentIdentifiers: [], options: []) replyLegacyMediaMessageCategory = UNNotificationCategory(identifier: "m", actions: [reply], intentIdentifiers: [], options: []) + replyMediaMessageCategory = UNNotificationCategory(identifier: "withReplyMedia", actions: [reply], intentIdentifiers: [], options: []) legacyChannelMessageCategory = UNNotificationCategory(identifier: "c", actions: [], intentIdentifiers: [], options: []) - replyMediaMessageCategory = UNNotificationCategory(identifier: "withReplyMedia", actions: [reply], intentIdentifiers: [], options: []) muteMessageCategory = UNNotificationCategory(identifier: "withMute", actions: [], intentIdentifiers: [], options: []) muteMediaMessageCategory = UNNotificationCategory(identifier: "withMuteMedia", actions: [], intentIdentifiers: [], options: []) } @@ -1892,9 +1892,50 @@ final class SharedApplicationContext { } }) } else { + let reply = UIMutableUserNotificationAction() + reply.identifier = "reply" + reply.title = replyString + reply.isDestructive = false + if #available(iOS 9.0, *) { + reply.isAuthenticationRequired = false + reply.behavior = .textInput + reply.activationMode = .background + } else { + reply.isAuthenticationRequired = true + reply.activationMode = .foreground + } + + let unknownMessageCategory = UIMutableUserNotificationCategory() + unknownMessageCategory.identifier = "unknown" + + let replyMessageCategory = UIMutableUserNotificationCategory() + replyMessageCategory.identifier = "withReply" + replyMessageCategory.setActions([reply], for: .default) + + let replyLegacyMessageCategory = UIMutableUserNotificationCategory() + replyLegacyMessageCategory.identifier = "r" + replyLegacyMessageCategory.setActions([reply], for: .default) + + let replyLegacyMediaMessageCategory = UIMutableUserNotificationCategory() + replyLegacyMediaMessageCategory.identifier = "m" + replyLegacyMediaMessageCategory.setActions([reply], for: .default) + + let replyMediaMessageCategory = UIMutableUserNotificationCategory() + replyMediaMessageCategory.identifier = "withReplyMedia" + replyMediaMessageCategory.setActions([reply], for: .default) + + let legacyChannelMessageCategory = UIMutableUserNotificationCategory() + legacyChannelMessageCategory.identifier = "c" + + let muteMessageCategory = UIMutableUserNotificationCategory() + muteMessageCategory.identifier = "withMute" + + let muteMediaMessageCategory = UIMutableUserNotificationCategory() + muteMediaMessageCategory.identifier = "withMuteMedia" + + let categories = [unknownMessageCategory, replyMessageCategory, replyLegacyMessageCategory, replyLegacyMediaMessageCategory, replyMediaMessageCategory, legacyChannelMessageCategory, muteMessageCategory, muteMediaMessageCategory] let settings = UIUserNotificationSettings(types: [.badge, .sound, .alert], categories:[]) UIApplication.shared.registerUserNotificationSettings(settings) - UIApplication.shared.registerForRemoteNotifications() } } diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift index 773d349b40..323be5f7c1 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceController.swift @@ -750,7 +750,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail } controllers.append(self.awaitingAccountResetController(protectedUntil: protectedUntil, number: number)) self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty) - case let .signUp(_, _, _, firstName, lastName, termsOfService, _): + case let .signUp(_, _, firstName, lastName, termsOfService, _): var controllers: [ViewController] = [] var displayCancel = false if !self.otherAccountPhoneNumbers.1.isEmpty { diff --git a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift index dad2008f1e..1d810fea23 100644 --- a/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift +++ b/submodules/TelegramUI/TelegramUI/AuthorizationSequenceSplashController.swift @@ -69,7 +69,7 @@ final class AuthorizationSequenceSplashController: ViewController { }) }) - self.controller = RMIntroViewController(backgroundColor: theme.list.plainBackgroundColor, primaryColor: theme.list.itemPrimaryTextColor, buttonColor: theme.auth.introStartButtonColor, accentColor: theme.list.itemAccentColor, regularDotColor: theme.auth.introDotColor, highlightedDotColor: theme.list.itemPrimaryTextColor, suggestedLocalizationSignal: localizationSignal) + self.controller = RMIntroViewController(backgroundColor: theme.list.plainBackgroundColor, primaryColor: theme.list.itemPrimaryTextColor, buttonColor: theme.intro.startButtonColor, accentColor: theme.list.itemAccentColor, regularDotColor: theme.intro.dotColor, highlightedDotColor: theme.list.itemPrimaryTextColor, suggestedLocalizationSignal: localizationSignal) super.init(navigationBarPresentationData: nil) diff --git a/submodules/TelegramUI/TelegramUI/CachedChannelAdmins.swift b/submodules/TelegramUI/TelegramUI/CachedChannelAdmins.swift index 3afbd153e5..961b3c67d5 100644 --- a/submodules/TelegramUI/TelegramUI/CachedChannelAdmins.swift +++ b/submodules/TelegramUI/TelegramUI/CachedChannelAdmins.swift @@ -3,19 +3,57 @@ import Postbox import TelegramCore import SwiftSignalKit -final class CachedChannelAdminIds: PostboxCoding { - let ids: Set - - init(ids: Set) { - self.ids = ids - } +enum CachedChannelAdminRank: PostboxCoding, Equatable { + case owner + case admin + case custom(String) init(decoder: PostboxDecoder) { - self.ids = Set(decoder.decodeInt64ArrayForKey("ids").map(PeerId.init)) + let value: Int32 = decoder.decodeInt32ForKey("v", orElse: 0) + switch value { + case 0: + self = .owner + case 1: + self = .admin + case 2: + self = .custom(decoder.decodeStringForKey("s", orElse: "")) + default: + self = .admin + } } func encode(_ encoder: PostboxEncoder) { - encoder.encodeInt64Array(Array(self.ids.map({ $0.toInt64() })), forKey: "ids") + switch self { + case .owner: + encoder.encodeInt32(0, forKey: "v") + case .admin: + encoder.encodeInt32(1, forKey: "v") + case let .custom(rank): + encoder.encodeInt32(2, forKey: "v") + encoder.encodeString(rank, forKey: "s") + } + } +} + +final class CachedChannelAdminRanks: PostboxCoding { + let ranks: Dictionary + + init(ranks: Dictionary) { + self.ranks = ranks + } + + init(decoder: PostboxDecoder) { + self.ranks = decoder.decodeObjectDictionaryForKey("ranks", keyDecoder: { decoder in + return PeerId(decoder.decodeInt64ForKey("k", orElse: 0)) + }, valueDecoder: { decoder in + return CachedChannelAdminRank(decoder: decoder) + }) + } + + func encode(_ encoder: PostboxEncoder) { + encoder.encodeObjectDictionary(self.ranks, forKey: "ranks", keyEncoder: { key, encoder in + encoder.encodeInt64(key.toInt64(), forKey: "k") + }) } static func cacheKey(peerId: PeerId) -> ValueBoxKey { @@ -27,12 +65,12 @@ final class CachedChannelAdminIds: PostboxCoding { private let collectionSpec = ItemCacheCollectionSpec(lowWaterItemCount: 100, highWaterItemCount: 200) -func cachedChannelAdminIdsEntryId(peerId: PeerId) -> ItemCacheEntryId { - return ItemCacheEntryId(collectionId: 100, key: CachedChannelAdminIds.cacheKey(peerId: peerId)) +func cachedChannelAdminRanksEntryId(peerId: PeerId) -> ItemCacheEntryId { + return ItemCacheEntryId(collectionId: 100, key: CachedChannelAdminRanks.cacheKey(peerId: peerId)) } -func updateCachedChannelAdminIds(postbox: Postbox, peerId: PeerId, ids: Set) -> Signal { +func updateCachedChannelAdminRanks(postbox: Postbox, peerId: PeerId, ranks: Dictionary) -> Signal { return postbox.transaction { transaction -> Void in - transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: 100, key: CachedChannelAdminIds.cacheKey(peerId: peerId)), entry: CachedChannelAdminIds(ids: ids), collectionSpec: collectionSpec) + transaction.putItemCacheEntry(id: ItemCacheEntryId(collectionId: 100, key: CachedChannelAdminRanks.cacheKey(peerId: peerId)), entry: CachedChannelAdminRanks(ranks: ranks), collectionSpec: collectionSpec) } } diff --git a/submodules/TelegramUI/TelegramUI/ChannelAdminController.swift b/submodules/TelegramUI/TelegramUI/ChannelAdminController.swift index c2063fc5e3..6c0632f472 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelAdminController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelAdminController.swift @@ -6,22 +6,27 @@ import Postbox import TelegramCore import TelegramPresentationData +private let rankMaxLength: Int32 = 16 + private final class ChannelAdminControllerArguments { let account: Account let toggleRight: (TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags) -> Void let transferOwnership: () -> Void + let updateRank: (String, String) -> Void let dismissAdmin: () -> Void - init(account: Account, toggleRight: @escaping (TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags) -> Void, transferOwnership: @escaping () -> Void, dismissAdmin: @escaping () -> Void) { + init(account: Account, toggleRight: @escaping (TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags) -> Void, transferOwnership: @escaping () -> Void, updateRank: @escaping (String, String) -> Void, dismissAdmin: @escaping () -> Void) { self.account = account self.toggleRight = toggleRight self.transferOwnership = transferOwnership + self.updateRank = updateRank self.dismissAdmin = dismissAdmin } } private enum ChannelAdminSection: Int32 { case info + case rank case rights case transfer case dismiss @@ -29,6 +34,8 @@ private enum ChannelAdminSection: Int32 { private enum ChannelAdminEntryStableId: Hashable { case info + case rankTitle + case rank case rightsTitle case right(TelegramChatAdminRightsFlags) case addAdminsInfo @@ -39,14 +46,18 @@ private enum ChannelAdminEntryStableId: Hashable { switch self { case .info: return 0 - case .rightsTitle: + case .rankTitle: return 1 - case .addAdminsInfo: + case .rank: return 2 - case .dismiss: + case .rightsTitle: return 3 - case .transfer: + case .addAdminsInfo: return 4 + case .dismiss: + return 5 + case .transfer: + return 6 case let .right(flags): return flags.rawValue.hashValue } @@ -60,6 +71,18 @@ private enum ChannelAdminEntryStableId: Hashable { } else { return false } + case .rankTitle: + if case .rankTitle = rhs { + return true + } else { + return false + } + case .rank: + if case .rank = rhs { + return true + } else { + return false + } case .rightsTitle: if case .rightsTitle = rhs { return true @@ -96,6 +119,8 @@ private enum ChannelAdminEntryStableId: Hashable { private enum ChannelAdminEntry: ItemListNodeEntry { case info(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, Peer, TelegramUserPresence?) + case rankTitle(PresentationTheme, String, Int32, Int32) + case rank(PresentationTheme, String, String) case rightsTitle(PresentationTheme, String) case rightItem(PresentationTheme, Int, String, TelegramChatAdminRightsFlags, TelegramChatAdminRightsFlags, Bool, Bool) case addAdminsInfo(PresentationTheme, String) @@ -106,6 +131,8 @@ private enum ChannelAdminEntry: ItemListNodeEntry { switch self { case .info: return ChannelAdminSection.info.rawValue + case .rankTitle, .rank: + return ChannelAdminSection.rank.rawValue case .rightsTitle, .rightItem, .addAdminsInfo: return ChannelAdminSection.rights.rawValue case .transfer: @@ -119,6 +146,10 @@ private enum ChannelAdminEntry: ItemListNodeEntry { switch self { case .info: return .info + case .rankTitle: + return .rankTitle + case .rank: + return .rank case .rightsTitle: return .rightsTitle case let .rightItem(_, _, _, right, _, _, _): @@ -152,6 +183,18 @@ private enum ChannelAdminEntry: ItemListNodeEntry { return false } + return true + } else { + return false + } + case let .rankTitle(lhsTheme, lhsText, lhsCount, lhsLimit): + if case let .rankTitle(rhsTheme, rhsText, rhsCount, rhsLimit) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsCount == rhsCount, lhsLimit == rhsLimit { + return true + } else { + return false + } + case let .rank(lhsTheme, lhsPlaceholder, lhsValue): + if case let .rank(rhsTheme, rhsPlaceholder, rhsValue) = rhs, lhsTheme === rhsTheme, lhsPlaceholder == rhsPlaceholder, lhsValue == rhsValue { return true } else { return false @@ -219,9 +262,23 @@ private enum ChannelAdminEntry: ItemListNodeEntry { default: return true } + case .rankTitle: + switch rhs { + case .info, .rankTitle: + return false + default: + return true + } + case .rank: + switch rhs { + case .info, .rankTitle, .rank: + return false + default: + return true + } case .rightsTitle: switch rhs { - case .info, .rightsTitle: + case .info, .rankTitle, .rank, .rightsTitle: return false default: return true @@ -260,6 +317,14 @@ private enum ChannelAdminEntry: ItemListNodeEntry { return ItemListAvatarAndNameInfoItem(account: arguments.account, theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: presence, cachedData: nil, state: ItemListAvatarAndNameInfoItemState(), sectionId: self.section, style: .blocks(withTopInset: true, withExtendedBottomInset: false), editingNameUpdated: { _ in }, avatarTapped: { }) + case let .rankTitle(theme, text, count, limit): + let accessoryText = ItemListSectionHeaderAccessoryText(value: "\(limit - count)", color: count > limit ? .destructive : .generic) + return ItemListSectionHeaderItem(theme: theme, text: text, accessoryText: accessoryText, sectionId: self.section) + case let .rank(theme, placeholder, text): + return ItemListSingleLineInputItem(theme: theme, title: NSAttributedString(string: "", textColor: .black), text: text, placeholder: placeholder, type: .regular(capitalization: false, autocorrection: true), spacing: 0.0, clearButton: true, tag: nil, sectionId: self.section, textUpdated: { updatedText in + arguments.updateRank(text, updatedText) + }, action: { + }) case let .rightsTitle(theme, text): return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section) case let .rightItem(theme, _, text, right, flags, value, enabled): @@ -282,10 +347,12 @@ private enum ChannelAdminEntry: ItemListNodeEntry { private struct ChannelAdminControllerState: Equatable { let updatedFlags: TelegramChatAdminRightsFlags? + let updatedRank: String? let updating: Bool - init(updatedFlags: TelegramChatAdminRightsFlags? = nil, updating: Bool = false) { + init(updatedFlags: TelegramChatAdminRightsFlags? = nil, updatedRank: String? = nil, updating: Bool = false) { self.updatedFlags = updatedFlags + self.updatedRank = updatedRank self.updating = updating } @@ -293,6 +360,9 @@ private struct ChannelAdminControllerState: Equatable { if lhs.updatedFlags != rhs.updatedFlags { return false } + if lhs.updatedRank != rhs.updatedRank { + return false + } if lhs.updating != rhs.updating { return false } @@ -300,11 +370,15 @@ private struct ChannelAdminControllerState: Equatable { } func withUpdatedUpdatedFlags(_ updatedFlags: TelegramChatAdminRightsFlags?) -> ChannelAdminControllerState { - return ChannelAdminControllerState(updatedFlags: updatedFlags, updating: self.updating) + return ChannelAdminControllerState(updatedFlags: updatedFlags, updatedRank: self.updatedRank, updating: self.updating) + } + + func withUpdatedUpdatedRank(_ updatedRank: String?) -> ChannelAdminControllerState { + return ChannelAdminControllerState(updatedFlags: self.updatedFlags, updatedRank: updatedRank, updating: self.updating) } func withUpdatedUpdating(_ updating: Bool) -> ChannelAdminControllerState { - return ChannelAdminControllerState(updatedFlags: self.updatedFlags, updating: updating) + return ChannelAdminControllerState(updatedFlags: self.updatedFlags, updatedRank: self.updatedRank, updating: updating) } } @@ -368,7 +442,7 @@ private func canEditAdminRights(accountPeerId: PeerId, channelView: PeerView, in switch initialParticipant { case .creator: return false - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if let adminInfo = adminInfo { return adminInfo.canBeEditedByAccountPeer || adminInfo.promotedBy == accountPeerId } else { @@ -403,28 +477,144 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s if let channel = channelView.peers[channelView.peerId] as? TelegramChannel, let admin = adminView.peers[adminView.peerId] { entries.append(.info(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, admin, adminView.peerPresences[admin.id] as? TelegramUserPresence)) - entries.append(.rightsTitle(presentationData.theme, presentationData.strings.Channel_EditAdmin_PermissionsHeader)) + var isCreator = false + if let initialParticipant = initialParticipant, case .creator = initialParticipant { + isCreator = true + } - let isGroup: Bool - let maskRightsFlags: TelegramChatAdminRightsFlags - let rightsOrder: [TelegramChatAdminRightsFlags] + let currentRank: String? + if let updatedRank = state.updatedRank { + currentRank = updatedRank + } else if let initialParticipant = initialParticipant { + currentRank = initialParticipant.rank + } else { + currentRank = nil + } - switch channel.info { - case .broadcast: - isGroup = false - maskRightsFlags = .broadcastSpecific - rightsOrder = [ - .canChangeInfo, - .canPostMessages, - .canEditMessages, - .canDeleteMessages, - .canInviteUsers, - .canAddAdmins - ] - case .group: - isGroup = true - maskRightsFlags = .groupSpecific - rightsOrder = [ + entries.append(.rankTitle(presentationData.theme, presentationData.strings.Group_EditAdmin_RankTitle.uppercased(), Int32(currentRank?.count ?? 0), rankMaxLength)) + entries.append(.rank(presentationData.theme, isCreator ? presentationData.strings.Group_EditAdmin_RankOwnerPlaceholder : presentationData.strings.Group_EditAdmin_RankAdminPlaceholder, currentRank ?? "")) + + if isCreator { + } else { + entries.append(.rightsTitle(presentationData.theme, presentationData.strings.Channel_EditAdmin_PermissionsHeader)) + + let isGroup: Bool + let maskRightsFlags: TelegramChatAdminRightsFlags + let rightsOrder: [TelegramChatAdminRightsFlags] + + switch channel.info { + case .broadcast: + isGroup = false + maskRightsFlags = .broadcastSpecific + rightsOrder = [ + .canChangeInfo, + .canPostMessages, + .canEditMessages, + .canDeleteMessages, + .canInviteUsers, + .canAddAdmins + ] + case .group: + isGroup = true + maskRightsFlags = .groupSpecific + rightsOrder = [ + .canChangeInfo, + .canDeleteMessages, + .canBanUsers, + .canInviteUsers, + .canPinMessages, + .canAddAdmins + ] + } + + if canEditAdminRights(accountPeerId: accountPeerId, channelView: channelView, initialParticipant: initialParticipant) { + let accountUserRightsFlags: TelegramChatAdminRightsFlags + if channel.flags.contains(.isCreator) { + accountUserRightsFlags = maskRightsFlags + } else if let adminRights = channel.adminRights { + accountUserRightsFlags = maskRightsFlags.intersection(adminRights.flags) + } else { + accountUserRightsFlags = [] + } + + let currentRightsFlags: TelegramChatAdminRightsFlags + if let updatedFlags = state.updatedFlags { + currentRightsFlags = updatedFlags + } else if let initialParticipant = initialParticipant, case let .member(_, _, maybeAdminRights, _, _) = initialParticipant, let adminRights = maybeAdminRights { + currentRightsFlags = adminRights.rights.flags + } else { + currentRightsFlags = accountUserRightsFlags.subtracting(.canAddAdmins) + } + + var index = 0 + for right in rightsOrder { + if accountUserRightsFlags.contains(right) { + entries.append(.rightItem(presentationData.theme, index, stringForRight(strings: presentationData.strings, right: right, isGroup: isGroup, defaultBannedRights: channel.defaultBannedRights), right, currentRightsFlags, currentRightsFlags.contains(right), !state.updating && admin.id != accountPeerId)) + index += 1 + } + } + + if accountUserRightsFlags.contains(.canAddAdmins) { + entries.append(.addAdminsInfo(presentationData.theme, currentRightsFlags.contains(.canAddAdmins) ? presentationData.strings.Channel_EditAdmin_PermissinAddAdminOn : presentationData.strings.Channel_EditAdmin_PermissinAddAdminOff)) + } + + if let admin = admin as? TelegramUser, admin.botInfo == nil && !admin.isDeleted && channel.flags.contains(.isCreator) && areAllAdminRightsEnabled(currentRightsFlags, group: isGroup) { + entries.append(.transfer(presentationData.theme, isGroup ? presentationData.strings.Group_EditAdmin_TransferOwnership : presentationData.strings.Channel_EditAdmin_TransferOwnership)) + } + + if let initialParticipant = initialParticipant, case let .member(participant) = initialParticipant, let adminInfo = participant.adminInfo, !adminInfo.rights.flags.isEmpty && admin.id != accountPeerId { + var canDismiss = false + if channel.flags.contains(.isCreator) { + canDismiss = true + } else { + switch initialParticipant { + case .creator: + break + case let .member(_, _, adminInfo, _, _): + if let adminInfo = adminInfo { + if adminInfo.promotedBy == accountPeerId || adminInfo.canBeEditedByAccountPeer { + canDismiss = true + } + } + } + } + if canDismiss { + entries.append(.dismiss(presentationData.theme, presentationData.strings.Channel_Moderator_AccessLevelRevoke)) + } + } + } else if let initialParticipant = initialParticipant, case let .member(_, _, maybeAdminInfo, _, _) = initialParticipant, let adminInfo = maybeAdminInfo { + var index = 0 + for right in rightsOrder { + entries.append(.rightItem(presentationData.theme, index, stringForRight(strings: presentationData.strings, right: right, isGroup: isGroup, defaultBannedRights: channel.defaultBannedRights), right, adminInfo.rights.flags, adminInfo.rights.flags.contains(right), false)) + index += 1 + } + } + } + } else if let group = channelView.peers[channelView.peerId] as? TelegramGroup, let admin = adminView.peers[adminView.peerId] { + entries.append(.info(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, admin, adminView.peerPresences[admin.id] as? TelegramUserPresence)) + + var isCreator = false + if let initialParticipant = initialParticipant, case .creator = initialParticipant { + isCreator = true + } + + let currentRank: String? + if let updatedRank = state.updatedRank { + currentRank = updatedRank + } else { + currentRank = nil + } + + entries.append(.rankTitle(presentationData.theme, presentationData.strings.Group_EditAdmin_RankTitle.uppercased(), Int32(currentRank?.count ?? 0), rankMaxLength)) + entries.append(.rank(presentationData.theme, isCreator ? presentationData.strings.Group_EditAdmin_RankOwnerPlaceholder : presentationData.strings.Group_EditAdmin_RankAdminPlaceholder, currentRank ?? "")) + + if isCreator { + } else { + entries.append(.rightsTitle(presentationData.theme, presentationData.strings.Channel_EditAdmin_PermissionsHeader)) + + let isGroup = true + let maskRightsFlags: TelegramChatAdminRightsFlags = .groupSpecific + let rightsOrder: [TelegramChatAdminRightsFlags] = [ .canChangeInfo, .canDeleteMessages, .canBanUsers, @@ -432,115 +622,37 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s .canPinMessages, .canAddAdmins ] - } - if canEditAdminRights(accountPeerId: accountPeerId, channelView: channelView, initialParticipant: initialParticipant) { - let accountUserRightsFlags: TelegramChatAdminRightsFlags - if channel.flags.contains(.isCreator) { - accountUserRightsFlags = maskRightsFlags - } else if let adminRights = channel.adminRights { - accountUserRightsFlags = maskRightsFlags.intersection(adminRights.flags) - } else { - accountUserRightsFlags = [] - } - + let accountUserRightsFlags: TelegramChatAdminRightsFlags = maskRightsFlags + let currentRightsFlags: TelegramChatAdminRightsFlags if let updatedFlags = state.updatedFlags { currentRightsFlags = updatedFlags - } else if let initialParticipant = initialParticipant, case let .member(_, _, maybeAdminRights, _) = initialParticipant, let adminRights = maybeAdminRights { - currentRightsFlags = adminRights.rights.flags + } else if let initialParticipant = initialParticipant, case let .member(_, _, maybeAdminRights, _, _) = initialParticipant, let adminRights = maybeAdminRights { + currentRightsFlags = adminRights.rights.flags.subtracting(.canAddAdmins) } else { currentRightsFlags = accountUserRightsFlags.subtracting(.canAddAdmins) } - + var index = 0 for right in rightsOrder { if accountUserRightsFlags.contains(right) { - entries.append(.rightItem(presentationData.theme, index, stringForRight(strings: presentationData.strings, right: right, isGroup: isGroup, defaultBannedRights: channel.defaultBannedRights), right, currentRightsFlags, currentRightsFlags.contains(right), !state.updating && admin.id != accountPeerId)) + entries.append(.rightItem(presentationData.theme, index, stringForRight(strings: presentationData.strings, right: right, isGroup: isGroup, defaultBannedRights: group.defaultBannedRights), right, currentRightsFlags, currentRightsFlags.contains(right), !state.updating)) index += 1 } } - + if accountUserRightsFlags.contains(.canAddAdmins) { entries.append(.addAdminsInfo(presentationData.theme, currentRightsFlags.contains(.canAddAdmins) ? presentationData.strings.Channel_EditAdmin_PermissinAddAdminOn : presentationData.strings.Channel_EditAdmin_PermissinAddAdminOff)) } + + if let admin = admin as? TelegramUser, case .creator = group.role, admin.botInfo == nil && !admin.isDeleted && areAllAdminRightsEnabled(currentRightsFlags, group: true) { + entries.append(.transfer(presentationData.theme, presentationData.strings.Group_EditAdmin_TransferOwnership)) + } - if let admin = admin as? TelegramUser, admin.botInfo == nil && !admin.isDeleted && channel.flags.contains(.isCreator) && areAllAdminRightsEnabled(currentRightsFlags, group: isGroup) { - entries.append(.transfer(presentationData.theme, isGroup ? presentationData.strings.Group_EditAdmin_TransferOwnership : presentationData.strings.Channel_EditAdmin_TransferOwnership)) - } - if let initialParticipant = initialParticipant, case let .member(participant) = initialParticipant, let adminInfo = participant.adminInfo, !adminInfo.rights.flags.isEmpty && admin.id != accountPeerId { - var canDismiss = false - if channel.flags.contains(.isCreator) { - canDismiss = true - } else { - switch initialParticipant { - case .creator: - break - case let .member(_, _, adminInfo, _): - if let adminInfo = adminInfo { - if adminInfo.promotedBy == accountPeerId || adminInfo.canBeEditedByAccountPeer { - canDismiss = true - } - } - } - } - if canDismiss { - entries.append(.dismiss(presentationData.theme, presentationData.strings.Channel_Moderator_AccessLevelRevoke)) - } + entries.append(.dismiss(presentationData.theme, presentationData.strings.Channel_Moderator_AccessLevelRevoke)) } - } else if let initialParticipant = initialParticipant, case let .member(_, _, maybeAdminInfo, _) = initialParticipant, let adminInfo = maybeAdminInfo { - var index = 0 - for right in rightsOrder { - entries.append(.rightItem(presentationData.theme, index, stringForRight(strings: presentationData.strings, right: right, isGroup: isGroup, defaultBannedRights: channel.defaultBannedRights), right, adminInfo.rights.flags, adminInfo.rights.flags.contains(right), false)) - index += 1 - } - } - } else if let group = channelView.peers[channelView.peerId] as? TelegramGroup, let admin = adminView.peers[adminView.peerId] { - entries.append(.info(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, admin, adminView.peerPresences[admin.id] as? TelegramUserPresence)) - - entries.append(.rightsTitle(presentationData.theme, presentationData.strings.Channel_EditAdmin_PermissionsHeader)) - - let isGroup = true - let maskRightsFlags: TelegramChatAdminRightsFlags = .groupSpecific - let rightsOrder: [TelegramChatAdminRightsFlags] = [ - .canChangeInfo, - .canDeleteMessages, - .canBanUsers, - .canInviteUsers, - .canPinMessages, - .canAddAdmins - ] - - let accountUserRightsFlags: TelegramChatAdminRightsFlags = maskRightsFlags - - let currentRightsFlags: TelegramChatAdminRightsFlags - if let updatedFlags = state.updatedFlags { - currentRightsFlags = updatedFlags - } else if let initialParticipant = initialParticipant, case let .member(_, _, maybeAdminRights, _) = initialParticipant, let adminRights = maybeAdminRights { - currentRightsFlags = adminRights.rights.flags.subtracting(.canAddAdmins) - } else { - currentRightsFlags = accountUserRightsFlags.subtracting(.canAddAdmins) - } - - var index = 0 - for right in rightsOrder { - if accountUserRightsFlags.contains(right) { - entries.append(.rightItem(presentationData.theme, index, stringForRight(strings: presentationData.strings, right: right, isGroup: isGroup, defaultBannedRights: group.defaultBannedRights), right, currentRightsFlags, currentRightsFlags.contains(right), !state.updating)) - index += 1 - } - } - - if accountUserRightsFlags.contains(.canAddAdmins) { - entries.append(.addAdminsInfo(presentationData.theme, currentRightsFlags.contains(.canAddAdmins) ? presentationData.strings.Channel_EditAdmin_PermissinAddAdminOn : presentationData.strings.Channel_EditAdmin_PermissinAddAdminOff)) - } - - if let admin = admin as? TelegramUser, admin.botInfo == nil && !admin.isDeleted && group.role == .creator && areAllAdminRightsEnabled(currentRightsFlags, group: true) { - entries.append(.transfer(presentationData.theme, presentationData.strings.Group_EditAdmin_TransferOwnership)) - } - - if let initialParticipant = initialParticipant, case let .member(participant) = initialParticipant, let adminInfo = participant.adminInfo, !adminInfo.rights.flags.isEmpty && admin.id != accountPeerId { - entries.append(.dismiss(presentationData.theme, presentationData.strings.Channel_Moderator_AccessLevelRevoke)) } } @@ -564,6 +676,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi var dismissImpl: (() -> Void)? var presentControllerImpl: ((ViewController, Any?) -> Void)? + var errorImpl: (() -> Void)? let actualPeerId = Atomic(value: peerId) let upgradedToSupergroupImpl: (PeerId, @escaping () -> Void) -> Void = { peerId, completion in @@ -606,6 +719,10 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi presentControllerImpl?(controller, nil) })) }) + }, updateRank: { previousRank, updatedRank in + if updatedRank != previousRank { + updateState { $0.withUpdatedUpdatedRank(updatedRank) } + } }, dismissAdmin: { let presentationData = context.sharedContext.currentPresentationData.with { $0 } let actionSheet = ActionSheetController(presentationTheme: presentationData.theme) @@ -624,7 +741,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi dismissImpl?() })) } else { - updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: [])) |> deliverOnMainQueue).start(error: { _ in + updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: []), rank: nil) |> deliverOnMainQueue).start(error: { _ in }, completed: { updated(TelegramChatAdminRights(flags: [])) @@ -668,29 +785,35 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi if let channel = channelView.peers[channelView.peerId] as? TelegramChannel { if let initialParticipant = initialParticipant { var updateFlags: TelegramChatAdminRightsFlags? + var updateRank: String? updateState { current in updateFlags = current.updatedFlags - if let _ = updateFlags { - return current.withUpdatedUpdating(true) - } else { - return current - } + updateRank = current.updatedRank + return current } - if updateFlags == nil { - switch initialParticipant { - case .creator: - break - case let .member(member): + if let updateRank = updateRank, updateRank.count > rankMaxLength { + errorImpl?() + return + } + + let maskRightsFlags: TelegramChatAdminRightsFlags + switch channel.info { + case .broadcast: + maskRightsFlags = .broadcastSpecific + case .group: + maskRightsFlags = .groupSpecific + } + + var currentRank: String? + var currentFlags: TelegramChatAdminRightsFlags? + switch initialParticipant { + case let .creator(creator): + currentRank = creator.rank + currentFlags = maskRightsFlags + case let .member(member): + if updateFlags == nil { if member.adminInfo?.rights == nil { - let maskRightsFlags: TelegramChatAdminRightsFlags - switch channel.info { - case .broadcast: - maskRightsFlags = .broadcastSpecific - case .group: - maskRightsFlags = .groupSpecific - } - if channel.flags.contains(.isCreator) { updateFlags = maskRightsFlags.subtracting(.canAddAdmins) } else if let adminRights = channel.adminRights { @@ -699,27 +822,48 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi updateFlags = [] } } - } + } + currentRank = member.rank + currentFlags = member.adminInfo?.rights.flags } + let effectiveRank = updateRank ?? currentRank + if let updateFlags = updateFlags { updateState { current in return current.withUpdatedUpdating(true) } - updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: updateFlags)) |> deliverOnMainQueue).start(error: { _ in + updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: updateFlags), rank: effectiveRank) |> deliverOnMainQueue).start(error: { _ in }, completed: { updated(TelegramChatAdminRights(flags: updateFlags)) dismissImpl?() })) + } else if let updateRank = updateRank, let currentFlags = currentFlags { + updateState { current in + return current.withUpdatedUpdating(true) + } + updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: currentFlags), rank: updateRank) |> deliverOnMainQueue).start(error: { _ in + + }, completed: { + updated(TelegramChatAdminRights(flags: currentFlags)) + dismissImpl?() + })) } else { dismissImpl?() } } else if canEdit { var updateFlags: TelegramChatAdminRightsFlags? + var updateRank: String? updateState { current in updateFlags = current.updatedFlags - return current.withUpdatedUpdating(true) + updateRank = current.updatedRank + return current + } + + if let updateRank = updateRank, updateRank.count > rankMaxLength { + errorImpl?() + return } if updateFlags == nil { @@ -744,7 +888,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi updateState { current in return current.withUpdatedUpdating(true) } - updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: updateFlags)) |> deliverOnMainQueue).start(error: { error in + updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: updateFlags), rank: "") |> deliverOnMainQueue).start(error: { error in if case let .addMemberError(error) = error, case .restricted = error, let admin = adminView.peers[adminView.peerId] { var text = presentationData.strings.Privacy_GroupsAndChannels_InviteToChannelError(admin.compactDisplayTitle, admin.compactDisplayTitle).0 if case .group = channel.info { @@ -761,11 +905,20 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi } } else if let _ = channelView.peers[channelView.peerId] as? TelegramGroup { var updateFlags: TelegramChatAdminRightsFlags? + var updateRank: String? updateState { current in updateFlags = current.updatedFlags + if let updatedRank = current.updatedRank, !updatedRank.isEmpty { + updateRank = updatedRank + } return current } + if let updateRank = updateRank, updateRank.count > rankMaxLength { + errorImpl?() + return + } + let maskRightsFlags: TelegramChatAdminRightsFlags = .groupSpecific let defaultFlags = maskRightsFlags.subtracting(.canAddAdmins) @@ -774,7 +927,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi } if let updateFlags = updateFlags { - if initialParticipant?.adminInfo == nil && updateFlags == defaultFlags { + if initialParticipant?.adminInfo == nil && updateFlags == defaultFlags && updateRank == nil { updateState { current in return current.withUpdatedUpdating(true) } @@ -788,7 +941,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi }, completed: { dismissImpl?() })) - } else if updateFlags != defaultFlags { + } else if updateFlags != defaultFlags || updateRank != nil { let signal = convertGroupToSupergroup(account: context.account, peerId: peerId) |> map(Optional.init) |> `catch` { _ -> Signal in @@ -798,7 +951,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi guard let upgradedPeerId = upgradedPeerId else { return .fail(.generic) } - return context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: upgradedPeerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: updateFlags)) + return context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: upgradedPeerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: updateFlags), rank: updateRank) |> mapToSignal { _ -> Signal in return .complete() } @@ -849,5 +1002,16 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi presentControllerImpl = { [weak controller] value, presentationArguments in controller?.present(value, in: .window(.root), with: presentationArguments) } + + let hapticFeedback = HapticFeedback() + errorImpl = { [weak controller] in + hapticFeedback.error() + controller?.forEachItemNode { itemNode in + if let itemNode = itemNode as? ItemListSingleLineInputItemNode { + itemNode.animateError() + } + } + } + return controller } diff --git a/submodules/TelegramUI/TelegramUI/ChannelAdminsController.swift b/submodules/TelegramUI/TelegramUI/ChannelAdminsController.swift index f64bf7025f..e48d51d41a 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelAdminsController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelAdminsController.swift @@ -66,7 +66,7 @@ private enum ChannelAdminsEntry: ItemListNodeEntry { case recentActions(PresentationTheme, String) case adminsHeader(PresentationTheme, String) - case adminPeerItem(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, Bool, Int32, RenderedChannelParticipant, ItemListPeerItemEditing, Bool) + case adminPeerItem(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, Bool, Int32, RenderedChannelParticipant, ItemListPeerItemEditing, Bool, Bool) case addAdmin(PresentationTheme, String, Bool) case adminsInfo(PresentationTheme, String) @@ -89,7 +89,7 @@ private enum ChannelAdminsEntry: ItemListNodeEntry { return .index(4) case .adminsInfo: return .index(5) - case let .adminPeerItem(_, _, _, _, _, _, participant, _, _): + case let .adminPeerItem(_, _, _, _, _, _, participant, _, _, _): return .peer(participant.peer.id) } } @@ -108,8 +108,8 @@ private enum ChannelAdminsEntry: ItemListNodeEntry { } else { return false } - case let .adminPeerItem(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsNameOrder, lhsIsGroup, lhsIndex, lhsParticipant, lhsEditing, lhsEnabled): - if case let .adminPeerItem(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsNameOrder, rhsIsGroup, rhsIndex, rhsParticipant, rhsEditing, rhsEnabled) = rhs { + case let .adminPeerItem(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsNameOrder, lhsIsGroup, lhsIndex, lhsParticipant, lhsEditing, lhsEnabled, lhsHasAction): + if case let .adminPeerItem(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsNameOrder, rhsIsGroup, rhsIndex, rhsParticipant, rhsEditing, rhsEnabled, rhsHasAction) = rhs { if lhsTheme !== rhsTheme { return false } @@ -137,6 +137,9 @@ private enum ChannelAdminsEntry: ItemListNodeEntry { if lhsEnabled != rhsEnabled { return false } + if lhsHasAction != rhsHasAction { + return false + } return true } else { return false @@ -167,11 +170,11 @@ private enum ChannelAdminsEntry: ItemListNodeEntry { default: return true } - case let .adminPeerItem(_, _, _, _, _, index, _, _, _): + case let .adminPeerItem(_, _, _, _, _, index, _, _, _, _): switch rhs { case .recentActions, .adminsHeader, .addAdmin: return false - case let .adminPeerItem(_, _, _, _, _, rhsIndex, _, _, _): + case let .adminPeerItem(_, _, _, _, _, rhsIndex, _, _, _, _): return index < rhsIndex default: return true @@ -196,14 +199,13 @@ private enum ChannelAdminsEntry: ItemListNodeEntry { }) case let .adminsHeader(theme, title): return ItemListSectionHeaderItem(theme: theme, text: title, sectionId: self.section) - case let .adminPeerItem(theme, strings, dateTimeFormat, nameDisplayOrder, _, _, participant, editing, enabled): + case let .adminPeerItem(theme, strings, dateTimeFormat, nameDisplayOrder, _, _, participant, editing, enabled, hasAction): let peerText: String - let action: (() -> Void)? + var action: (() -> Void)? switch participant.participant { case .creator: peerText = strings.Channel_Management_LabelOwner - action = nil - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if let adminInfo = adminInfo { if let peer = participant.peers[adminInfo.promotedBy] { if peer.id == participant.peer.id { @@ -217,9 +219,11 @@ private enum ChannelAdminsEntry: ItemListNodeEntry { } else { peerText = "" } - action = { - arguments.openAdmin(participant.participant) - } + } + if hasAction { + action = { + arguments.openAdmin(participant.participant) + } } return ItemListPeerItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, account: arguments.account, peer: participant.peer, presence: nil, text: .text(peerText), label: .none, editing: editing, switchValue: nil, enabled: enabled, selectable: true, sectionId: self.section, action: action, setPeerIdWithRevealedOptions: { previousId, id in arguments.setPeerIdWithRevealedOptions(previousId, id) @@ -321,7 +325,6 @@ private func channelAdminsControllerEntries(presentationData: PresentationData, var isGroup = false if case .group = peer.info { isGroup = true - entries.append(.recentActions(presentationData.theme, presentationData.strings.Group_Info_AdminLog)) } else { entries.append(.recentActions(presentationData.theme, presentationData.strings.Group_Info_AdminLog)) @@ -352,37 +355,39 @@ private func channelAdminsControllerEntries(presentationData: PresentationData, switch lhs.participant { case .creator: lhsInvitedAt = Int32.min - case let .member(_, invitedAt, _, _): + case let .member(_, invitedAt, _, _, _): lhsInvitedAt = invitedAt } let rhsInvitedAt: Int32 switch rhs.participant { case .creator: rhsInvitedAt = Int32.min - case let .member(_, invitedAt, _, _): + case let .member(_, invitedAt, _, _, _): rhsInvitedAt = invitedAt } return lhsInvitedAt < rhsInvitedAt }) { if !state.removedPeerIds.contains(participant.peer.id) { - var editable = true + var canEdit = true + var canOpen = true switch participant.participant { case .creator: - editable = false - case let .member(id, _, adminInfo, _): + canEdit = false + canOpen = peer.flags.contains(.isCreator) + case let .member(id, _, adminInfo, _, _): if id == accountPeerId { - editable = false + canEdit = false } else if let adminInfo = adminInfo { if peer.flags.contains(.isCreator) || adminInfo.promotedBy == accountPeerId { - editable = true + canEdit = true } else { - editable = false + canEdit = false } } else { - editable = false + canEdit = false } } - entries.append(.adminPeerItem(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, isGroup, index, participant, ItemListPeerItemEditing(editable: editable, editing: state.editing, revealed: participant.peer.id == state.peerIdWithRevealedOptions), state.removingPeerId != participant.peer.id && existingParticipantIds.contains(participant.peer.id))) + entries.append(.adminPeerItem(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, isGroup, index, participant, ItemListPeerItemEditing(editable: canEdit, editing: state.editing, revealed: participant.peer.id == state.peerIdWithRevealedOptions), state.removingPeerId != participant.peer.id && existingParticipantIds.contains(participant.peer.id), canOpen)) index += 1 } } @@ -421,37 +426,44 @@ private func channelAdminsControllerEntries(presentationData: PresentationData, switch lhs.participant { case .creator: lhsInvitedAt = Int32.min - case let .member(_, invitedAt, _, _): + case let .member(_, invitedAt, _, _, _): lhsInvitedAt = invitedAt } let rhsInvitedAt: Int32 switch rhs.participant { case .creator: rhsInvitedAt = Int32.min - case let .member(_, invitedAt, _, _): + case let .member(_, invitedAt, _, _, _): rhsInvitedAt = invitedAt } return lhsInvitedAt < rhsInvitedAt }) { if !state.removedPeerIds.contains(participant.peer.id) { var editable = true + var canEdit = true switch participant.participant { - case .creator: - editable = false - case let .member(id, _, adminInfo, _): - if id == accountPeerId { + case .creator: editable = false - } else if let adminInfo = adminInfo { - if peer.role == .creator || adminInfo.promotedBy == accountPeerId { - editable = true + if case .creator = peer.role { + } else { + canEdit = false + } + case let .member(id, _, adminInfo, _, _): + if id == accountPeerId { + editable = false + } else if let adminInfo = adminInfo { + if case .creator = peer.role { + editable = true + } else if adminInfo.promotedBy == accountPeerId { + editable = true + } else { + editable = false + } } else { editable = false } - } else { - editable = false - } } - entries.append(.adminPeerItem(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, isGroup, index, participant, ItemListPeerItemEditing(editable: editable, editing: state.editing, revealed: participant.peer.id == state.peerIdWithRevealedOptions), state.removingPeerId != participant.peer.id && existingParticipantIds.contains(participant.peer.id))) + entries.append(.adminPeerItem(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, isGroup, index, participant, ItemListPeerItemEditing(editable: editable, editing: state.editing, revealed: participant.peer.id == state.peerIdWithRevealedOptions), state.removingPeerId != participant.peer.id && existingParticipantIds.contains(participant.peer.id), canEdit)) index += 1 } } @@ -540,7 +552,7 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa } })) } else { - removeAdminDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: [])) + removeAdminDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(flags: []), rank: nil) |> deliverOnMainQueue).start(completed: { updateState { return $0.withUpdatedRemovingPeerId(nil) @@ -563,7 +575,7 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa switch participant.participant { case .creator: return - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): if let banInfo = banInfo { var canUnban = false if banInfo.restrictedBy != context.account.peerId { @@ -637,12 +649,12 @@ public func channelAdminsController(context: AccountContext, peerId: PeerId, loa if let peer = peerView.peers[participant.peerId] { switch participant { case .creator: - result.append(RenderedChannelParticipant(participant: .creator(id: peer.id), peer: peer)) + result.append(RenderedChannelParticipant(participant: .creator(id: peer.id, rank: nil), peer: peer)) case .admin: var peers: [PeerId: Peer] = [:] peers[creator.id] = creator peers[peer.id] = peer - result.append(RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: .groupSpecific), promotedBy: creator.id, canBeEditedByAccountPeer: creator.id == context.account.peerId), banInfo: nil), peer: peer, peers: peers)) + result.append(RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: .groupSpecific), promotedBy: creator.id, canBeEditedByAccountPeer: creator.id == context.account.peerId), banInfo: nil, rank: nil), peer: peer, peers: peers)) case .member: break } diff --git a/submodules/TelegramUI/TelegramUI/ChannelBannedMemberController.swift b/submodules/TelegramUI/TelegramUI/ChannelBannedMemberController.swift index b128affe53..2a0da2efda 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelBannedMemberController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelBannedMemberController.swift @@ -278,7 +278,7 @@ private func channelBannedMemberControllerEntries(presentationData: Presentation let currentRightsFlags: TelegramChatBannedRightsFlags if let updatedFlags = state.updatedFlags { currentRightsFlags = updatedFlags - } else if let initialParticipant = initialParticipant, case let .member(_, _, _, maybeBanInfo) = initialParticipant, let banInfo = maybeBanInfo { + } else if let initialParticipant = initialParticipant, case let .member(_, _, _, maybeBanInfo, _) = initialParticipant, let banInfo = maybeBanInfo { currentRightsFlags = banInfo.rights.flags } else { currentRightsFlags = defaultBannedRights.flags @@ -287,7 +287,7 @@ private func channelBannedMemberControllerEntries(presentationData: Presentation let currentTimeout: Int32 if let updatedTimeout = state.updatedTimeout { currentTimeout = updatedTimeout - } else if let initialParticipant = initialParticipant, case let .member(_, _, _, maybeBanInfo) = initialParticipant, let banInfo = maybeBanInfo { + } else if let initialParticipant = initialParticipant, case let .member(_, _, _, maybeBanInfo, _) = initialParticipant, let banInfo = maybeBanInfo { currentTimeout = banInfo.rights.untilDate } else { currentTimeout = Int32.max @@ -324,7 +324,7 @@ private func channelBannedMemberControllerEntries(presentationData: Presentation let currentRightsFlags: TelegramChatBannedRightsFlags if let updatedFlags = state.updatedFlags { currentRightsFlags = updatedFlags - } else if let initialParticipant = initialParticipant, case let .member(_, _, _, maybeBanInfo) = initialParticipant, let banInfo = maybeBanInfo { + } else if let initialParticipant = initialParticipant, case let .member(_, _, _, maybeBanInfo, _) = initialParticipant, let banInfo = maybeBanInfo { currentRightsFlags = banInfo.rights.flags } else { currentRightsFlags = defaultBannedRightsFlags @@ -333,7 +333,7 @@ private func channelBannedMemberControllerEntries(presentationData: Presentation let currentTimeout: Int32 if let updatedTimeout = state.updatedTimeout { currentTimeout = updatedTimeout - } else if let initialParticipant = initialParticipant, case let .member(_, _, _, maybeBanInfo) = initialParticipant, let banInfo = maybeBanInfo { + } else if let initialParticipant = initialParticipant, case let .member(_, _, _, maybeBanInfo, _) = initialParticipant, let banInfo = maybeBanInfo { currentTimeout = banInfo.rights.untilDate } else { currentTimeout = Int32.max @@ -552,7 +552,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI } if updateFlags == nil && updateTimeout == nil { - if case let .member(_, _, _, maybeBanInfo) = initialParticipant { + if case let .member(_, _, _, maybeBanInfo, _) = initialParticipant { if maybeBanInfo == nil { updateFlags = defaultBannedRightsFlags updateTimeout = Int32.max @@ -564,7 +564,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI let currentRightsFlags: TelegramChatBannedRightsFlags if let updatedFlags = updateFlags { currentRightsFlags = updatedFlags - } else if case let .member(_, _, _, maybeBanInfo) = initialParticipant, let banInfo = maybeBanInfo { + } else if case let .member(_, _, _, maybeBanInfo, _) = initialParticipant, let banInfo = maybeBanInfo { currentRightsFlags = banInfo.rights.flags } else { currentRightsFlags = defaultBannedRightsFlags @@ -573,7 +573,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI let currentTimeout: Int32 if let updateTimeout = updateTimeout { currentTimeout = updateTimeout - } else if case let .member(_, _, _, maybeBanInfo) = initialParticipant, let banInfo = maybeBanInfo { + } else if case let .member(_, _, _, maybeBanInfo, _) = initialParticipant, let banInfo = maybeBanInfo { currentTimeout = banInfo.rights.untilDate } else { currentTimeout = Int32.max diff --git a/submodules/TelegramUI/TelegramUI/ChannelBlacklistController.swift b/submodules/TelegramUI/TelegramUI/ChannelBlacklistController.swift index eb835efcdf..01b1660f7c 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelBlacklistController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelBlacklistController.swift @@ -153,7 +153,7 @@ private enum ChannelBlacklistEntry: ItemListNodeEntry { case let .peerItem(theme, strings, dateTimeFormat, nameDisplayOrder, _, participant, editing, enabled): var text: ItemListPeerItemText = .none switch participant.participant { - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): if let banInfo = banInfo, let peer = participant.peers[banInfo.restrictedBy] { text = .text(strings.Channel_Management_RemovedBy(peer.displayTitle).0) } @@ -297,7 +297,7 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId) switch participant.participant { case .creator: return - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if let adminInfo = adminInfo, adminInfo.promotedBy != context.account.peerId { presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Channel_Members_AddBannedErrorAdmin, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil) return diff --git a/submodules/TelegramUI/TelegramUI/ChannelDiscussionGroupSetupHeaderItem.swift b/submodules/TelegramUI/TelegramUI/ChannelDiscussionGroupSetupHeaderItem.swift index b41f4825d7..6fad4b7ba0 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelDiscussionGroupSetupHeaderItem.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelDiscussionGroupSetupHeaderItem.swift @@ -113,7 +113,7 @@ class ChannelDiscussionGroupSetupHeaderItemNode: ListViewItemNode { iconImage = UIImage(bundleImageName: "Chat/Info/DiscussDayIcon")?.precomposed() case .nightAccent: iconImage = UIImage(bundleImageName: "Chat/Info/DiscussNightAccentIcon")?.precomposed() - case .nightGrayscale: + case .night: iconImage = UIImage(bundleImageName: "Chat/Info/DiscussNightIcon")?.precomposed() } case .custom: diff --git a/submodules/TelegramUI/TelegramUI/ChannelMemberCategoryListContext.swift b/submodules/TelegramUI/TelegramUI/ChannelMemberCategoryListContext.swift index caf8d372f6..a49449139b 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelMemberCategoryListContext.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelMemberCategoryListContext.swift @@ -18,7 +18,7 @@ extension ChannelParticipant { switch self { case .creator: return nil - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): return adminInfo } } @@ -27,10 +27,24 @@ extension ChannelParticipant { switch self { case .creator: return nil - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): return banInfo } } + + func canBeBannedBy(peerId: PeerId) -> Bool { + switch self { + case .creator: + return false + case let .member(_, _, adminInfo, _, _): + if let adminInfo = adminInfo { + if adminInfo.promotedBy != peerId { + return false + } + } + } + return true + } } struct ChannelMemberListState { @@ -75,6 +89,25 @@ private func isParticipantMember(_ participant: ChannelParticipant, infoIsMember } } +private extension CachedChannelAdminRank { + init(participant: ChannelParticipant) { + switch participant { + case let .creator(_, rank): + if let rank = rank { + self = .custom(rank) + } else { + self = .owner + } + case let .member(_, _, _, _, rank): + if let rank = rank { + self = .custom(rank) + } else { + self = .admin + } + } + } +} + private final class ChannelMemberSingleCategoryListContext: ChannelMemberCategoryListContext { private let postbox: Postbox private let network: Network @@ -86,10 +119,18 @@ private final class ChannelMemberSingleCategoryListContext: ChannelMemberCategor didSet { self.listStatePromise.set(.single(self.listStateValue)) if case .admins(nil) = self.category, case .ready = self.listStateValue.loadingState { - let ids: Set = Set(self.listStateValue.list.map { $0.peer.id }) - let previousIds: Set = Set(oldValue.list.map { $0.peer.id }) - if ids != previousIds { - let _ = updateCachedChannelAdminIds(postbox: self.postbox, peerId: self.peerId, ids: ids).start() + let ranks: [PeerId: CachedChannelAdminRank] = self.listStateValue.list.reduce([:]) { (ranks, participant) in + var ranks = ranks + ranks[participant.participant.peerId] = CachedChannelAdminRank(participant: participant.participant) + return ranks + } + let previousRanks: [PeerId: CachedChannelAdminRank] = oldValue.list.reduce([:]) { (ranks, participant) in + var ranks = ranks + ranks[participant.participant.peerId] = CachedChannelAdminRank(participant: participant.participant) + return ranks + } + if ranks != previousRanks { + let _ = updateCachedChannelAdminRanks(postbox: self.postbox, peerId: self.peerId, ranks: ranks).start() } } } @@ -295,7 +336,7 @@ private final class ChannelMemberSingleCategoryListContext: ChannelMemberCategor switch self.category { case let .admins(query): if let updated = updated, (query == nil || updated.peer.indexName.matchesByTokens(query!)) { - if case let .member(_, _, adminInfo, _) = updated.participant, adminInfo == nil { + if case let .member(_, _, adminInfo, _, _) = updated.participant, adminInfo == nil { } else { var found = false loop: for i in 0 ..< list.count { diff --git a/submodules/TelegramUI/TelegramUI/ChannelMembersSearchContainerNode.swift b/submodules/TelegramUI/TelegramUI/ChannelMembersSearchContainerNode.swift index a8536d341f..94f4a13a21 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelMembersSearchContainerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelMembersSearchContainerNode.swift @@ -366,7 +366,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod if peerId.namespace == Namespaces.Peer.CloudChannel { if case .searchAdmins = mode { - return context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: memberId, adminRights: TelegramChatAdminRights(flags: [])) + return context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: memberId, adminRights: TelegramChatAdminRights(flags: []), rank: nil) |> `catch` { _ -> Signal in return .complete() } @@ -442,7 +442,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod case .creator: canPromote = false canRestrict = false - case let .member(_, _, adminRights, bannedRights): + case let .member(_, _, adminRights, bannedRights, _): if channel.hasPermission(.addAdmins) { canPromote = true } else { @@ -649,7 +649,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod case .creator: canPromote = false canRestrict = false - case let .member(_, _, adminRights, bannedRights): + case let .member(_, _, adminRights, bannedRights, _): if channel.hasPermission(.addAdmins) { canPromote = true } else { @@ -718,7 +718,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod switch participant.participant { case .creator: label = themeAndStrings.1.Channel_Management_LabelOwner - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if let adminInfo = adminInfo { if let peer = participant.peers[adminInfo.promotedBy] { if peer.id == participant.peer.id { @@ -731,7 +731,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod } case .searchBanned: switch participant.participant { - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): if let banInfo = banInfo { var exceptionsString = "" for rights in allGroupPermissionList { @@ -749,7 +749,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod } case .searchKicked: switch participant.participant { - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): if let banInfo = banInfo, let peer = participant.peers[banInfo.restrictedBy] { label = themeAndStrings.1.Channel_Management_RemovedBy(peer.displayTitle).0 } @@ -853,18 +853,18 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod let renderedParticipant: RenderedChannelParticipant switch participant { case .creator: - renderedParticipant = RenderedChannelParticipant(participant: .creator(id: peer.id), peer: peer) + renderedParticipant = RenderedChannelParticipant(participant: .creator(id: peer.id, rank: nil), peer: peer) case .admin: var peers: [PeerId: Peer] = [:] if let creator = creatorPeer { peers[creator.id] = creator } peers[peer.id] = peer - renderedParticipant = RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: .groupSpecific), promotedBy: creatorPeer?.id ?? context.account.peerId, canBeEditedByAccountPeer: creatorPeer?.id == context.account.peerId), banInfo: nil), peer: peer, peers: peers) + renderedParticipant = RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: .groupSpecific), promotedBy: creatorPeer?.id ?? context.account.peerId, canBeEditedByAccountPeer: creatorPeer?.id == context.account.peerId), banInfo: nil, rank: nil), peer: peer, peers: peers) case .member: var peers: [PeerId: Peer] = [:] peers[peer.id] = peer - renderedParticipant = RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: nil, banInfo: nil), peer: peer, peers: peers) + renderedParticipant = RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: nil, banInfo: nil, rank: nil), peer: peer, peers: peers) } matchingMembers.append(renderedParticipant) } @@ -998,7 +998,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod switch participant.participant { case .creator: label = themeAndStrings.1.Channel_Management_LabelOwner - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if let adminInfo = adminInfo { if let peer = participant.peers[adminInfo.promotedBy] { if peer.id == participant.peer.id { @@ -1011,7 +1011,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod } case .searchBanned: switch participant.participant { - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): if let banInfo = banInfo { var exceptionsString = "" for rights in allGroupPermissionList { @@ -1029,7 +1029,7 @@ final class ChannelMembersSearchContainerNode: SearchDisplayControllerContentNod } case .searchKicked: switch participant.participant { - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): if let banInfo = banInfo, let peer = participant.peers[banInfo.restrictedBy] { label = themeAndStrings.1.Channel_Management_RemovedBy(peer.displayTitle).0 } diff --git a/submodules/TelegramUI/TelegramUI/ChannelMembersSearchControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChannelMembersSearchControllerNode.swift index 78858a6262..def0095055 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelMembersSearchControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelMembersSearchControllerNode.swift @@ -204,16 +204,16 @@ class ChannelMembersSearchControllerNode: ASDisplayNode { let renderedParticipant: RenderedChannelParticipant switch participant { case .creator: - renderedParticipant = RenderedChannelParticipant(participant: .creator(id: peer.id), peer: peer) + renderedParticipant = RenderedChannelParticipant(participant: .creator(id: peer.id, rank: nil), peer: peer) case .admin: var peers: [PeerId: Peer] = [:] peers[creator.id] = creator peers[peer.id] = peer - renderedParticipant = RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: .groupSpecific), promotedBy: creator.id, canBeEditedByAccountPeer: creator.id == context.account.peerId), banInfo: nil), peer: peer, peers: peers) + renderedParticipant = RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: .groupSpecific), promotedBy: creator.id, canBeEditedByAccountPeer: creator.id == context.account.peerId), banInfo: nil, rank: nil), peer: peer, peers: peers) case .member: var peers: [PeerId: Peer] = [:] peers[peer.id] = peer - renderedParticipant = RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: nil, banInfo: nil), peer: peer, peers: peers) + renderedParticipant = RenderedChannelParticipant(participant: .member(id: peer.id, invitedAt: 0, adminInfo: nil, banInfo: nil, rank: nil), peer: peer, peers: peers) } entries.append(.peer(index, renderedParticipant, ContactsPeerItemEditing(editable: false, editing: false, revealed: false), label, enabled)) diff --git a/submodules/TelegramUI/TelegramUI/ChannelPermissionsController.swift b/submodules/TelegramUI/TelegramUI/ChannelPermissionsController.swift index 3caf5e21fd..693ec16b8a 100644 --- a/submodules/TelegramUI/TelegramUI/ChannelPermissionsController.swift +++ b/submodules/TelegramUI/TelegramUI/ChannelPermissionsController.swift @@ -227,7 +227,7 @@ private enum ChannelPermissionsEntry: ItemListNodeEntry { case let .peerItem(theme, strings, dateTimeFormat, nameDisplayOrder, _, participant, editing, enabled, canOpen, defaultBannedRights): var text: ItemListPeerItemText = .none switch participant.participant { - case let .member(_, _, _, banInfo): + case let .member(_, _, _, banInfo, _): var exceptionsString = "" if let banInfo = banInfo { for rights in allGroupPermissionList { @@ -559,7 +559,7 @@ public func channelPermissionsController(context: AccountContext, peerId: PeerId switch participant.participant { case .creator: return - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if let adminInfo = adminInfo, adminInfo.promotedBy != context.account.peerId { presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Channel_Members_AddBannedErrorAdmin, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil) return diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 86b1ff0a4c..2be5821635 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -6617,19 +6617,7 @@ public final class ChatController: TelegramController, GalleryHiddenMediaTarget, self.navigationActionDisposable.set((fetchChannelParticipant(account: self.context.account, peerId: peerId, participantId: author.id) |> deliverOnMainQueue).start(next: { [weak self] participant in if let strongSelf = self { - var canBan = true - if let participant = participant { - switch participant { - case .creator: - canBan = false - case let .member(_, _, adminInfo, _): - if let adminInfo = adminInfo, !adminInfo.rights.flags.isEmpty { - if adminInfo.promotedBy != accountPeerId { - canBan = false - } - } - } - } + var canBan = participant?.canBeBannedBy(peerId: accountPeerId) ?? true let actionSheet = ActionSheetController(presentationTheme: strongSelf.presentationData.theme) var items: [ActionSheetItem] = [] diff --git a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift index a7df1a41f9..782f0ad96e 100644 --- a/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatControllerNode.swift @@ -210,7 +210,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { self.inputPanelBackgroundNode.isLayerBacked = true self.inputPanelBackgroundSeparatorNode = ASDisplayNode() - self.inputPanelBackgroundSeparatorNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelStrokeColor + self.inputPanelBackgroundSeparatorNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelSeparatorColor self.inputPanelBackgroundSeparatorNode.isLayerBacked = true self.navigateButtons = ChatHistoryNavigationButtons(theme: self.chatPresentationInterfaceState.theme) @@ -1371,7 +1371,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate { if themeUpdated { self.inputPanelBackgroundNode.backgroundColor = chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColor - self.inputPanelBackgroundSeparatorNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelStrokeColor + self.inputPanelBackgroundSeparatorNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelSeparatorColor } let keepSendButtonEnabled = chatPresentationInterfaceState.interfaceState.forwardMessageIds != nil || chatPresentationInterfaceState.interfaceState.editMessage != nil diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift index d1f765bfd7..8a6185d5ec 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryEntriesForView.swift @@ -7,12 +7,12 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView, return [] } var entries: [ChatHistoryEntry] = [] - var adminIds = Set() + var adminRanks: [PeerId: CachedChannelAdminRank] = [:] if case let .peer(peerId) = location, peerId.namespace == Namespaces.Peer.CloudChannel { for additionalEntry in view.additionalData { if case let .cacheEntry(id, data) = additionalEntry { - if id == cachedChannelAdminIdsEntryId(peerId: peerId), let data = data as? CachedChannelAdminIds { - adminIds = data.ids + if id == cachedChannelAdminRanksEntryId(peerId: peerId), let data = data as? CachedChannelAdminRanks { + adminRanks = data.ranks } break } @@ -32,9 +32,9 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView, } } - var isAdmin = false + var adminRank: CachedChannelAdminRank? if let author = entry.message.author { - isAdmin = adminIds.contains(author.id) + adminRank = adminRanks[author.id] } if groupMessages { @@ -49,7 +49,7 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView, } else { selection = .none } - groupBucket.append((entry.message, entry.isRead, selection, ChatMessageEntryAttributes(isAdmin: isAdmin, isContact: entry.attributes.authorIsContact))) + groupBucket.append((entry.message, entry.isRead, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact))) } else { let selection: ChatHistoryMessageSelection if let selectedMessages = selectedMessages { @@ -57,7 +57,7 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView, } else { selection = .none } - entries.append(.MessageEntry(entry.message, presentationData, entry.isRead, entry.monthLocation, selection, ChatMessageEntryAttributes(isAdmin: isAdmin, isContact: entry.attributes.authorIsContact))) + entries.append(.MessageEntry(entry.message, presentationData, entry.isRead, entry.monthLocation, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact))) } } else { let selection: ChatHistoryMessageSelection @@ -66,7 +66,7 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView, } else { selection = .none } - entries.append(.MessageEntry(entry.message, presentationData, entry.isRead, entry.monthLocation, selection, ChatMessageEntryAttributes(isAdmin: isAdmin, isContact: entry.attributes.authorIsContact))) + entries.append(.MessageEntry(entry.message, presentationData, entry.isRead, entry.monthLocation, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact))) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryEntry.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryEntry.swift index 5056b39203..f52567fa65 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryEntry.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryEntry.swift @@ -25,7 +25,7 @@ public enum ChatHistoryMessageSelection: Equatable { } public struct ChatMessageEntryAttributes: Equatable { - let isAdmin: Bool + let rank: CachedChannelAdminRank? let isContact: Bool } diff --git a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift index d948d93a94..3a3c40bfea 100644 --- a/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatHistoryListNode.swift @@ -470,7 +470,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { additionalData.append(.cachedPeerDataMessages(peerId)) additionalData.append(.peerNotificationSettings(peerId)) if peerId.namespace == Namespaces.Peer.CloudChannel { - additionalData.append(.cacheEntry(cachedChannelAdminIdsEntryId(peerId: peerId))) + additionalData.append(.cacheEntry(cachedChannelAdminRanksEntryId(peerId: peerId))) additionalData.append(.peer(peerId)) } if peerId.namespace == Namespaces.Peer.CloudUser || peerId.namespace == Namespaces.Peer.SecretChat { diff --git a/submodules/TelegramUI/TelegramUI/ChatMediaInputStickerPackItem.swift b/submodules/TelegramUI/TelegramUI/ChatMediaInputStickerPackItem.swift index 0907653e9f..30b5d5f32b 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMediaInputStickerPackItem.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMediaInputStickerPackItem.swift @@ -103,7 +103,7 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode { override var visibility: ListViewItemNodeVisibility { didSet { - self.visibilityStatus = self.visibility != .none && false + self.visibilityStatus = self.visibility != .none } } @@ -190,7 +190,7 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode { animatedStickerNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0) self.addSubnode(animatedStickerNode) animatedStickerNode.setup(account: account, resource: resource, width: 80, height: 80, mode: .cached) - animatedStickerNode.visibility = self.visibilityStatus && false + animatedStickerNode.visibility = self.visibilityStatus } if let animatedStickerNode = self.animatedStickerNode { animatedStickerNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0)), size: imageSize) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageActionSheetControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageActionSheetControllerNode.swift index 7fdb64af4e..2129e36e14 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageActionSheetControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageActionSheetControllerNode.swift @@ -163,13 +163,13 @@ final class ChatMessageActionSheetControllerNode: ViewControllerTracingNode { self.validLayout = layout var height: CGFloat = max(14.0, layout.intrinsicInsets.bottom) + let inputHeight = layout.inputHeight ?? 0.0 var horizontalOffset: CGFloat = horizontalOrigin if !horizontalOffset.isZero { - horizontalOffset += UIScreenPixel // temporary fix for master-detail separator dimming + horizontalOffset += UIScreenPixel } - let inputHeight = layout.inputHeight ?? 0.0 transition.updateFrame(node: self.sideDimNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: max(0.0, horizontalOffset), height: max(0.0, layout.size.height - inputHeight)))) transition.updateFrame(node: self.sideInputDimNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - inputHeight), size: CGSize(width: max(0.0, horizontalOrigin), height: max(0.0, inputHeight)))) transition.updateFrame(node: self.inputDimNode, frame: CGRect(origin: CGPoint(x: horizontalOrigin, y: layout.size.height - inputHeight), size: CGSize(width: layout.size.width, height: inputHeight))) @@ -185,12 +185,12 @@ final class ChatMessageActionSheetControllerNode: ViewControllerTracingNode { itemsHeight += actionNode.bounds.height } - let containerFrame = CGRect(origin: CGPoint(x: horizontalOrigin + floor((layout.size.width - containerWidth) / 2.0), y: layout.size.height - height - itemsHeight), size: CGSize(width: containerWidth, height: itemsHeight)) + let containerFrame = CGRect(origin: CGPoint(x: horizontalOrigin + floor((layout.size.width - containerWidth) / 2.0), y: layout.size.height - height - itemsHeight - inputHeight), size: CGSize(width: containerWidth, height: itemsHeight)) transition.updateFrame(node: self.itemsContainerNode, frame: containerFrame) transition.updateFrame(node: self.itemsShadowNode, frame: containerFrame.insetBy(dx: -shadowInset, dy: -shadowInset)) height += itemsHeight - + height += inputHeight height += 6.0 return height diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift index 5459e75993..b7a4844e10 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift @@ -561,27 +561,26 @@ class ChatMessageBubbleItemNode: ChatMessageItemView { } var authorNameString: String? - let authorIsAdmin: Bool + var authorRank: CachedChannelAdminRank? var authorIsChannel: Bool = false switch content { case let .message(message, _, _, attributes): if let peer = message.peers[message.id.peerId] as? TelegramChannel { if case .broadcast = peer.info { - authorIsAdmin = false } else { if isCrosspostFromChannel, let sourceReference = sourceReference, let _ = firstMessage.peers[sourceReference.messageId.peerId] as? TelegramChannel { authorIsChannel = true } - authorIsAdmin = attributes.isAdmin + authorRank = attributes.rank } } else { if isCrosspostFromChannel, let _ = firstMessage.forwardInfo?.source as? TelegramChannel { authorIsChannel = true } - authorIsAdmin = attributes.isAdmin + authorRank = attributes.rank } case .group: - authorIsAdmin = false + break } var inlineBotNameString: String? var replyMessage: Message? @@ -745,7 +744,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView { if let rawAuthorNameColor = authorNameColor { var dimColors = false switch item.presentationData.theme.theme.name { - case .builtin(.nightAccent), .builtin(.nightGrayscale): + case .builtin(.nightAccent), .builtin(.night): dimColors = true default: break @@ -862,8 +861,17 @@ class ChatMessageBubbleItemNode: ChatMessageItemView { let attributedString: NSAttributedString var adminBadgeString: NSAttributedString? - if authorIsAdmin { - adminBadgeString = NSAttributedString(string: " \(item.presentationData.strings.Conversation_Admin)", font: inlineBotPrefixFont, textColor: messageTheme.secondaryTextColor) + if let authorRank = authorRank { + let string: String + switch authorRank { + case .owner: + string = item.presentationData.strings.Conversation_Owner + case .admin: + string = item.presentationData.strings.Conversation_Admin + case let .custom(rank): + string = rank + } + adminBadgeString = NSAttributedString(string: " \(string)", font: inlineBotPrefixFont, textColor: messageTheme.secondaryTextColor) } else if authorIsChannel { adminBadgeString = NSAttributedString(string: " \(item.presentationData.strings.Channel_Status)", font: inlineBotPrefixFont, textColor: messageTheme.secondaryTextColor) } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageForwardInfoNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageForwardInfoNode.swift index ba3b8ce721..ef2422f254 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageForwardInfoNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageForwardInfoNode.swift @@ -90,7 +90,6 @@ class ChatMessageForwardInfoNode: ASDisplayNode { let (textLayout, textApply) = textNodeLayout(TextNodeLayoutArguments(attributedString: string, backgroundColor: nil, maximumNumberOfLines: 2, truncationType: .end, constrainedSize: CGSize(width: constrainedSize.width - credibilityIconWidth, height: constrainedSize.height), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) return (CGSize(width: textLayout.size.width + credibilityIconWidth, height: textLayout.size.height), { - let node: ChatMessageForwardInfoNode if let maybeNode = maybeNode { node = maybeNode diff --git a/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift b/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift index a4d474379a..f2aeb99cb5 100644 --- a/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift +++ b/submodules/TelegramUI/TelegramUI/ChatOverlayNavigationBar.swift @@ -6,7 +6,7 @@ import Postbox import TelegramCore import TelegramPresentationData -private let titleFont = Font.regular(14.0) +private let titleFont = Font.semibold(14.0) final class ChatOverlayNavigationBar: ASDisplayNode { private let theme: PresentationTheme diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift index 8f16c1eb3b..200ced11b1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsControllerNode.swift @@ -88,7 +88,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { self.panelBackgroundNode = ASDisplayNode() self.panelBackgroundNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelBackgroundColor self.panelSeparatorNode = ASDisplayNode() - self.panelSeparatorNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelStrokeColor + self.panelSeparatorNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelSeparatorColor self.panelButtonNode = HighlightableButtonNode() self.panelButtonNode.setTitle(self.presentationData.strings.Channel_AdminLog_InfoPanelTitle, with: Font.regular(17.0), with: self.presentationData.theme.chat.inputPanel.panelControlAccentColor, for: []) @@ -486,7 +486,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) { self.panelBackgroundNode.backgroundColor = theme.chat.inputPanel.panelBackgroundColor - self.panelSeparatorNode.backgroundColor = theme.chat.inputPanel.panelStrokeColor + self.panelSeparatorNode.backgroundColor = theme.chat.inputPanel.panelSeparatorColor self.panelButtonNode.setTitle(presentationData.strings.Channel_AdminLog_InfoPanelTitle, with: Font.regular(17.0), with: theme.chat.inputPanel.panelControlAccentColor, for: []) } @@ -697,16 +697,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode { } for member in adminsState.list { if member.peer.id == author.id { - switch member.participant { - case .creator: - canBan = false - case let .member(_, _, adminInfo, _): - if let adminInfo = adminInfo { - if adminInfo.promotedBy != self.context.account.peerId { - canBan = false - } - } - } + canBan = member.participant.canBeBannedBy(peerId: self.context.account.peerId) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift b/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift index f55490ae2a..346bf60caa 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecentActionsHistoryTransition.swift @@ -115,7 +115,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.titleUpdated(title: new) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .changeAbout(prev, new): var peers = SimpleDictionary() var author: Peer? @@ -146,14 +146,14 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: 1), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case .content: let peers = SimpleDictionary() let attributes: [MessageAttribute] = [] let prevMessage = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: prev, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: new, attributes: attributes, media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), additionalContent: !prev.isEmpty ? .eventLogPreviousDescription(prevMessage) : nil) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), additionalContent: !prev.isEmpty ? .eventLogPreviousDescription(prevMessage) : nil) } case let .changeUsername(prev, new): var peers = SimpleDictionary() @@ -184,7 +184,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } let action: TelegramMediaActionType = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: 1), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case .content: var previousAttributes: [MessageAttribute] = [] var attributes: [MessageAttribute] = [] @@ -203,7 +203,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let prevMessage = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: 1), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: prevText, attributes: previousAttributes, media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: text, attributes: attributes, media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), additionalContent: !prev.isEmpty ? .eventLogPreviousLink(prevMessage) : nil) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), additionalContent: !prev.isEmpty ? .eventLogPreviousLink(prevMessage) : nil) } case let .changePhoto(_, new): var peers = SimpleDictionary() @@ -221,7 +221,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.photoUpdated(image: photo) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .toggleInvites(value): var peers = SimpleDictionary() var author: Peer? @@ -248,7 +248,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .toggleSignatures(value): var peers = SimpleDictionary() var author: Peer? @@ -275,7 +275,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .updatePinned(message): switch self.id.contentIndex { case .header: @@ -299,7 +299,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: 1), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case .content: if let message = message { var peers = SimpleDictionary() @@ -317,7 +317,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } } let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: message.effectiveAuthor, text: message.text, attributes: attributes, media: message.media, peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) } else { var peers = SimpleDictionary() var author: Peer? @@ -339,7 +339,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: 0), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) } } case let .editMessage(prev, message): @@ -384,7 +384,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: 1), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case .content: var peers = SimpleDictionary() var attributes: [MessageAttribute] = [] @@ -401,7 +401,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } } let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: message.effectiveAuthor, text: message.text, attributes: attributes, media: message.media, peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: filterOriginalMessageFlags(message), read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), additionalContent: !prev.text.isEmpty || !message.text.isEmpty ? .eventLogPreviousMessage(filterOriginalMessageFlags(prev)) : nil) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: filterOriginalMessageFlags(message), read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), additionalContent: !prev.text.isEmpty || !message.text.isEmpty ? .eventLogPreviousMessage(filterOriginalMessageFlags(prev)) : nil) } case let .deleteMessage(message): switch self.id.contentIndex { @@ -427,7 +427,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: 1), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case .content: var peers = SimpleDictionary() var attributes: [MessageAttribute] = [] @@ -451,7 +451,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } } let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: message.effectiveAuthor, text: message.text, attributes: attributes, media: message.media, peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) } case .participantJoin, .participantLeave: var peers = SimpleDictionary() @@ -469,7 +469,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { action = TelegramMediaActionType.removedMembers(peerIds: [self.entry.event.peerId]) } let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .participantInvite(participant): var peers = SimpleDictionary() var author: Peer? @@ -486,7 +486,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action: TelegramMediaActionType action = TelegramMediaActionType.addedMembers(peerIds: [participant.peer.id]) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .participantToggleBan(prev, new): var peers = SimpleDictionary() var attributes: [MessageAttribute] = [] @@ -513,8 +513,8 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { isBroadcast = false } - if case let .member(_, _, _, prevBanInfo) = prev.participant { - if case let .member(_, _, _, newBanInfo) = new.participant { + if case let .member(_, _, _, prevBanInfo, _) = prev.participant { + if case let .member(_, _, _, newBanInfo, _) = new.participant { let newFlags = newBanInfo?.rights.flags ?? [] var addedRights = newBanInfo?.rights.flags ?? [] @@ -616,7 +616,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } } let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: text, attributes: attributes, media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .participantToggleAdmin(prev, new): var peers = SimpleDictionary() var attributes: [MessageAttribute] = [] @@ -653,8 +653,8 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { }, to: &text, entities: &entities) text += "\n" - if case let .member(_, _, prevAdminRights, _) = prev.participant { - if case let .member(_, _, newAdminRights, _) = new.participant { + if case let .member(_, _, prevAdminRights, _, _) = prev.participant { + if case let .member(_, _, newAdminRights, _, _) = new.participant { let prevFlags = prevAdminRights?.rights.flags ?? [] let newFlags = newAdminRights?.rights.flags ?? [] @@ -708,7 +708,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } } let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: text, attributes: attributes, media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .changeStickerPack(_, new): var peers = SimpleDictionary() var author: Peer? @@ -737,7 +737,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .togglePreHistoryHidden(value): var peers = SimpleDictionary() var author: Peer? @@ -767,7 +767,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .updateDefaultBannedRights(prev, new): var peers = SimpleDictionary() var attributes: [MessageAttribute] = [] @@ -825,7 +825,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } } let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: text, attributes: attributes, media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .pollStopped(message): switch self.id.contentIndex { case .header: @@ -853,7 +853,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: 1), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case .content: var peers = SimpleDictionary() var attributes: [MessageAttribute] = [] @@ -870,7 +870,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { } } let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: message.author, text: message.text, attributes: attributes, media: message.media, peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: filterOriginalMessageFlags(message), read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), additionalContent: nil) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: filterOriginalMessageFlags(message), read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), additionalContent: nil) } case let .linkedPeerUpdated(previous, updated): var peers = SimpleDictionary() @@ -926,7 +926,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) case let .changeGeoLocation(_, updated): var peers = SimpleDictionary() var author: Peer? @@ -948,12 +948,12 @@ struct ChatRecentActionsEntry: Comparable, Identifiable { let mediaMap = TelegramMediaMap(latitude: updated.latitude, longitude: updated.longitude, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: text, attributes: [], media: [mediaMap], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) } else { let action = TelegramMediaActionType.customText(text: text, entities: entities) let message = Message(stableId: self.entry.stableId, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: Int32(bitPattern: self.entry.stableId)), globallyUniqueId: self.entry.event.id, groupingKey: nil, groupInfo: nil, timestamp: self.entry.event.date, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: author, text: "", attributes: [], media: [TelegramMediaAction(action: action)], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: []) - return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false))) + return ChatMessageItem(presentationData: self.presentationData, context: context, chatLocation: .peer(peer.id), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .channel, automaticDownloadNetworkType: .cellular, isRecentActions: true), controllerInteraction: controllerInteraction, content: .message(message: message, read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false))) } } } diff --git a/submodules/TelegramUI/TelegramUI/ChatTextLinkEditController.swift b/submodules/TelegramUI/TelegramUI/ChatTextLinkEditController.swift index f05257ea61..9ac41cfba8 100644 --- a/submodules/TelegramUI/TelegramUI/ChatTextLinkEditController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatTextLinkEditController.swift @@ -401,10 +401,7 @@ func chatTextLinkEditController(sharedContext: SharedAccountContext, account: Ac guard let contentNode = contentNode else { return } - var updatedLink = contentNode.link - if !updatedLink.hasPrefix("http") && !updatedLink.hasPrefix("https") { - updatedLink = "http://\(updatedLink)" - } + let updatedLink = explicitUrl(contentNode.link) if !updatedLink.isEmpty && isValidUrl(updatedLink) { dismissImpl?(true) apply(updatedLink) diff --git a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift b/submodules/TelegramUI/TelegramUI/CreateChannelController.swift index 3aca3a705c..3d79003f1f 100644 --- a/submodules/TelegramUI/TelegramUI/CreateChannelController.swift +++ b/submodules/TelegramUI/TelegramUI/CreateChannelController.swift @@ -175,7 +175,7 @@ private func CreateChannelEntries(presentationData: PresentationData, state: Cre let groupInfoState = ItemListAvatarAndNameInfoItemState(editingName: state.editingName, updatingName: nil) - let peer = TelegramGroup(id: PeerId(namespace: -1, id: 0), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator, membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0) + let peer = TelegramGroup(id: PeerId(namespace: -1, id: 0), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator(rank: nil), membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0) entries.append(.channelInfo(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer, groupInfoState, state.avatar)) entries.append(.setProfilePhoto(presentationData.theme, presentationData.strings.Channel_UpdatePhotoItem)) diff --git a/submodules/TelegramUI/TelegramUI/CreateGroupController.swift b/submodules/TelegramUI/TelegramUI/CreateGroupController.swift index 967f710c82..0076fd36cd 100644 --- a/submodules/TelegramUI/TelegramUI/CreateGroupController.swift +++ b/submodules/TelegramUI/TelegramUI/CreateGroupController.swift @@ -241,7 +241,7 @@ private func createGroupEntries(presentationData: PresentationData, state: Creat let groupInfoState = ItemListAvatarAndNameInfoItemState(editingName: state.editingName, updatingName: nil) - let peer = TelegramGroup(id: PeerId(namespace: -1, id: 0), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator, membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0) + let peer = TelegramGroup(id: PeerId(namespace: -1, id: 0), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator(rank: nil), membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0) entries.append(.groupInfo(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer, groupInfoState, state.avatar)) entries.append(.setProfilePhoto(presentationData.theme, presentationData.strings.GroupInfo_SetGroupPhoto)) diff --git a/submodules/TelegramUI/TelegramUI/DebugController.swift b/submodules/TelegramUI/TelegramUI/DebugController.swift index aa2b0ce6b6..819efdbc99 100644 --- a/submodules/TelegramUI/TelegramUI/DebugController.swift +++ b/submodules/TelegramUI/TelegramUI/DebugController.swift @@ -56,9 +56,8 @@ private enum DebugControllerEntry: ItemListNodeEntry { case resetHoles(PresentationTheme) case resetBiometricsData(PresentationTheme) case optimizeDatabase(PresentationTheme) - case animatedStickers(PresentationTheme) case photoPreview(PresentationTheme, Bool) - case alternateIcon(PresentationTheme) + case exportTheme(PresentationTheme) case versionInfo(PresentationTheme) var section: ItemListSectionId { @@ -71,7 +70,7 @@ private enum DebugControllerEntry: ItemListNodeEntry { return DebugControllerSection.logging.rawValue case .enableRaiseToSpeak, .keepChatNavigationStack, .skipReadHistory, .crashOnSlowQueries: return DebugControllerSection.experiments.rawValue - case .clearTips, .reimport, .resetData, .resetDatabase, .resetHoles, .resetBiometricsData, .optimizeDatabase, .animatedStickers, .photoPreview, .alternateIcon: + case .clearTips, .reimport, .resetData, .resetDatabase, .resetHoles, .resetBiometricsData, .optimizeDatabase, .photoPreview, .exportTheme: return DebugControllerSection.experiments.rawValue case .versionInfo: return DebugControllerSection.info.rawValue @@ -118,14 +117,12 @@ private enum DebugControllerEntry: ItemListNodeEntry { return 17 case .optimizeDatabase: return 18 - case .animatedStickers: - return 19 case .photoPreview: + return 19 + case .exportTheme: return 20 - case .alternateIcon: - return 21 case .versionInfo: - return 22 + return 21 } } @@ -462,10 +459,6 @@ private enum DebugControllerEntry: ItemListNodeEntry { arguments.presentController(controller, nil) }) }) - case let .animatedStickers(theme): - return ItemListSwitchItem(theme: theme, title: "AJSON", value: GlobalExperimentalSettings.animatedStickers, sectionId: self.section, style: .blocks, updated: { value in - GlobalExperimentalSettings.animatedStickers = value - }) case let .photoPreview(theme, value): return ItemListSwitchItem(theme: theme, title: "Photo Preview", value: value, sectionId: self.section, style: .blocks, updated: { value in let _ = arguments.sharedContext.accountManager.transaction ({ transaction in @@ -476,13 +469,39 @@ private enum DebugControllerEntry: ItemListNodeEntry { }) }).start() }) - case let .alternateIcon(theme): - return ItemListActionItem(theme: theme, title: "Change Icon", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { - if arguments.sharedContext.applicationBindings.getAlternateIconName() == "Black" { - arguments.sharedContext.applicationBindings.requestSetAlternateIconName(nil, { _ in }) - } else { - arguments.sharedContext.applicationBindings.requestSetAlternateIconName("Black", { _ in }) + case let .exportTheme(theme): + return ItemListActionItem(theme: theme, title: "Export Theme", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: { + guard let context = arguments.context else { + return } + + var randomId: Int64 = 0 + arc4random_buf(&randomId, 8) + let path = NSTemporaryDirectory() + "\(randomId)" + + let encoder = PresentationThemeEncoder() + guard let strings = try? encoder.encode(theme), let _ = try? strings.write(toFile: path, atomically: true, encoding: .utf8) else { + return + } + +// let encoder = JSONEncoder() +// guard let data = try? encoder.encode(theme), let _ = try? data.write(to: URL(fileURLWithPath: path)) else { +// return +// } + + let controller = PeerSelectionController(context: context, filter: [.onlyWriteable, .excludeDisabled]) + controller.peerSelected = { [weak controller] peerId in + if let strongController = controller { + strongController.dismiss() + + let id = arc4random64() + let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: LocalFileReferenceMediaResource(localFilePath: path, randomId: id), previewRepresentations: [], immediateThumbnailData: nil, mimeType: "application/text", size: nil, attributes: [.FileName(fileName: "\(theme.name.string).tgios-theme")]) + let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil) + + let _ = enqueueMessages(account: context.account, peerId: peerId, messages: [message]).start() + } + } + arguments.presentController(controller, ViewControllerPresentationArguments(presentationAnimation: ViewControllerPresentationAnimation.modalSheet)) }) case let .versionInfo(theme): let bundle = Bundle.main @@ -522,7 +541,7 @@ private func debugControllerEntries(presentationData: PresentationData, loggingS entries.append(.resetHoles(presentationData.theme)) entries.append(.optimizeDatabase(presentationData.theme)) entries.append(.photoPreview(presentationData.theme, experimentalSettings.chatListPhotos)) - entries.append(.alternateIcon(presentationData.theme)) + entries.append(.versionInfo(presentationData.theme)) return entries diff --git a/submodules/TelegramUI/TelegramUI/DeclareEncodables.swift b/submodules/TelegramUI/TelegramUI/DeclareEncodables.swift index 37b88e9ffd..ce51ccde4d 100644 --- a/submodules/TelegramUI/TelegramUI/DeclareEncodables.swift +++ b/submodules/TelegramUI/TelegramUI/DeclareEncodables.swift @@ -27,7 +27,7 @@ private var telegramUIDeclaredEncodables: Void = { declareEncodable(ICloudFileResource.self, f: { ICloudFileResource(decoder: $0) }) declareEncodable(MediaInputSettings.self, f: { MediaInputSettings(decoder: $0) }) declareEncodable(ContactSynchronizationSettings.self, f: { ContactSynchronizationSettings(decoder: $0) }) - declareEncodable(CachedChannelAdminIds.self, f: { CachedChannelAdminIds(decoder: $0) }) + declareEncodable(CachedChannelAdminRanks.self, f: { CachedChannelAdminRanks(decoder: $0) }) declareEncodable(StickerSettings.self, f: { StickerSettings(decoder: $0) }) declareEncodable(InstantPagePresentationSettings.self, f: { InstantPagePresentationSettings(decoder: $0) }) declareEncodable(InstantPageStoredState.self, f: { InstantPageStoredState(decoder: $0) }) diff --git a/submodules/TelegramUI/TelegramUI/ForwardPrivacyChatPreviewItem.swift b/submodules/TelegramUI/TelegramUI/ForwardPrivacyChatPreviewItem.swift index eb1911c800..a4434d9d4c 100644 --- a/submodules/TelegramUI/TelegramUI/ForwardPrivacyChatPreviewItem.swift +++ b/submodules/TelegramUI/TelegramUI/ForwardPrivacyChatPreviewItem.swift @@ -150,7 +150,7 @@ class ForwardPrivacyChatPreviewItemNode: ListViewItemNode { let chatPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: item.theme, wallpaper: item.wallpaper), fontSize: item.fontSize, strings: item.strings, dateTimeFormat: item.dateTimeFormat, nameDisplayOrder: item.nameDisplayOrder, disableAnimations: false, largeEmoji: false) - let messageItem: ChatMessageItem = ChatMessageItem(presentationData: chatPresentationData, context: item.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: forwardInfo, author: nil, text: item.strings.Privacy_Forwards_PreviewMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), disableDate: true) + let messageItem = ChatMessageItem(presentationData: chatPresentationData, context: item.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: forwardInfo, author: nil, text: item.strings.Privacy_Forwards_PreviewMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), disableDate: true) var node: ListViewItemNode? if let current = currentNode { diff --git a/submodules/TelegramUI/TelegramUI/GroupInfoController.swift b/submodules/TelegramUI/TelegramUI/GroupInfoController.swift index 0dee989c88..a03f91afb9 100644 --- a/submodules/TelegramUI/TelegramUI/GroupInfoController.swift +++ b/submodules/TelegramUI/TelegramUI/GroupInfoController.swift @@ -91,10 +91,10 @@ private enum GroupInfoEntryTag { case location } -private enum GroupInfoMemberStatus { +private enum GroupInfoMemberStatus: Equatable { case member - case admin - case owner + case admin(rank: String?) + case owner(rank: String?) } private enum GroupEntryStableId: Hashable, Equatable { @@ -530,10 +530,10 @@ private enum GroupInfoEntry: ItemListNodeEntry { case let .member(theme, strings, dateTimeFormat, nameDisplayOrder, _, _, peer, participant, presence, memberStatus, editing, actions, enabled, selectable): let label: String? switch memberStatus { - case .owner: - label = strings.GroupInfo_LabelOwner - case .admin: - label = strings.GroupInfo_LabelAdmin + case let .owner(rank): + label = rank ?? strings.GroupInfo_LabelOwner + case let .admin(rank): + label = rank ?? strings.GroupInfo_LabelAdmin case .member: label = nil } @@ -718,7 +718,7 @@ private func canRemoveParticipant(account: Account, channel: TelegramChannel, pa switch participant { case .creator: return false - case let .member(_, _, adminInfo, _): + case let .member(_, _, adminInfo, _, _): if channel.hasPermission(.banMembers) { if let adminInfo = adminInfo { return adminInfo.promotedBy == account.peerId @@ -1013,13 +1013,13 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa let participant: ChannelParticipant switch sortedParticipants[i] { case .creator: - participant = .creator(id: sortedParticipants[i].peerId) - memberStatus = .admin + participant = .creator(id: sortedParticipants[i].peerId, rank: nil) + memberStatus = .owner(rank: nil) case .admin: - participant = .member(id: sortedParticipants[i].peerId, invitedAt: 0, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: .groupSpecific), promotedBy: account.peerId, canBeEditedByAccountPeer: true), banInfo: nil) - memberStatus = .admin + participant = .member(id: sortedParticipants[i].peerId, invitedAt: 0, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(flags: .groupSpecific), promotedBy: account.peerId, canBeEditedByAccountPeer: true), banInfo: nil, rank: nil) + memberStatus = .admin(rank: nil) case .member: - participant = .member(id: sortedParticipants[i].peerId, invitedAt: 0, adminInfo: nil, banInfo: nil) + participant = .member(id: sortedParticipants[i].peerId, invitedAt: 0, adminInfo: nil, banInfo: nil, rank: nil) memberStatus = .member } @@ -1080,7 +1080,7 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa if !state.temporaryParticipants.isEmpty { for participant in state.temporaryParticipants { if !existingParticipantIds.contains(participant.peer.id) { - updatedParticipants.append(RenderedChannelParticipant(participant: ChannelParticipant.member(id: participant.peer.id, invitedAt: participant.timestamp, adminInfo: nil, banInfo: nil), peer: participant.peer)) + updatedParticipants.append(RenderedChannelParticipant(participant: ChannelParticipant.member(id: participant.peer.id, invitedAt: participant.timestamp, adminInfo: nil, banInfo: nil, rank: nil), peer: participant.peer)) if let presence = participant.presence, peerPresences[participant.peer.id] == nil { peerPresences[participant.peer.id] = presence } @@ -1112,11 +1112,11 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa switch lhs.participant { case .creator: return false - case let .member(lhsId, lhsInvitedAt, _, _): + case let .member(lhsId, lhsInvitedAt, _, _, _): switch rhs.participant { case .creator: return true - case let .member(rhsId, rhsInvitedAt, _, _): + case let .member(rhsId, rhsInvitedAt, _, _, _): if lhsInvitedAt == rhsInvitedAt { return lhsId.id < rhsId.id } @@ -1132,11 +1132,11 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa let participant = sortedParticipants[i] let memberStatus: GroupInfoMemberStatus switch participant.participant { - case .creator: - memberStatus = .owner - case let .member(_, _, adminInfo, _): + case let .creator(_, rank): + memberStatus = .owner(rank: rank) + case let .member(_, _, adminInfo, _, rank): if adminInfo != nil { - memberStatus = .admin + memberStatus = .admin(rank: rank) } else { memberStatus = .member } @@ -1152,7 +1152,7 @@ private func groupInfoEntries(account: Account, presentationData: PresentationDa case .creator: canPromote = false canRestrict = false - case let .member(_, _, adminRights, bannedRights): + case let .member(_, _, adminRights, bannedRights, _): if channel.hasPermission(.addAdmins) { canPromote = true } else { diff --git a/submodules/TelegramUI/TelegramUI/GroupStickerPackCurrentItem.swift b/submodules/TelegramUI/TelegramUI/GroupStickerPackCurrentItem.swift index 537f326a34..6840993a82 100644 --- a/submodules/TelegramUI/TelegramUI/GroupStickerPackCurrentItem.swift +++ b/submodules/TelegramUI/TelegramUI/GroupStickerPackCurrentItem.swift @@ -94,7 +94,6 @@ class GroupStickerPackCurrentItemNode: ItemListRevealOptionsItemNode { private var item: GroupStickerPackCurrentItem? private var editableControlNode: ItemListEditableControlNode? - private var reorderControlNode: ItemListEditableReorderControlNode? private let fetchDisposable = MetaDisposable() diff --git a/submodules/TelegramUI/TelegramUI/ItemListDisclosureItem.swift b/submodules/TelegramUI/TelegramUI/ItemListDisclosureItem.swift index b5ef0e3c4d..8f480b8912 100644 --- a/submodules/TelegramUI/TelegramUI/ItemListDisclosureItem.swift +++ b/submodules/TelegramUI/TelegramUI/ItemListDisclosureItem.swift @@ -258,7 +258,7 @@ class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode { var labelConstrain: CGFloat = params.width - params.rightInset - leftInset - 40.0 - titleLayout.size.width - 10.0 switch item.labelStyle { case .badge: - labelBadgeColor = item.theme.rootController.tabBar.badgeTextColor + labelBadgeColor = item.theme.list.itemCheckColors.foregroundColor labelFont = badgeFont case .detailText, .multilineDetailText: labelBadgeColor = item.theme.list.itemSecondaryTextColor diff --git a/submodules/TelegramUI/TelegramUI/ItemListSingleLineInputItem.swift b/submodules/TelegramUI/TelegramUI/ItemListSingleLineInputItem.swift index f90676f947..84aae2e58a 100644 --- a/submodules/TelegramUI/TelegramUI/ItemListSingleLineInputItem.swift +++ b/submodules/TelegramUI/TelegramUI/ItemListSingleLineInputItem.swift @@ -373,4 +373,8 @@ class ItemListSingleLineInputItemNode: ListViewItemNode, UITextFieldDelegate, It @objc internal func textFieldDidBeginEditing(_ textField: UITextField) { self.item?.receivedFocus?() } + + func animateError() { + self.textNode.layer.addShakeAnimation() + } } diff --git a/submodules/TelegramUI/TelegramUI/LegacyICloudFileController.swift b/submodules/TelegramUI/TelegramUI/LegacyICloudFileController.swift index c3a37eecac..925b959177 100644 --- a/submodules/TelegramUI/TelegramUI/LegacyICloudFileController.swift +++ b/submodules/TelegramUI/TelegramUI/LegacyICloudFileController.swift @@ -38,17 +38,19 @@ func legacyICloudFileController(theme: PresentationTheme, completion: @escaping legacyController.statusBar.statusBarStyle = .Black let documentTypes: [String] = [ - "public.composite-content", - "public.text", - "public.image", - "public.audio", - "public.video", - "public.movie", - "public.font", - "org.telegram.Telegram.webp", - "com.apple.iwork.pages.pages", - "com.apple.iwork.numbers.numbers", - "com.apple.iwork.keynote.key" + "public.item" +// "public.composite-content", +// "public.text", +// "public.image", +// "public.audio", +// "public.video", +// "public.movie", +// "public.font", +// "public.data", +// "org.telegram.Telegram.webp", +// "com.apple.iwork.pages.pages", +// "com.apple.iwork.numbers.numbers", +// "com.apple.iwork.keynote.key" ] let controller = UIDocumentPickerViewController(documentTypes: documentTypes, in: .open) diff --git a/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift b/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift index 72fde23d43..c9e1264348 100644 --- a/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift +++ b/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift @@ -88,7 +88,7 @@ final class InstantVideoController: LegacyController { func legacyInputMicPalette(from theme: PresentationTheme) -> TGModernConversationInputMicPallete { let inputPanelTheme = theme.chat.inputPanel - return TGModernConversationInputMicPallete(dark: theme.overallDarkAppearance, buttonColor: inputPanelTheme.actionControlFillColor, iconColor: inputPanelTheme.actionControlForegroundColor, backgroundColor: inputPanelTheme.panelBackgroundColor, borderColor: inputPanelTheme.panelStrokeColor, lock: inputPanelTheme.panelControlAccentColor, textColor: inputPanelTheme.primaryTextColor, secondaryTextColor: inputPanelTheme.secondaryTextColor, recording: inputPanelTheme.mediaRecordingDotColor) + return TGModernConversationInputMicPallete(dark: theme.overallDarkAppearance, buttonColor: inputPanelTheme.actionControlFillColor, iconColor: inputPanelTheme.actionControlForegroundColor, backgroundColor: inputPanelTheme.panelBackgroundColor, borderColor: inputPanelTheme.panelSeparatorColor, lock: inputPanelTheme.panelControlAccentColor, textColor: inputPanelTheme.primaryTextColor, secondaryTextColor: inputPanelTheme.secondaryTextColor, recording: inputPanelTheme.mediaRecordingDotColor) } func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect, context: AccountContext, peerId: PeerId, send: @escaping (EnqueueMessage) -> Void) -> InstantVideoController { diff --git a/submodules/TelegramUI/TelegramUI/LegacyPreferencesImport.swift b/submodules/TelegramUI/TelegramUI/LegacyPreferencesImport.swift index 046361b72c..47b1af5fc1 100644 --- a/submodules/TelegramUI/TelegramUI/LegacyPreferencesImport.swift +++ b/submodules/TelegramUI/TelegramUI/LegacyPreferencesImport.swift @@ -183,7 +183,7 @@ func importLegacyPreferences(accountManager: AccountManager, account: TemporaryA } settings.chatWallpaper = .color(0xffffff) case 2: - settings.theme = .builtin(.nightGrayscale) + settings.theme = .builtin(.night) settings.chatWallpaper = .color(0x00000) case 3: settings.theme = .builtin(.nightAccent) @@ -213,7 +213,7 @@ func importLegacyPreferences(accountManager: AccountManager, account: TemporaryA let nightTheme: PresentationBuiltinThemeReference switch autoNightPreferences.preferredPalette { case 1: - nightTheme = .nightGrayscale + nightTheme = .night default: nightTheme = .nightAccent } diff --git a/submodules/TelegramUI/TelegramUI/LogoutOptionsController.swift b/submodules/TelegramUI/TelegramUI/LogoutOptionsController.swift index ff6099968a..f3a53cbcb9 100644 --- a/submodules/TelegramUI/TelegramUI/LogoutOptionsController.swift +++ b/submodules/TelegramUI/TelegramUI/LogoutOptionsController.swift @@ -119,6 +119,7 @@ private func logoutOptionsEntries(presentationData: PresentationData, canAddAcco func logoutOptionsController(context: AccountContext, navigationController: NavigationController, canAddAccounts: Bool, phoneNumber: String) -> ViewController { var pushControllerImpl: ((ViewController) -> Void)? var presentControllerImpl: ((ViewController, Any?) -> Void)? + var replaceTopControllerImpl: ((ViewController) -> Void)? var dismissImpl: (() -> Void)? let supportPeerDisposable = MetaDisposable() @@ -129,7 +130,15 @@ func logoutOptionsController(context: AccountContext, navigationController: Navi dismissImpl?() }, setPasscode: { - pushControllerImpl?(passcodeOptionsController(context: context)) + let _ = passcodeOptionsAccessController(context: context, pushController: { controller in + replaceTopControllerImpl?(controller) + }, completion: { _ in + replaceTopControllerImpl?(passcodeOptionsController(context: context)) + }).start(next: { controller in + if let controller = controller { + pushControllerImpl?(controller) + } + }) dismissImpl?() }, clearCache: { pushControllerImpl?(storageUsageController(context: context)) @@ -142,7 +151,7 @@ func logoutOptionsController(context: AccountContext, navigationController: Navi supportPeer.set(supportPeerId(account: context.account)) let presentationData = context.sharedContext.currentPresentationData.with { $0 } - var faqUrl = context.sharedContext.currentPresentationData.with { $0 }.strings.Settings_FAQ_URL + var faqUrl = presentationData.strings.Settings_FAQ_URL if faqUrl == "Settings.FAQ_URL" || faqUrl.isEmpty { faqUrl = "https://telegram.org/faq#general" } @@ -224,6 +233,9 @@ func logoutOptionsController(context: AccountContext, navigationController: Navi presentControllerImpl = { [weak controller] value, arguments in controller?.present(value, in: .window(.root), with: arguments ?? ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) } + replaceTopControllerImpl = { [weak navigationController] c in + navigationController?.replaceTopController(c, animated: true) + } dismissImpl = { [weak controller] in let _ = controller?.dismiss() } diff --git a/submodules/TelegramUI/TelegramUI/NotificationsAndSounds.swift b/submodules/TelegramUI/TelegramUI/NotificationsAndSounds.swift index f2cfcbd9d4..117eeb2e3d 100644 --- a/submodules/TelegramUI/TelegramUI/NotificationsAndSounds.swift +++ b/submodules/TelegramUI/TelegramUI/NotificationsAndSounds.swift @@ -599,7 +599,8 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry { arguments.presentController(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) }) case let .userExceptions(theme, strings, text, value): - return ItemListDisclosureItem(theme: theme, title: text, label: strings.Notifications_Exceptions(Int32(value.settings.count)), sectionId: self.section, style: .blocks, action: { + let label = value.settings.count > 0 ? strings.Notifications_Exceptions(Int32(value.settings.count)) : strings.Notification_Exceptions_Add + return ItemListDisclosureItem(theme: theme, title: text, label: label, sectionId: self.section, style: .blocks, action: { let controller = NotificationExceptionsController(context: arguments.context, mode: value, updatedMode: arguments.updatedExceptionMode) arguments.pushController(controller) }) @@ -623,7 +624,8 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry { arguments.presentController(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) }) case let .groupExceptions(theme, strings, text, value): - return ItemListDisclosureItem(theme: theme, title: text, label: strings.Notifications_Exceptions(Int32(value.settings.count)), sectionId: self.section, style: .blocks, action: { + let label = value.settings.count > 0 ? strings.Notifications_Exceptions(Int32(value.settings.count)) : strings.Notification_Exceptions_Add + return ItemListDisclosureItem(theme: theme, title: text, label: label, sectionId: self.section, style: .blocks, action: { let controller = NotificationExceptionsController(context: arguments.context, mode: value, updatedMode: arguments.updatedExceptionMode) arguments.pushController(controller) }) @@ -647,7 +649,8 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry { arguments.presentController(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) }) case let .channelExceptions(theme, strings, text, value): - return ItemListDisclosureItem(theme: theme, title: text, label: strings.Notifications_Exceptions(Int32(value.settings.count)), sectionId: self.section, style: .blocks, action: { + let label = value.settings.count > 0 ? strings.Notifications_Exceptions(Int32(value.settings.count)) : strings.Notification_Exceptions_Add + return ItemListDisclosureItem(theme: theme, title: text, label: label, sectionId: self.section, style: .blocks, action: { let controller = NotificationExceptionsController(context: arguments.context, mode: value, updatedMode: arguments.updatedExceptionMode) arguments.pushController(controller) }) @@ -758,34 +761,22 @@ private func notificationsAndSoundsEntries(authorizationStatus: AccessType, warn entries.append(.messageAlerts(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsAlert, globalSettings.privateChats.enabled)) entries.append(.messagePreviews(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsPreview, globalSettings.privateChats.displayPreviews)) entries.append(.messageSound(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsSound, localizedPeerNotificationSoundString(strings: presentationData.strings, sound: filteredGlobalSound(globalSettings.privateChats.sound)), filteredGlobalSound(globalSettings.privateChats.sound))) - if !exceptions.users.isEmpty { - entries.append(.userExceptions(presentationData.theme, presentationData.strings, presentationData.strings.Notifications_MessageNotificationsExceptions, exceptions.users)) - entries.append(.messageNotice(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsExceptionsHelp)) - } else { - entries.append(.messageNotice(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsHelp)) - } + entries.append(.userExceptions(presentationData.theme, presentationData.strings, presentationData.strings.Notifications_MessageNotificationsExceptions, exceptions.users)) + entries.append(.messageNotice(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsExceptionsHelp)) entries.append(.groupHeader(presentationData.theme, presentationData.strings.Notifications_GroupNotifications.uppercased())) entries.append(.groupAlerts(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsAlert, globalSettings.groupChats.enabled)) entries.append(.groupPreviews(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsPreview, globalSettings.groupChats.displayPreviews)) entries.append(.groupSound(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsSound, localizedPeerNotificationSoundString(strings: presentationData.strings, sound: filteredGlobalSound(globalSettings.groupChats.sound)), filteredGlobalSound(globalSettings.groupChats.sound))) - if !exceptions.groups.isEmpty { - entries.append(.groupExceptions(presentationData.theme, presentationData.strings, presentationData.strings.Notifications_MessageNotificationsExceptions, exceptions.groups)) - entries.append(.groupNotice(presentationData.theme, presentationData.strings.Notifications_GroupNotificationsExceptionsHelp)) - } else { - entries.append(.groupNotice(presentationData.theme, presentationData.strings.Notifications_GroupNotificationsHelp)) - } + entries.append(.groupExceptions(presentationData.theme, presentationData.strings, presentationData.strings.Notifications_MessageNotificationsExceptions, exceptions.groups)) + entries.append(.groupNotice(presentationData.theme, presentationData.strings.Notifications_GroupNotificationsExceptionsHelp)) entries.append(.channelHeader(presentationData.theme, presentationData.strings.Notifications_ChannelNotifications.uppercased())) entries.append(.channelAlerts(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsAlert, globalSettings.channels.enabled)) entries.append(.channelPreviews(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsPreview, globalSettings.channels.displayPreviews)) entries.append(.channelSound(presentationData.theme, presentationData.strings.Notifications_MessageNotificationsSound, localizedPeerNotificationSoundString(strings: presentationData.strings, sound: filteredGlobalSound(globalSettings.channels.sound)), filteredGlobalSound(globalSettings.channels.sound))) - if !exceptions.channels.isEmpty { - entries.append(.channelExceptions(presentationData.theme, presentationData.strings, presentationData.strings.Notifications_MessageNotificationsExceptions, exceptions.channels)) - entries.append(.channelNotice(presentationData.theme, presentationData.strings.Notifications_ChannelNotificationsExceptionsHelp)) - } else { - entries.append(.channelNotice(presentationData.theme, presentationData.strings.Notifications_ChannelNotificationsHelp)) - } + entries.append(.channelExceptions(presentationData.theme, presentationData.strings, presentationData.strings.Notifications_MessageNotificationsExceptions, exceptions.channels)) + entries.append(.channelNotice(presentationData.theme, presentationData.strings.Notifications_ChannelNotificationsExceptionsHelp)) entries.append(.inAppHeader(presentationData.theme, presentationData.strings.Notifications_InAppNotifications.uppercased())) entries.append(.inAppSounds(presentationData.theme, presentationData.strings.Notifications_InAppNotificationsSounds, inAppSettings.playSounds)) diff --git a/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift b/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift index 46e89477ae..b87f0ec0f0 100644 --- a/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift +++ b/submodules/TelegramUI/TelegramUI/OpenChatMessage.swift @@ -7,6 +7,7 @@ import SwiftSignalKit import PassKit import Lottie import TelegramUIPreferences +import TelegramPresentationData private enum ChatMessageGalleryControllerData { case url(String) @@ -18,8 +19,9 @@ private enum ChatMessageGalleryControllerData { case document(TelegramMediaFile) case gallery(GalleryController) case secretGallery(SecretMediaPreviewController) - case other(Media) case chatAvatars(AvatarGalleryController, Media) + case theme(TelegramMediaFile) + case other(Media) } private func chatMessageGalleryControllerData(context: AccountContext, message: Message, navigationController: NavigationController?, standalone: Bool, reverseMessageGalleryOrder: Bool, mode: ChatControllerInteractionOpenMessageMode, synchronousLoad: Bool, actionInteraction: GalleryControllerActionInteraction?) -> ChatMessageGalleryControllerData? { @@ -128,7 +130,10 @@ private func chatMessageGalleryControllerData(context: AccountContext, message: if let file = galleryMedia as? TelegramMediaFile { if let fileName = file.fileName { let ext = (fileName as NSString).pathExtension.lowercased() - if ext == "wav" || ext == "opus" { + if ext == "tgios-theme" { + return .theme(file) + } + else if ext == "wav" || ext == "opus" { return .audio(file) } else if ext == "json", let fileSize = file.size, fileSize < 1024 * 1024 { if let path = context.account.postbox.mediaBox.completedResourcePath(file.resource), let _ = LOTComposition(filePath: path) { @@ -262,7 +267,6 @@ func openChatMessage(context: AccountContext, message: Message, standalone: Bool if let rootController = navigationController?.view.window?.rootViewController { presentDocumentPreviewController(rootController: rootController, theme: presentationData.theme, strings: presentationData.strings, postbox: context.account.postbox, file: file) } - //present(ShareController(account: account, subject: .messages([message]), showInChat: nil, externalShare: true, immediateExternalShare: true), nil) return true case let .audio(file): let location: PeerMessagesPlaylistLocation @@ -335,22 +339,25 @@ func openChatMessage(context: AccountContext, message: Message, standalone: Bool }) return true } - case let .chatAvatars(controller, media): - dismissInput() - chatAvatarHiddenMedia(controller.hiddenMedia |> map { value -> MessageId? in - if value != nil { - return message.id - } else { + case let .chatAvatars(controller, media): + dismissInput() + chatAvatarHiddenMedia(controller.hiddenMedia |> map { value -> MessageId? in + if value != nil { + return message.id + } else { + return nil + } + }, media) + + present(controller, AvatarGalleryControllerPresentationArguments(transitionArguments: { entry in + if let selectedTransitionNode = transitionNode(message.id, media) { + return GalleryTransitionArguments(transitionNode: selectedTransitionNode, addToTransitionSurface: addToTransitionSurface) + } return nil - } - }, media) - - present(controller, AvatarGalleryControllerPresentationArguments(transitionArguments: { entry in - if let selectedTransitionNode = transitionNode(message.id, media) { - return GalleryTransitionArguments(transitionNode: selectedTransitionNode, addToTransitionSurface: addToTransitionSurface) - } - return nil - })) + })) + case let .theme(media): + let controller = ThemePreviewController(context: context, previewTheme: makeDefaultDayPresentationTheme(accentColor: nil, serviceBackgroundColor: .black), media: .message(message: MessageReference(message), media: media)) + present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet)) } } return false diff --git a/submodules/TelegramUI/TelegramUI/PasscodeBackground.swift b/submodules/TelegramUI/TelegramUI/PasscodeBackground.swift index bbdb258b37..5ace21fe21 100644 --- a/submodules/TelegramUI/TelegramUI/PasscodeBackground.swift +++ b/submodules/TelegramUI/TelegramUI/PasscodeBackground.swift @@ -15,7 +15,7 @@ final class GradientPasscodeBackground: PasscodeBackground { public private(set) var backgroundImage: UIImage public private(set) var foregroundImage: UIImage - init(size: CGSize, backgroundColors: (UIColor, UIColor), buttonColor: UIColor?) { + init(size: CGSize, backgroundColors: (UIColor, UIColor), buttonColor: UIColor) { self.size = size self.backgroundImage = generateImage(CGSize(width: 8.0, height: size.height), contextGenerator: { size, context in let gradientColors = [backgroundColors.1.cgColor, backgroundColors.0.cgColor] as CFArray @@ -27,7 +27,7 @@ final class GradientPasscodeBackground: PasscodeBackground { self.foregroundImage = generateImage(CGSize(width: 1.0, height: 1.0), contextGenerator: { size, context in let bounds = CGRect(origin: CGPoint(), size: size) context.clear(bounds) - if let buttonColor = buttonColor { + if buttonColor != UIColor.clear { context.setFillColor(buttonColor.cgColor) } else { context.setFillColor(UIColor.white.withAlphaComponent(0.5).cgColor) diff --git a/submodules/TelegramUI/TelegramUI/PeerChannelMemberCategoriesContextsManager.swift b/submodules/TelegramUI/TelegramUI/PeerChannelMemberCategoriesContextsManager.swift index 0e02c1f831..6b25b53bda 100644 --- a/submodules/TelegramUI/TelegramUI/PeerChannelMemberCategoriesContextsManager.swift +++ b/submodules/TelegramUI/TelegramUI/PeerChannelMemberCategoriesContextsManager.swift @@ -163,7 +163,7 @@ final class PeerChannelMemberCategoriesContextsManager { self.impl.with { impl in for (contextPeerId, context) in impl.contexts { if contextPeerId == peerId { - context.replayUpdates([(.member(id: memberId, invitedAt: 0, adminInfo: nil, banInfo: nil), nil, nil)]) + context.replayUpdates([(.member(id: memberId, invitedAt: 0, adminInfo: nil, banInfo: nil, rank: nil), nil, nil)]) } } } @@ -224,8 +224,8 @@ final class PeerChannelMemberCategoriesContextsManager { } } - func updateMemberAdminRights(account: Account, peerId: PeerId, memberId: PeerId, adminRights: TelegramChatAdminRights) -> Signal { - return updateChannelAdminRights(account: account, peerId: peerId, adminId: memberId, rights: adminRights) + func updateMemberAdminRights(account: Account, peerId: PeerId, memberId: PeerId, adminRights: TelegramChatAdminRights, rank: String?) -> Signal { + return updateChannelAdminRights(account: account, peerId: peerId, adminId: memberId, rights: adminRights, rank: rank) |> map(Optional.init) |> deliverOnMainQueue |> beforeNext { [weak self] result in diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift index cf870645d5..176542901d 100644 --- a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionControllerNode.swift @@ -279,7 +279,7 @@ class PeerMediaCollectionControllerNode: ASDisplayNode { let selectionPanelSeparatorNode = ASDisplayNode() selectionPanelSeparatorNode.isLayerBacked = true - selectionPanelSeparatorNode.backgroundColor = self.mediaCollectionInterfaceState.theme.chat.inputPanel.panelStrokeColor + selectionPanelSeparatorNode.backgroundColor = self.mediaCollectionInterfaceState.theme.chat.inputPanel.panelSeparatorColor self.addSubnode(selectionPanelSeparatorNode) self.selectionPanelSeparatorNode = selectionPanelSeparatorNode diff --git a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping index 8bc8883acd..668bd38d74 100644 Binary files a/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping and b/submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping differ diff --git a/submodules/TelegramUI/TelegramUI/ShareController.swift b/submodules/TelegramUI/TelegramUI/ShareController.swift index 75a715c8e6..3588f9d5cb 100644 --- a/submodules/TelegramUI/TelegramUI/ShareController.swift +++ b/submodules/TelegramUI/TelegramUI/ShareController.swift @@ -451,7 +451,7 @@ public final class ShareController: ViewController { var collectableItems: [CollectableExternalShareItem] = [] switch strongSelf.subject { case let .url(text): - collectableItems.append(CollectableExternalShareItem(url: text, text: "", mediaReference: nil)) + collectableItems.append(CollectableExternalShareItem(url: explicitUrl(text), text: "", mediaReference: nil)) case let .text(string): collectableItems.append(CollectableExternalShareItem(url: "", text: string, mediaReference: nil)) case let .quote(text, url): diff --git a/submodules/TelegramUI/TelegramUI/ThemeAutoNightSettingsController.swift b/submodules/TelegramUI/TelegramUI/ThemeAutoNightSettingsController.swift index 6f15d652f0..a4f3740141 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeAutoNightSettingsController.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeAutoNightSettingsController.swift @@ -235,7 +235,7 @@ private enum ThemeAutoNightSettingsControllerEntry: ItemListNodeEntry { }) case let .themeNight(theme, title, value): return ItemListCheckboxItem(theme: theme, title: title, style: .left, checked: value, zeroSeparatorInsets: false, sectionId: self.section, action: { - arguments.updateTheme(.nightGrayscale) + arguments.updateTheme(.night) }) } } @@ -288,21 +288,12 @@ private func themeAutoNightSettingsControllerEntries(theme: PresentationTheme, s entries.append(.settingInfo(theme, strings.AutoNightTheme_AutomaticHelp("\(Int(threshold * 100.0))").0.replacingOccurrences(of: "%%", with: "%"))) } - switch switchSetting.trigger { - case .none: - break - case .timeBased, .brightness: - entries.append(.themeHeader(theme, strings.AutoNightTheme_PreferredTheme)) - entries.append(.themeNightBlue(theme, strings.Appearance_ThemeNightBlue, switchSetting.theme == .nightAccent)) - entries.append(.themeNight(theme, strings.Appearance_ThemeNight, switchSetting.theme == .nightGrayscale)) - } - return entries } private func roundTimeToDay(_ timestamp: Int32) -> Int32 { let calendar = Calendar.current - let offset = 0//TimeZone.current.secondsFromGMT(for: Date()) + let offset = 0 let components = calendar.dateComponents([.hour, .minute, .second], from: Date(timeIntervalSince1970: Double(timestamp + Int32(offset)))) return Int32(components.hour! * 60 * 60 + components.minute! * 60 + components.second!) } diff --git a/submodules/TelegramUI/TelegramUI/ThemeGridController.swift b/submodules/TelegramUI/TelegramUI/ThemeGridController.swift index 086a2d988d..ce084deb64 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeGridController.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeGridController.swift @@ -178,7 +178,7 @@ final class ThemeGridController: ViewController { switch theme { case .day: fallbackWallpaper = .color(0xffffff) - case .nightGrayscale: + case .night: fallbackWallpaper = .color(0x000000) case .nightAccent: fallbackWallpaper = .color(0x18222d) @@ -251,7 +251,7 @@ final class ThemeGridController: ViewController { switch theme { case .day: wallpaper = .color(0xffffff) - case .nightGrayscale: + case .night: wallpaper = .color(0x000000) case .nightAccent: wallpaper = .color(0x18222d) diff --git a/submodules/TelegramUI/TelegramUI/ThemeGridControllerNode.swift b/submodules/TelegramUI/TelegramUI/ThemeGridControllerNode.swift index d2b758b5bb..583c1300d9 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeGridControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeGridControllerNode.swift @@ -633,7 +633,7 @@ final class ThemeGridControllerNode: ASDisplayNode { let selectionPanelSeparatorNode = ASDisplayNode() selectionPanelSeparatorNode.isLayerBacked = true - selectionPanelSeparatorNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelStrokeColor + selectionPanelSeparatorNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelSeparatorColor self.addSubnode(selectionPanelSeparatorNode) self.selectionPanelSeparatorNode = selectionPanelSeparatorNode diff --git a/submodules/TelegramUI/TelegramUI/ThemePreviewController.swift b/submodules/TelegramUI/TelegramUI/ThemePreviewController.swift new file mode 100644 index 0000000000..6ee5c2dad1 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/ThemePreviewController.swift @@ -0,0 +1,125 @@ +import Foundation +import UIKit +import Display +import Postbox +import SwiftSignalKit +import AsyncDisplayKit +import TelegramCore +import TelegramPresentationData +import TelegramUIPreferences + +final class ThemePreviewController: ViewController { + private let context: AccountContext + private let previewTheme: PresentationTheme + private let media: AnyMediaReference + + private var controllerNode: ThemePreviewControllerNode { + return self.displayNode as! ThemePreviewControllerNode + } + + private var didPlayPresentationAnimation = false + + private var presentationData: PresentationData + private var presentationDataDisposable: Disposable? + + init(context: AccountContext, previewTheme: PresentationTheme, media: AnyMediaReference) { + self.context = context + self.previewTheme = previewTheme + self.media = media + + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + + super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationTheme: self.previewTheme, presentationStrings: self.presentationData.strings)) + + if let author = previewTheme.author { + let titleView = CounterContollerTitleView(theme: self.previewTheme) + titleView.title = CounterContollerTitle(title: previewTheme.name.string, counter: author) + self.navigationItem.titleView = titleView + } else { + self.title = previewTheme.name.string + } + self.statusBar.statusBarStyle = self.previewTheme.rootController.statusBarStyle.style + self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait) + + self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: self.previewTheme.rootController.navigationBar.accentTextColor), style: .plain, target: self, action: #selector(self.actionPressed)) + + self.presentationDataDisposable = (context.sharedContext.presentationData + |> deliverOnMainQueue).start(next: { [weak self] presentationData in + if let strongSelf = self { + strongSelf.presentationData = presentationData + strongSelf.updateStrings() + } + }) + } + + required init(coder aDecoder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + deinit { + self.presentationDataDisposable?.dispose() + } + + public override 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 func loadDisplayNode() { + super.loadDisplayNode() + + self.displayNode = ThemePreviewControllerNode(context: self.context, previewTheme: self.previewTheme, dismiss: { [weak self] in + if let strongSelf = self { + strongSelf.dismiss() + } + }, apply: { [weak self] in + if let strongSelf = self { + let _ = (strongSelf.context.sharedContext.accountManager.transaction { transaction -> Void in + transaction.updateSharedData(ApplicationSpecificSharedDataKeys.presentationThemeSettings, { entry in + let current: PresentationThemeSettings + if let entry = entry as? PresentationThemeSettings { + current = entry + } else { + current = PresentationThemeSettings.defaultSettings + } + + return PresentationThemeSettings(chatWallpaper: .color(0xffffff), theme: .builtin(.day), themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, themeTintColors: current.themeTintColors, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + }) + }).start(completed: { [weak self] in + if let strongSelf = self { + strongSelf.dismiss() + } + }) + } + }) + self.displayNodeDidLoad() + } + + private func updateStrings() { + + } + + override public func dismiss(completion: (() -> Void)? = nil) { + self.controllerNode.animateOut(completion: { [weak self] in + self?.presentingViewController?.dismiss(animated: false, completion: nil) + completion?() + }) + } + + override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) { + super.containerLayoutUpdated(layout, transition: transition) + + self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition) + } + + @objc private func actionPressed() { + let controller = ShareController(context: self.context, subject: .media(self.media)) + self.present(controller, in: .window(.root), blockInteraction: true) + } +} diff --git a/submodules/TelegramUI/TelegramUI/ThemePreviewControllerNode.swift b/submodules/TelegramUI/TelegramUI/ThemePreviewControllerNode.swift new file mode 100644 index 0000000000..7d14aa6eb3 --- /dev/null +++ b/submodules/TelegramUI/TelegramUI/ThemePreviewControllerNode.swift @@ -0,0 +1,65 @@ +import Foundation +import UIKit +import Display +import Postbox +import SwiftSignalKit +import AsyncDisplayKit +import TelegramCore +import TelegramPresentationData +import TelegramUIPreferences + +class ThemePreviewControllerNode: ASDisplayNode { + private let context: AccountContext + private let previewTheme: PresentationTheme + private var presentationData: PresentationData + + private var messageNodes: [ListViewItemNode]? + private let toolbarNode: WallpaperGalleryToolbarNode + + private var validLayout: (ContainerViewLayout, CGFloat)? + + init(context: AccountContext, previewTheme: PresentationTheme, dismiss: @escaping () -> Void, apply: @escaping () -> Void) { + self.context = context + self.previewTheme = previewTheme + + self.presentationData = context.sharedContext.currentPresentationData.with { $0 } + + self.toolbarNode = WallpaperGalleryToolbarNode(theme: self.previewTheme, strings: self.presentationData.strings) + + super.init() + + self.setViewBlock({ + return UITracingLayerView() + }) + + if case let .color(value) = self.previewTheme.chat.defaultWallpaper { + self.backgroundColor = UIColor(rgb: UInt32(bitPattern: value)) + } else { + self.backgroundColor = self.previewTheme.list.plainBackgroundColor + } + + self.addSubnode(self.toolbarNode) + + self.toolbarNode.cancel = { + dismiss() + } + self.toolbarNode.done = { + apply() + } + } + + func animateIn(completion: (() -> Void)? = nil) { + 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) { + 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: kCAMediaTimingFunctionEaseInEaseOut, removeOnCompletion: false, completion: { _ in + completion?() + }) + } + + func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) { + transition.updateFrame(node: self.toolbarNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width, height: 49.0 + layout.intrinsicInsets.bottom))) + self.toolbarNode.updateLayout(size: CGSize(width: layout.size.width, height: 49.0), layout: layout, transition: transition) + } +} diff --git a/submodules/TelegramUI/TelegramUI/ThemeSettingsAccentColorItem.swift b/submodules/TelegramUI/TelegramUI/ThemeSettingsAccentColorItem.swift index 91d44d9357..8ee8b8fbb1 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeSettingsAccentColorItem.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeSettingsAccentColorItem.swift @@ -13,8 +13,8 @@ private func generateSwatchImage(color: PresentationThemeAccentColor, selected: context.clear(bounds) - let fillColor = UIColor(rgb: UInt32(bitPattern: color.color)) - let strokeColor = UIColor(rgb: UInt32(bitPattern: color.baseColor.colorValue)) + let fillColor = color.color + let strokeColor = color.baseColor.color context.setFillColor(fillColor.cgColor) context.setStrokeColor(strokeColor.cgColor) @@ -41,10 +41,10 @@ class ThemeSettingsAccentColorItem: ListViewItem, ItemListItem { let colors: [PresentationThemeBaseColor] let currentColor: PresentationThemeAccentColor let updated: (PresentationThemeAccentColor) -> Void - let toggleSlider: () -> Void + let toggleSlider: (PresentationThemeBaseColor) -> Void let tag: ItemListItemTag? - init(theme: PresentationTheme, sectionId: ItemListSectionId, colors: [PresentationThemeBaseColor], currentColor: PresentationThemeAccentColor, updated: @escaping (PresentationThemeAccentColor) -> Void, toggleSlider: @escaping () -> Void, tag: ItemListItemTag? = nil) { + init(theme: PresentationTheme, sectionId: ItemListSectionId, colors: [PresentationThemeBaseColor], currentColor: PresentationThemeAccentColor, updated: @escaping (PresentationThemeAccentColor) -> Void, toggleSlider: @escaping (PresentationThemeBaseColor) -> Void, tag: ItemListItemTag? = nil) { self.theme = theme self.colors = colors self.currentColor = currentColor @@ -274,7 +274,7 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { } if imageNode == selectedNode { - item.toggleSlider() + item.toggleSlider(accentColor.baseColor) } }) @@ -284,6 +284,12 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { i += 1 } + for k in (i ..< strongSelf.nodes.count).reversed() { + let node = strongSelf.nodes[k] + strongSelf.nodes.remove(at: k) + node.removeFromSupernode() + } + if let lastNode = strongSelf.nodes.last { let contentSize = CGSize(width: lastNode.frame.maxX + nodeInset, height: strongSelf.scrollNode.frame.height) if strongSelf.scrollNode.view.contentSize != contentSize { diff --git a/submodules/TelegramUI/TelegramUI/ThemeSettingsAppIconItem.swift b/submodules/TelegramUI/TelegramUI/ThemeSettingsAppIconItem.swift index 75711374a3..e74272695e 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeSettingsAppIconItem.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeSettingsAppIconItem.swift @@ -149,8 +149,8 @@ private final class ThemeSettingsAppIconNode : ASDisplayNode { } -private let textFont = Font.regular(11.0) -private let itemSize = Font.regular(11.0) +private let textFont = Font.regular(12.0) +private let selectedTextFont = Font.bold(12.0) class ThemeSettingsAppIconItemNode: ListViewItemNode, ItemListItemNode { private let backgroundNode: ASDisplayNode @@ -302,7 +302,7 @@ class ThemeSettingsAppIconItemNode: ListViewItemNode, ItemListItemNode { break } - imageNode.setup(theme: item.theme, icon: image, title: NSAttributedString(string: name, font: textFont, textColor: selected ? item.theme.list.itemAccentColor : item.theme.list.itemPrimaryTextColor, paragraphAlignment: .center), bordered: bordered, selected: selected, action: { [weak self, weak imageNode] in + imageNode.setup(theme: item.theme, icon: image, title: NSAttributedString(string: name, font: selected ? selectedTextFont : textFont, textColor: selected ? item.theme.list.itemAccentColor : item.theme.list.itemPrimaryTextColor, paragraphAlignment: .center), bordered: bordered, selected: selected, action: { [weak self, weak imageNode] in item.updated(icon.name) if let imageNode = imageNode { self?.scrollToNode(imageNode, animated: true) diff --git a/submodules/TelegramUI/TelegramUI/ThemeSettingsChatPreviewItem.swift b/submodules/TelegramUI/TelegramUI/ThemeSettingsChatPreviewItem.swift index a23b25a33e..8f0365f202 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeSettingsChatPreviewItem.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeSettingsChatPreviewItem.swift @@ -129,8 +129,8 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { let chatPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: item.componentTheme, wallpaper: item.wallpaper), fontSize: item.fontSize, strings: item.strings, dateTimeFormat: item.dateTimeFormat, nameDisplayOrder: item.nameDisplayOrder, disableAnimations: false, largeEmoji: false) - let item2: ChatMessageItem = ChatMessageItem(presentationData: chatPresentationData, context: item.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: nil, text: item.strings.Appearance_PreviewIncomingText, attributes: [ReplyMessageAttribute(messageId: replyMessageId)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), disableDate: true) - let item1: ChatMessageItem = ChatMessageItem(presentationData: chatPresentationData, context: item.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: TelegramUser(id: item.context.account.peerId, accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []), text: item.strings.Appearance_PreviewOutgoingText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), disableDate: true) + let item2: ChatMessageItem = ChatMessageItem(presentationData: chatPresentationData, context: item.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: nil, text: item.strings.Appearance_PreviewIncomingText, attributes: [ReplyMessageAttribute(messageId: replyMessageId)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), disableDate: true) + let item1: ChatMessageItem = ChatMessageItem(presentationData: chatPresentationData, context: item.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: TelegramUser(id: item.context.account.peerId, accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []), text: item.strings.Appearance_PreviewOutgoingText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), disableDate: true) var node1: ListViewItemNode? if let current = currentNode1 { diff --git a/submodules/TelegramUI/TelegramUI/ThemeSettingsColorSliderNode.swift b/submodules/TelegramUI/TelegramUI/ThemeSettingsColorSliderNode.swift index b5fd446d4f..7cb291d85a 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeSettingsColorSliderNode.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeSettingsColorSliderNode.swift @@ -4,6 +4,7 @@ import AsyncDisplayKit import SwiftSignalKit import Display import TelegramPresentationData +import TelegramUIPreferences private let shadowImage: UIImage = { return generateImage(CGSize(width: 54.0, height: 54.0), opaque: false, scale: nil, rotatedContext: { size, context in @@ -11,29 +12,31 @@ private let shadowImage: UIImage = { context.setFillColor(UIColor.clear.cgColor) context.fill(CGRect(origin: CGPoint(), size: size)) context.setBlendMode(.normal) - context.setShadow(offset: CGSize(width: 0.0, height: 1.5), blur: 4.5, color: UIColor(rgb: 0x000000, alpha: 0.5).cgColor) + context.setShadow(offset: CGSize(width: 0.0, height: 1.5), blur: 3.5, color: UIColor(rgb: 0x000000, alpha: 0.65).cgColor) context.setFillColor(UIColor(rgb: 0x000000, alpha: 0.5).cgColor) context.fillEllipse(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: 4.5 + UIScreenPixel, dy: 4.5 + UIScreenPixel)) })! }() -private final class HSVParameter: NSObject { - let hue: CGFloat - let saturation: CGFloat +private final class ColorsParameter: NSObject { + let leftColor: UIColor + let baseColor: UIColor + let rightColor: UIColor let value: CGFloat - init(hue: CGFloat, saturation: CGFloat, value: CGFloat) { - self.hue = hue - self.saturation = saturation + init(leftColor: UIColor, baseColor: UIColor, rightColor: UIColor, value: CGFloat) { + self.leftColor = leftColor + self.baseColor = baseColor + self.rightColor = rightColor self.value = value super.init() } } private final class ThemeSettingsColorKnobNode: ASDisplayNode { - var hsv: (CGFloat, CGFloat, CGFloat) = (0.0, 0.0, 1.0) { + var values: (UIColor, UIColor, UIColor, CGFloat) = (.clear, .clear, .clear, 0.5) { didSet { - if self.hsv != oldValue { + if self.values != oldValue { self.setNeedsDisplay() } } @@ -48,11 +51,11 @@ private final class ThemeSettingsColorKnobNode: ASDisplayNode { } override func drawParameters(forAsyncLayer layer: _ASDisplayLayer) -> NSObjectProtocol? { - return HSVParameter(hue: self.hsv.0, saturation: self.hsv.1, value: self.hsv.2) + return ColorsParameter(leftColor: self.values.0, baseColor: self.values.1, rightColor: self.values.2, value: self.values.3) } @objc override class func draw(_ bounds: CGRect, withParameters parameters: Any?, isCancelled: () -> Bool, isRasterizing: Bool) { - guard let parameters = parameters as? HSVParameter else { + guard let parameters = parameters as? ColorsParameter else { return } let context = UIGraphicsGetCurrentContext()! @@ -69,7 +72,15 @@ private final class ThemeSettingsColorKnobNode: ASDisplayNode { context.setFillColor(UIColor.white.cgColor) context.fillEllipse(in: bounds.insetBy(dx: 3.0, dy: 3.0)) - let color = UIColor(hue: parameters.hue, saturation: parameters.saturation, brightness: parameters.value, alpha: 1.0) + let color: UIColor + if parameters.value < 0.5 { + color = parameters.baseColor.interpolateTo(parameters.leftColor, fraction: 0.5 - parameters.value)! + } else if parameters.value > 0.5 { + color = parameters.baseColor.interpolateTo(parameters.rightColor, fraction: parameters.value - 0.5)! + } else { + color = parameters.baseColor + } + context.setFillColor(color.cgColor) let borderWidth: CGFloat = bounds.width > 30.0 ? 5.0 : 5.0 @@ -78,7 +89,7 @@ private final class ThemeSettingsColorKnobNode: ASDisplayNode { } private final class ThemeSettingsColorBrightnessNode: ASDisplayNode { - var hsv: (CGFloat, CGFloat, CGFloat) = (0.0, 1.0, 1.0) { + var values: (UIColor, UIColor, UIColor, CGFloat) = (.clear, .clear, .clear, 0.5) { didSet { self.setNeedsDisplay() } @@ -92,11 +103,11 @@ private final class ThemeSettingsColorBrightnessNode: ASDisplayNode { } override func drawParameters(forAsyncLayer layer: _ASDisplayLayer) -> NSObjectProtocol? { - return HSVParameter(hue: self.hsv.0, saturation: self.hsv.1, value: self.hsv.2) + return ColorsParameter(leftColor: self.values.0, baseColor: self.values.1, rightColor: self.values.2, value: self.values.3) } @objc override class func draw(_ bounds: CGRect, withParameters parameters: Any?, isCancelled: () -> Bool, isRasterizing: Bool) { - guard let parameters = parameters as? HSVParameter else { + guard let parameters = parameters as? ColorsParameter else { return } let context = UIGraphicsGetCurrentContext()! @@ -108,11 +119,8 @@ private final class ThemeSettingsColorBrightnessNode: ASDisplayNode { context.addPath(innerPath.cgPath) context.clip() - let leftColor = UIColor(hue: parameters.hue, saturation: parameters.saturation, brightness: parameters.value - 0.4, alpha: 1.0) - let rightColor = UIColor(hue: parameters.hue, saturation: parameters.saturation, brightness: parameters.value + 0.4, alpha: 1.0) - - let colors = [leftColor.cgColor, rightColor.cgColor] - var locations: [CGFloat] = [0.0, 1.0] + let colors = [parameters.leftColor.cgColor, parameters.baseColor.cgColor, parameters.rightColor.cgColor] + var locations: [CGFloat] = [0.0, 0.5, 1.0] let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)! context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: bounds.width, y: 0.0), options: CGGradientDrawingOptions()) } @@ -126,24 +134,26 @@ final class ThemeSettingsColorSliderNode: ASDisplayNode { var valueChanged: ((CGFloat) -> Void)? - var baseColor: UIColor = .white { + var baseColor: PresentationThemeBaseColor = .white { didSet { - var hue: CGFloat = 0.0 - var saturation: CGFloat = 0.0 - var value: CGFloat = 0.0 - - var newHSV: (CGFloat, CGFloat, CGFloat) = (0.0, 0.0, 0.0) - if self.baseColor.getHue(&hue, saturation: &saturation, brightness: &value, alpha: nil) { - newHSV = (hue, saturation, value) - } - - self.brightnessNode.hsv = newHSV + let colors = self.baseColor.edgeColors + self.brightnessNode.values = (colors.0, self.baseColor.color, colors.1, 0.5) self.update() } } - var value: CGFloat = 0.5 { - didSet { + + var _value: CGFloat = 0.5 + + var value: CGFloat { + get { + return _value + } + set { + self._value = newValue self.update() + if let validLayout = self.validLayout { + self.updateKnobLayout(size: validLayout, transition: .immediate) + } } } @@ -165,26 +175,16 @@ final class ThemeSettingsColorSliderNode: ASDisplayNode { override func didLoad() { super.didLoad() - let brightnessPanRecognizer = UIPanGestureRecognizer(target: self, action: #selector(self.brightnessPan)) - self.brightnessNode.view.addGestureRecognizer(brightnessPanRecognizer) + self.brightnessNode.view.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(self.brightnessPan))) } private func update() { - var hue: CGFloat = 0.0 - var saturation: CGFloat = 0.0 - var value: CGFloat = 0.0 - - let delta = (-0.5 + self.value) * 0.8 - - var newHSV: (CGFloat, CGFloat, CGFloat) = (0.0, 0.0, 0.0) - if self.baseColor.getHue(&hue, saturation: &saturation, brightness: &value, alpha: nil) { - newHSV = (hue, saturation, value + delta) - } - self.brightnessKnobNode.hsv = newHSV + let colors = self.baseColor.edgeColors + self.brightnessKnobNode.values = (colors.0, self.baseColor.color, colors.1, self.value) } func updateKnobLayout(size: CGSize, transition: ContainedViewLayoutTransition) { - let inset: CGFloat = 16.0 + let inset: CGFloat = 30.0 let brightnessKnobSize = CGSize(width: 54.0, height: 54.0) let brightnessKnobFrame = CGRect(x: inset - brightnessKnobSize.width / 2.0 + (size.width - inset * 2.0) * (self.value), y: floor((size.height - brightnessKnobSize.height) / 2.0), width: brightnessKnobSize.width, height: brightnessKnobSize.height) transition.updateFrame(node: self.brightnessKnobNode, frame: brightnessKnobFrame) @@ -208,7 +208,7 @@ final class ThemeSettingsColorSliderNode: ASDisplayNode { let transition = recognizer.translation(in: recognizer.view) let brightnessWidth: CGFloat = size.width - 16.0 * 2.0 let newValue = max(0.0, min(1.0, self.value + transition.x / brightnessWidth)) - self.value = newValue + self._value = newValue var ended = false switch recognizer.state { diff --git a/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift b/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift index 0b0593aa67..f98be2fb4e 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeSettingsController.swift @@ -12,21 +12,19 @@ private final class ThemeSettingsControllerArguments { let selectTheme: (PresentationThemeReference) -> Void let selectFontSize: (PresentationFontSize) -> Void let openWallpaperSettings: () -> Void - let openAccentColor: (Int32) -> Void let selectAccentColor: (PresentationThemeAccentColor) -> Void - let toggleColorSlider: () -> Void - let toggleTintAllColors: () -> Void + let toggleColorSlider: (Bool) -> Void + let toggleTintAllColors: (Bool) -> Void let openAutoNightTheme: () -> Void let toggleLargeEmoji: (Bool) -> Void let disableAnimations: (Bool) -> Void let selectAppIcon: (String) -> Void - init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, openAccentColor: @escaping (Int32) -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor) -> Void, toggleColorSlider: @escaping () -> Void, toggleTintAllColors: @escaping () -> Void, openAutoNightTheme: @escaping () -> Void, toggleLargeEmoji: @escaping (Bool) -> Void, disableAnimations: @escaping (Bool) -> Void, selectAppIcon: @escaping (String) -> Void) { + init(context: AccountContext, selectTheme: @escaping (PresentationThemeReference) -> Void, selectFontSize: @escaping (PresentationFontSize) -> Void, openWallpaperSettings: @escaping () -> Void, selectAccentColor: @escaping (PresentationThemeAccentColor) -> Void, toggleColorSlider: @escaping (Bool) -> Void, toggleTintAllColors: @escaping (Bool) -> Void, openAutoNightTheme: @escaping () -> Void, toggleLargeEmoji: @escaping (Bool) -> Void, disableAnimations: @escaping (Bool) -> Void, selectAppIcon: @escaping (String) -> Void) { self.context = context self.selectTheme = selectTheme self.selectFontSize = selectFontSize self.openWallpaperSettings = openWallpaperSettings - self.openAccentColor = openAccentColor self.selectAccentColor = selectAccentColor self.toggleColorSlider = toggleColorSlider self.toggleTintAllColors = toggleTintAllColors @@ -248,18 +246,20 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry { arguments.toggleLargeEmoji(value) }, tag: ThemeSettingsEntryTag.tint) case let .accentColor(theme, _, color): - let colorValue = color?.baseColor.colorValue ?? defaultDayAccentColor -// let accentColor = UIColor(rgb: UInt32(bitPattern: colorValue)) - var colors = PresentationThemeBaseColor.allCases if theme.overallDarkAppearance { colors = colors.filter { $0 != .black } } + if case let .builtin(name) = theme.name, name == .night { + colors = colors.filter { $0 != .gray } + } else { + colors = colors.filter { $0 != .white } + } return ThemeSettingsAccentColorItem(theme: theme, sectionId: self.section, colors: colors, currentColor: color ?? PresentationThemeAccentColor(baseColor: .blue, value: 0.5), updated: { color in arguments.selectAccentColor(color) - }, toggleSlider: { - arguments.toggleColorSlider() + }, toggleSlider: { baseColor in + arguments.toggleColorSlider(baseColor == .white) }, tag: ThemeSettingsEntryTag.accentColor) case let .autoNightTheme(theme, text, value): return ItemListDisclosureItem(theme: theme, icon: nil, title: text, label: value, labelStyle: .text, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: { @@ -307,16 +307,23 @@ private struct ThemeSettingsState: Equatable { } } -private func themeSettingsControllerEntries(presentationData: PresentationData, theme: PresentationTheme, themeReference: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], autoNightSettings: AutomaticThemeSwitchSetting, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, largeEmoji: Bool, disableAnimations: Bool, availableAppIcons: [PresentationAppIcon], currentAppIconName: String?, displayColorSlider: Bool) -> [ThemeSettingsControllerEntry] { +private func themeSettingsControllerEntries(presentationData: PresentationData, theme: PresentationTheme, themeReference: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], autoNightSettings: AutomaticThemeSwitchSetting, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, largeEmoji: Bool, disableAnimations: Bool, availableAppIcons: [PresentationAppIcon], currentAppIconName: String?, displayColorSlider: Bool, tintAllColors: Bool) -> [ThemeSettingsControllerEntry] { var entries: [ThemeSettingsControllerEntry] = [] entries.append(.themeListHeader(presentationData.theme, strings.Appearance_ColorTheme.uppercased())) entries.append(.chatPreview(presentationData.theme, theme, wallpaper, fontSize, presentationData.strings, dateTimeFormat, presentationData.nameDisplayOrder)) - if case .builtin = themeReference { - entries.append(.themeItem(presentationData.theme, presentationData.strings, [.builtin(.dayClassic), .builtin(.day), .builtin(.nightAccent), .builtin(.nightGrayscale)], themeReference, themeSpecificAccentColors, themeSpecificAccentColors[themeReference.index], displayColorSlider)) + + var availableThemes: [PresentationThemeReference] = [.builtin(.dayClassic), .builtin(.day)] + if tintAllColors { + availableThemes.append(.builtin(.nightAccent)) + } else { + availableThemes.append(.builtin(.night)) } - if theme.name == .builtin(.nightAccent) || theme.name == .builtin(.nightGrayscale) { - //entries.append(.themeTint(presentationData.theme, strings.Appearance_TintAllColors, false)) + + entries.append(.themeItem(presentationData.theme, presentationData.strings, availableThemes, themeReference, themeSpecificAccentColors, themeSpecificAccentColors[themeReference.index], displayColorSlider)) + + if theme.name == .builtin(.nightAccent) || theme.name == .builtin(.night) { + entries.append(.themeTint(presentationData.theme, strings.Appearance_TintAllColors, tintAllColors)) } if theme.name != .builtin(.dayClassic) { entries.append(.accentColor(presentationData.theme, strings.Appearance_AccentColor, themeSpecificAccentColors[themeReference.index])) @@ -362,7 +369,6 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The } var pushControllerImpl: ((ViewController) -> Void)? - var presentControllerImpl: ((ViewController) -> Void)? let _ = telegramWallpapers(postbox: context.account.postbox, network: context.account.network).start() @@ -389,45 +395,12 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The } let chatWallpaper: TelegramWallpaper - if let themeSpecificWallpaper = current.themeSpecificChatWallpapers[theme.index] { - if case let .builtin(themeReference) = theme { - switch themeReference { - case .nightAccent: - if let themeSpecificAccentColor = current.themeSpecificAccentColors[theme.index] { - let accentColor = UIColor(rgb: UInt32(bitPattern: themeSpecificAccentColor.color)) - let backgroundColor = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) - chatWallpaper = .color(Int32(bitPattern: backgroundColor.rgb)) - } else { - chatWallpaper = .color(0x18222d) - } - default: - chatWallpaper = themeSpecificWallpaper - } - } else { - chatWallpaper = themeSpecificWallpaper - } + chatWallpaper = themeSpecificWallpaper } else { - if case let .builtin(themeReference) = theme { - switch themeReference { - case .day: - chatWallpaper = .color(0xffffff) - case .dayClassic: - chatWallpaper = .builtin(WallpaperSettings()) - case .nightAccent: - if let themeSpecificAccentColor = current.themeSpecificAccentColors[theme.index] { - let accentColor = UIColor(rgb: UInt32(bitPattern: themeSpecificAccentColor.color)) - let backgroundColor = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) - chatWallpaper = .color(Int32(bitPattern: backgroundColor.rgb)) - } else { - chatWallpaper = .color(0x18222d) - } - case .nightGrayscale: - chatWallpaper = .color(0x000000) - } - } else { - chatWallpaper = .builtin(WallpaperSettings()) - } + let accentColor = current.themeSpecificAccentColors[theme.index]?.color ?? defaultDayAccentColor + let theme = makePresentationTheme(themeReference: theme, accentColor: accentColor, serviceBackgroundColor: defaultServiceBackgroundColor) + chatWallpaper = theme.chat.defaultWallpaper } return PresentationThemeSettings(chatWallpaper: chatWallpaper, theme: theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, themeTintColors: current.themeTintColors, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) @@ -439,63 +412,30 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The }).start() }, openWallpaperSettings: { pushControllerImpl?(ThemeGridController(context: context)) - }, openAccentColor: { color in - presentControllerImpl?(ThemeAccentColorActionSheet(context: context, currentValue: color, applyValue: { color in - let themeAccentColor: PresentationThemeBaseColor - switch color { - case 0xf83b4c: - themeAccentColor = .red - case 0xff7519: - themeAccentColor = .orange - case 0xeba239: - themeAccentColor = .yellow - case 0x29b327: - themeAccentColor = .green - case 0x00c2ed: - themeAccentColor = .cyan - case 0x007ee5: - themeAccentColor = .blue - case 0x7748ff: - themeAccentColor = .purple - case 0xff5da2: - themeAccentColor = .pink - default: - themeAccentColor = .blue - } - - let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in - var themeSpecificAccentColors = current.themeSpecificAccentColors - themeSpecificAccentColors[current.theme.index] = PresentationThemeAccentColor(baseColor: themeAccentColor, value: 0.5) - - return PresentationThemeSettings(chatWallpaper: current.chatWallpaper, theme: current.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, themeTintColors: current.themeTintColors, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) - }).start() - })) }, selectAccentColor: { color in let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in var themeSpecificAccentColors = current.themeSpecificAccentColors themeSpecificAccentColors[current.theme.index] = color + var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers + + let theme = makePresentationTheme(themeReference: current.theme, accentColor: color.color, serviceBackgroundColor: defaultServiceBackgroundColor) var chatWallpaper = current.chatWallpaper - if case let .builtin(themeReference) = current.theme { - switch themeReference { - case .nightAccent: - if let themeSpecificAccentColor = themeSpecificAccentColors[current.theme.index] { - let accentColor = UIColor(rgb: UInt32(bitPattern: themeSpecificAccentColor.color)) - let backgroundColor = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) - chatWallpaper = .color(Int32(bitPattern: backgroundColor.rgb)) - } else { - chatWallpaper = .color(0x18222d) - } - default: - break - } + if let wallpaper = current.themeSpecificChatWallpapers[current.theme.index], wallpaper.hasWallpaper { + } else { + chatWallpaper = theme.chat.defaultWallpaper + themeSpecificChatWallpapers[current.theme.index] = chatWallpaper } - return PresentationThemeSettings(chatWallpaper: chatWallpaper, theme: current.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, themeTintColors: current.themeTintColors, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) + if color.baseColor == .white { + updateState { $0.withDisplayColorSlider(false) } + } + + return PresentationThemeSettings(chatWallpaper: chatWallpaper, theme: current.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, themeTintColors: current.themeTintColors, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations) }).start() - }, toggleColorSlider: { - updateState { $0.withDisplayColorSlider(!$0.displayColorSlider) } - }, toggleTintAllColors: { + }, toggleColorSlider: { forceHidden in + updateState { $0.withDisplayColorSlider(forceHidden ? false : !$0.displayColorSlider) } + }, toggleTintAllColors: { value in }, openAutoNightTheme: { pushControllerImpl?(themeAutoNightSettingsController(context: context)) @@ -503,9 +443,9 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in return PresentationThemeSettings(chatWallpaper: current.chatWallpaper, theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, themeTintColors: current.themeTintColors, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: largeEmoji, disableAnimations: current.disableAnimations) }).start() - }, disableAnimations: { disabled in + }, disableAnimations: { value in let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in - return PresentationThemeSettings(chatWallpaper: current.chatWallpaper, theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, themeTintColors: current.themeTintColors, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: disabled) + return PresentationThemeSettings(chatWallpaper: current.chatWallpaper, theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, themeTintColors: current.themeTintColors, fontSize: current.fontSize, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: value) }).start() }, selectAppIcon: { name in currentAppIconName.set(name) @@ -515,42 +455,30 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The let signal = combineLatest(context.sharedContext.presentationData |> deliverOnMainQueue, context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]) |> deliverOnMainQueue, availableAppIcons, currentAppIconName.get() |> deliverOnMainQueue, statePromise.get() |> deliverOnMainQueue) |> map { presentationData, sharedData, availableAppIcons, currentAppIconName, state -> (ItemListControllerState, (ItemListNodeState, ThemeSettingsControllerEntry.ItemGenerationArguments)) in - let theme: PresentationTheme - let fontSize: PresentationFontSize - let wallpaper: TelegramWallpaper - let dateTimeFormat: PresentationDateTimeFormat - let largeEmoji: Bool - let disableAnimations: Bool - let settings = (sharedData.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings - switch settings.theme { - case let .builtin(reference): - switch reference { - case .dayClassic: - theme = defaultPresentationTheme - case .nightGrayscale: - theme = makeDarkPresentationTheme(accentColor: settings.themeSpecificAccentColors[settings.theme.index]?.color ?? defaultDayAccentColor) - case .nightAccent: - theme = makeDarkAccentPresentationTheme(accentColor: settings.themeSpecificAccentColors[settings.theme.index]?.color ?? defaultDayAccentColor) - case .day: - theme = makeDefaultDayPresentationTheme(accentColor: settings.themeSpecificAccentColors[settings.theme.index]?.color ?? defaultDayAccentColor, serviceBackgroundColor: defaultServiceBackgroundColor) - } - } + + let fontSize = settings.fontSize + let dateTimeFormat = presentationData.dateTimeFormat + let largeEmoji = settings.largeEmoji + let disableAnimations = settings.disableAnimations + + let accentColor = settings.themeSpecificAccentColors[settings.theme.index]?.color ?? defaultDayAccentColor + let theme = makePresentationTheme(themeReference: settings.theme, accentColor: accentColor, serviceBackgroundColor: defaultServiceBackgroundColor) + let wallpaper: TelegramWallpaper if let themeSpecificWallpaper = settings.themeSpecificChatWallpapers[settings.theme.index] { wallpaper = themeSpecificWallpaper } else { wallpaper = settings.chatWallpaper } + + var tintAllColors = settings.themeTintColors + if !tintAllColors, case let .builtin(theme) = settings.theme, case .nightAccent = theme { + tintAllColors = true + } - fontSize = settings.fontSize - - dateTimeFormat = presentationData.dateTimeFormat - largeEmoji = settings.largeEmoji - disableAnimations = settings.disableAnimations - let controllerState = ItemListControllerState(theme: presentationData.theme, title: .text(presentationData.strings.Appearance_Title), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back)) - let listState = ItemListNodeState(entries: themeSettingsControllerEntries(presentationData: presentationData, theme: theme, themeReference: settings.theme, themeSpecificAccentColors: settings.themeSpecificAccentColors, autoNightSettings: settings.automaticThemeSwitchSetting, strings: presentationData.strings, wallpaper: wallpaper, fontSize: fontSize, dateTimeFormat: dateTimeFormat, largeEmoji: largeEmoji, disableAnimations: disableAnimations, availableAppIcons: availableAppIcons, currentAppIconName: currentAppIconName, displayColorSlider: state.displayColorSlider), style: .blocks, ensureVisibleItemTag: focusOnItemTag, animateChanges: false) + let listState = ItemListNodeState(entries: themeSettingsControllerEntries(presentationData: presentationData, theme: theme, themeReference: settings.theme, themeSpecificAccentColors: settings.themeSpecificAccentColors, autoNightSettings: settings.automaticThemeSwitchSetting, strings: presentationData.strings, wallpaper: wallpaper, fontSize: fontSize, dateTimeFormat: dateTimeFormat, largeEmoji: largeEmoji, disableAnimations: disableAnimations, availableAppIcons: availableAppIcons, currentAppIconName: currentAppIconName, displayColorSlider: state.displayColorSlider, tintAllColors: tintAllColors), style: .blocks, ensureVisibleItemTag: focusOnItemTag, animateChanges: false) return (controllerState, (listState, arguments)) } @@ -559,9 +487,6 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The pushControllerImpl = { [weak controller] c in (controller?.navigationController as? NavigationController)?.pushViewController(c) } - presentControllerImpl = { [weak controller] c in - controller?.present(c, in: .window(.root)) - } return controller } diff --git a/submodules/TelegramUI/TelegramUI/ThemeSettingsThemeItem.swift b/submodules/TelegramUI/TelegramUI/ThemeSettingsThemeItem.swift index 27d459a8bf..d080c1d16e 100644 --- a/submodules/TelegramUI/TelegramUI/ThemeSettingsThemeItem.swift +++ b/submodules/TelegramUI/TelegramUI/ThemeSettingsThemeItem.swift @@ -37,7 +37,7 @@ private func generateBorderImage(theme: PresentationTheme, bordered: Bool, selec })?.stretchableImage(withLeftCapWidth: 15, topCapHeight: 15) } -private func generateThemeIconImage(theme: PresentationThemeReference, accentColor: Int32?) -> UIImage { +private func generateThemeIconImage(theme: PresentationThemeReference, accentColor: UIColor?) -> UIImage { return generateImage(CGSize(width: 98.0, height: 62.0), rotatedContext: { size, context in guard case let .builtin(theme) = theme else { return @@ -45,48 +45,33 @@ private func generateThemeIconImage(theme: PresentationThemeReference, accentCol let bounds = CGRect(origin: CGPoint(), size: size) let background: UIColor - let incomingBubble: UIColor - let outgoingBubble: UIColor + let incomingFill: UIColor + let outgoingFill: UIColor switch theme { case .dayClassic: background = UIColor(rgb: 0xd6e2ee) - incomingBubble = UIColor(rgb: 0xffffff) - outgoingBubble = UIColor(rgb: 0xe1ffc7) + incomingFill = UIColor(rgb: 0xffffff) + outgoingFill = UIColor(rgb: 0xe1ffc7) case .day: background = .white - incomingBubble = UIColor(rgb: 0xd5dde6) - if let accentColor = accentColor { - outgoingBubble = UIColor(rgb: UInt32(bitPattern: accentColor)) - } else { - outgoingBubble = UIColor(rgb: 0x007aff) - } - case .nightGrayscale: + incomingFill = UIColor(rgb: 0xd5dde6) + outgoingFill = accentColor ?? UIColor(rgb: 0x007aff) + case .night: background = UIColor(rgb: 0x000000) - incomingBubble = UIColor(rgb: 0x1f1f1f) - if let accentColorValue = accentColor { - let accentColor = UIColor(rgb: UInt32(bitPattern: accentColorValue)) - outgoingBubble = accentColor - } else { - outgoingBubble = UIColor(rgb: 0x313131) - } + incomingFill = UIColor(rgb: 0x1f1f1f) + outgoingFill = accentColor ?? UIColor(rgb: 0x007aff) case .nightAccent: - if let accentColorValue = accentColor { - let accentColor = UIColor(rgb: UInt32(bitPattern: accentColorValue)) - background = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) - incomingBubble = accentColor.withMultiplied(hue: 1.024, saturation: 0.585, brightness: 0.25) - outgoingBubble = accentColor.withMultiplied(hue: 1.019, saturation: 0.731, brightness: 0.59) - } else { - background = UIColor(rgb: 0x18222d) - incomingBubble = UIColor(rgb: 0x32475e) - outgoingBubble = UIColor(rgb: 0x3d6a97) - } + let accentColor = accentColor ?? UIColor(rgb: 0x007aff) + background = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18) + incomingFill = accentColor.withMultiplied(hue: 1.024, saturation: 0.585, brightness: 0.25) + outgoingFill = accentColor.withMultiplied(hue: 1.019, saturation: 0.731, brightness: 0.59) } context.setFillColor(background.cgColor) context.fill(bounds) - let incoming = generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeBubble"), color: incomingBubble) - let outgoing = generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeBubble"), color: outgoingBubble) + let incoming = generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeBubble"), color: incomingFill) + let outgoing = generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeBubble"), color: outgoingFill) context.translateBy(x: bounds.width / 2.0, y: bounds.height / 2.0) context.scaleBy(x: 1.0, y: -1.0) @@ -184,8 +169,6 @@ private final class ThemeSettingsThemeItemIconNode : ASDisplayNode { super.init() - self.allowsGroupOpacity = true - self.addSubnode(self.iconNode) self.addSubnode(self.overlayNode) self.addSubnode(self.textNode) @@ -224,8 +207,8 @@ private final class ThemeSettingsThemeItemIconNode : ASDisplayNode { } -private let textFont = Font.regular(11.0) -private let selectedTextFont = Font.bold(11.0) +private let textFont = Font.regular(12.0) +private let selectedTextFont = Font.bold(12.0) class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { private let backgroundNode: ASDisplayNode @@ -375,7 +358,7 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { name = item.strings.Appearance_ThemeCarouselClassic case .day: name = item.strings.Appearance_ThemeCarouselDay - case .nightGrayscale: + case .night: name = "Night" //item.strings.Appearance_ThemeCarouselNight case .nightAccent: name = "Tinted Night" //item.strings.Appearance_ThemeCarouselNightBlue @@ -418,13 +401,18 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { } let previousBaseColor = strongSelf.colorSlider.baseColor - let newBaseColor = UIColor(rgb: UInt32(bitPattern: item.currentColor?.baseColor.colorValue ?? 0)) + let newBaseColor = item.currentColor?.baseColor ?? .blue strongSelf.colorSlider.baseColor = newBaseColor if previousBaseColor != newBaseColor { strongSelf.colorSlider.value = item.currentColor?.value ?? 0.5 } - transition.updateAlpha(node: strongSelf.scrollNode, alpha: item.displayColorSlider ? 0.0 : 1.0) + strongSelf.scrollNode.allowsGroupOpacity = true + transition.updateAlpha(node: strongSelf.scrollNode, alpha: item.displayColorSlider ? 0.0 : 1.0, completion: { [weak self] finished in + if let strongSelf = self, finished { + strongSelf.scrollNode.allowsGroupOpacity = false + } + }) transition.updateAlpha(node: strongSelf.colorSlider, alpha: item.displayColorSlider ? 1.0 : 0.0) } }) diff --git a/submodules/TelegramUI/TelegramUI/UrlEscaping.swift b/submodules/TelegramUI/TelegramUI/UrlEscaping.swift index 8a02c43ee5..5e626c24b2 100644 --- a/submodules/TelegramUI/TelegramUI/UrlEscaping.swift +++ b/submodules/TelegramUI/TelegramUI/UrlEscaping.swift @@ -43,3 +43,11 @@ func isValidUrl(_ url: String) -> Bool { return false } } + +func explicitUrl(_ url: String) -> String { + var url = url + if !url.hasPrefix("http") && !url.hasPrefix("https") { + url = "http://\(url)" + } + return url +} diff --git a/submodules/TelegramUI/TelegramUI/UsernameSetupController.swift b/submodules/TelegramUI/TelegramUI/UsernameSetupController.swift index 9655809d31..8b31472e18 100644 --- a/submodules/TelegramUI/TelegramUI/UsernameSetupController.swift +++ b/submodules/TelegramUI/TelegramUI/UsernameSetupController.swift @@ -253,11 +253,11 @@ public func usernameSetupController(context: AccountContext) -> ViewController { } checkAddressNameDisposable.set((validateAddressNameInteractive(account: context.account, domain: .account, name: text) - |> deliverOnMainQueue).start(next: { result in - updateState { state in - return state.withUpdatedAddressNameValidationStatus(result) - } - })) + |> deliverOnMainQueue).start(next: { result in + updateState { state in + return state.withUpdatedAddressNameValidationStatus(result) + } + })) } }, shareLink: { let _ = (context.account.postbox.loadedPeerWithId(context.account.peerId) diff --git a/submodules/TelegramUI/TelegramUI/WallpaperColorPanelNode.swift b/submodules/TelegramUI/TelegramUI/WallpaperColorPanelNode.swift index 77154b6258..5cb2542460 100644 --- a/submodules/TelegramUI/TelegramUI/WallpaperColorPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/WallpaperColorPanelNode.swift @@ -63,9 +63,9 @@ final class WallpaperColorPanelNode: ASDisplayNode, UITextFieldDelegate { self.backgroundNode.backgroundColor = theme.chat.inputPanel.panelBackgroundColor self.topSeparatorNode = ASDisplayNode() - self.topSeparatorNode.backgroundColor = theme.chat.inputPanel.panelStrokeColor + self.topSeparatorNode.backgroundColor = theme.chat.inputPanel.panelSeparatorColor self.bottomSeparatorNode = ASDisplayNode() - self.bottomSeparatorNode.backgroundColor = theme.chat.inputPanel.panelStrokeColor + self.bottomSeparatorNode.backgroundColor = theme.chat.inputPanel.panelSeparatorColor self.textBackgroundNode = ASImageNode() self.textBackgroundNode.image = textInputBackgroundImage(backgroundColor: theme.chat.inputPanel.panelBackgroundColor, fieldColor: theme.chat.inputPanel.inputBackgroundColor, strokeColor: theme.chat.inputPanel.inputStrokeColor, diameter: 33.0) diff --git a/submodules/TelegramUI/TelegramUI/WallpaperGalleryController.swift b/submodules/TelegramUI/TelegramUI/WallpaperGalleryController.swift index 8a41dbf0dd..7353772c59 100644 --- a/submodules/TelegramUI/TelegramUI/WallpaperGalleryController.swift +++ b/submodules/TelegramUI/TelegramUI/WallpaperGalleryController.swift @@ -161,7 +161,7 @@ class WallpaperGalleryController: ViewController { self.source = source self.presentationData = context.sharedContext.currentPresentationData.with { $0 } - super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: presentationData)) + super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData)) self.title = self.presentationData.strings.WallpaperPreview_Title self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style @@ -327,7 +327,7 @@ class WallpaperGalleryController: ViewController { break } - let presentationData = context.sharedContext.currentPresentationData.with { $0 } + let presentationData = self.context.sharedContext.currentPresentationData.with { $0 } let overlayNode = WallpaperGalleryOverlayNode() self.overlayNode = overlayNode self.galleryNode.overlayNode = overlayNode @@ -609,9 +609,9 @@ class WallpaperGalleryController: ViewController { bottomMessageText = presentationData.strings.WallpaperPreview_CustomColorBottomText } - items.append(ChatMessageItem(presentationData: chatPresentationData, context: self.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: bottomMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), disableDate: false)) + items.append(ChatMessageItem(presentationData: chatPresentationData, context: self.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: bottomMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), disableDate: false)) - items.append(ChatMessageItem(presentationData: chatPresentationData, context: self.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: topMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(isAdmin: false, isContact: false)), disableDate: false)) + items.append(ChatMessageItem(presentationData: chatPresentationData, context: self.context, chatLocation: .peer(peerId), associatedData: ChatMessageItemAssociatedData(automaticDownloadPeerType: .contact, automaticDownloadNetworkType: .cellular, isRecentActions: false), controllerInteraction: controllerInteraction, content: .message(message: Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: topMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: []), read: true, selection: .none, attributes: ChatMessageEntryAttributes(rank: nil, isContact: false)), disableDate: false)) let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right) if let messageNodes = self.messageNodes { diff --git a/submodules/TelegramUI/TelegramUI/WallpaperPatternPanelNode.swift b/submodules/TelegramUI/TelegramUI/WallpaperPatternPanelNode.swift index 6d7b072cbb..6abc2dd38c 100644 --- a/submodules/TelegramUI/TelegramUI/WallpaperPatternPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/WallpaperPatternPanelNode.swift @@ -34,7 +34,7 @@ final class WallpaperPatternPanelNode: ASDisplayNode { self.backgroundNode.backgroundColor = theme.chat.inputPanel.panelBackgroundColor self.topSeparatorNode = ASDisplayNode() - self.topSeparatorNode.backgroundColor = theme.chat.inputPanel.panelStrokeColor + self.topSeparatorNode.backgroundColor = theme.chat.inputPanel.panelSeparatorColor self.scrollNode = ASScrollNode() diff --git a/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj index 888dcadd48..af6f09f328 100644 --- a/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj @@ -56,6 +56,8 @@ 0947FCAE224043450086741C /* SettingsSearchRecentItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0947FCAD224043450086741C /* SettingsSearchRecentItem.swift */; }; 0947FCB0224055990086741C /* StringHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0947FCAF224055990086741C /* StringHash.swift */; }; 0952D1752176DEB500194860 /* NotificationMuteSettingsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0952D1742176DEB500194860 /* NotificationMuteSettingsController.swift */; }; + 0957DE2322DE28FB001B4D57 /* ThemePreviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0957DE2222DE28FB001B4D57 /* ThemePreviewController.swift */; }; + 0957DE2522DE2909001B4D57 /* ThemePreviewControllerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0957DE2422DE2909001B4D57 /* ThemePreviewControllerNode.swift */; }; 0958FBB9218AD6AF00E0CBD8 /* InstantPageFeedbackItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0958FBB8218AD6AF00E0CBD8 /* InstantPageFeedbackItem.swift */; }; 0958FBBB218AD6BC00E0CBD8 /* InstantPageFeedbackNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0958FBBA218AD6BC00E0CBD8 /* InstantPageFeedbackNode.swift */; }; 0958FBBD218B03CA00E0CBD8 /* InstantPageDetailsNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0958FBBC218B03CA00E0CBD8 /* InstantPageDetailsNode.swift */; }; @@ -1283,6 +1285,8 @@ 0947FCAD224043450086741C /* SettingsSearchRecentItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSearchRecentItem.swift; sourceTree = ""; }; 0947FCAF224055990086741C /* StringHash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringHash.swift; sourceTree = ""; }; 0952D1742176DEB500194860 /* NotificationMuteSettingsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationMuteSettingsController.swift; sourceTree = ""; }; + 0957DE2222DE28FB001B4D57 /* ThemePreviewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemePreviewController.swift; sourceTree = ""; }; + 0957DE2422DE2909001B4D57 /* ThemePreviewControllerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemePreviewControllerNode.swift; sourceTree = ""; }; 0958FBB8218AD6AF00E0CBD8 /* InstantPageFeedbackItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstantPageFeedbackItem.swift; sourceTree = ""; }; 0958FBBA218AD6BC00E0CBD8 /* InstantPageFeedbackNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstantPageFeedbackNode.swift; sourceTree = ""; }; 0958FBBC218B03CA00E0CBD8 /* InstantPageDetailsNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstantPageDetailsNode.swift; sourceTree = ""; }; @@ -3387,6 +3391,8 @@ 091417F321EF4F5F00C8325A /* WallpaperGalleryItem.swift */, D05174AA1EAA5B4700A1BF36 /* WallpaperGalleryToolbarNode.swift */, 09CE9512223825B700A7D2C3 /* CustomWallpaperPicker.swift */, + 0957DE2222DE28FB001B4D57 /* ThemePreviewController.swift */, + 0957DE2422DE2909001B4D57 /* ThemePreviewControllerNode.swift */, ); name = Themes; sourceTree = ""; @@ -6225,6 +6231,7 @@ D084023420E295F000065674 /* GroupStickerPackSetupController.swift in Sources */, D01C06BE1FBCAF06001561AB /* ChatMessageBubbleMosaicLayout.swift in Sources */, 0900678D21ED5EA800530762 /* WallpaperColorPanelNode.swift in Sources */, + 0957DE2522DE2909001B4D57 /* ThemePreviewControllerNode.swift in Sources */, 09A218DA229EE1B600DE6898 /* HorizontalStickersChatContextPanelNode.swift in Sources */, D0EC6E451EB9F58900EBF1C3 /* ItemListMultilineTextItem.swift in Sources */, 091417F421EF4F5F00C8325A /* WallpaperGalleryItem.swift in Sources */, @@ -6368,6 +6375,7 @@ D0EC6E8D1EB9F58900EBF1C3 /* SecretChatKeyVisualization.m in Sources */, 09F664C221EAAFCB00AB7E26 /* ThemeColorsGridControllerNode.swift in Sources */, D0BCC3D420404CC7008126C2 /* ChatMessageActionSheetController.swift in Sources */, + 0957DE2322DE28FB001B4D57 /* ThemePreviewController.swift in Sources */, 09D9689F221F760900B1458A /* ChatTitleActivityContentNode.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift index c13e63c370..1bfc720441 100644 --- a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift +++ b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift @@ -6,7 +6,7 @@ import Display public enum PresentationBuiltinThemeReference: Int32 { case dayClassic = 0 - case nightGrayscale = 1 + case night = 1 case day = 2 case nightAccent = 3 } @@ -176,53 +176,64 @@ public enum PresentationThemeBaseColor: Int32, CaseIterable { case yellow case gray case black + case white - public var colorValue: Int32 { + public var color: UIColor { + let value: UInt32 switch self { case .blue: - return 0x007ee5 + value = 0x007aff case .cyan: - return 0x00c2ed + value = 0x00c2ed case .green: - return 0x29b327 + value = 0x29b327 case .pink: - return 0xff5da2 + value = 0xeb6ca4 case .orange: - return 0xff7519 + value = 0xf08200 case .purple: - return 0x7748ff + value = 0x9472ee case .red: - return 0xf83b4c + value = 0xd33213 case .yellow: - return 0xeba239 + value = 0xedb400 case .gray: - return 0x6d839e + value = 0x6d839e case .black: - return 0x000000 + value = 0x000000 + case .white: + value = 0xffffff } - -// switch self { -// case .blue: -// return 0x007aff -// case .cyan: -// return 0x00c2ed -// case .green: -// return 0x70bb23 -// case .pink: -// return 0xeb6ca4 -// case .orange: -// return 0xf08200 -// case .purple: -// return 0x9472ee -// case .red: -// return 0xd33213 -// case .yellow: -// return 0xedb400 -// case .gray: -// return 0x6d839e -// case .black: -// return 0x000000 -// } + return UIColor(rgb: value) + } + + public var edgeColors: (UIColor, UIColor) { + let values: (UIColor, UIColor) + switch self { + case .blue: + values = (UIColor(rgb: 0x003d80), UIColor(rgb: 0x66afff)) + case .cyan: + values = (UIColor(rgb: 0x00c2ed), UIColor(rgb: 0x00c2ed)) + case .green: + values = (UIColor(rgb: 0x29b327), UIColor(rgb: 0x29b327)) + case .pink: + values = (UIColor(rgb: 0xeb6ca4), UIColor(rgb: 0xeb6ca4)) + case .orange: + values = (UIColor(rgb: 0xf08200), UIColor(rgb: 0xf08200)) + case .purple: + values = (UIColor(rgb: 0x9472ee), UIColor(rgb: 0x9472ee)) + case .red: + values = (UIColor(rgb: 0xd33213), UIColor(rgb: 0xd33213)) + case .yellow: + values = (UIColor(rgb: 0xedb400), UIColor(rgb: 0xedb400)) + case .gray: + values = (UIColor(rgb: 0x6d839e), UIColor(rgb: 0x6d839e)) + case .black: + values = (UIColor(rgb: 0x000000), UIColor(rgb: 0x000000)) + case .white: + values = (UIColor(rgb: 0xffffff), UIColor(rgb: 0xffffff)) + } + return values } } @@ -245,19 +256,16 @@ public struct PresentationThemeAccentColor: PostboxCoding, Equatable { encoder.encodeDouble(Double(self.value), forKey: "v") } - public var color: Int32 { - var hue: CGFloat = 0.0 - var saturation: CGFloat = 0.0 - var value: CGFloat = 0.0 - - let color = UIColor(rgb: UInt32(bitPattern: self.baseColor.colorValue)) - let delta = (-0.5 + self.value) * 0.8 - if color.getHue(&hue, saturation: &saturation, brightness: &value, alpha: nil) { - let newColor = UIColor(hue: hue, saturation: saturation, brightness: min(1.0, max(0.0, value + delta)), alpha: 1.0) - return Int32(bitPattern: newColor.rgb) + public var color: UIColor { + let color: UIColor + if self.value < 0.5 { + color = self.baseColor.color.interpolateTo(self.baseColor.edgeColors.0, fraction: 0.5 - self.value)! + } else if self.value > 0.5 { + color = self.baseColor.color.interpolateTo(self.baseColor.edgeColors.1, fraction: self.value - 0.5)! } else { - return self.baseColor.colorValue + color = self.baseColor.color } + return color } }